summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared')
-rw-r--r--helpcontent2/source/text/shared/00/00000001.xhp409
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000002.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000003.xhp7
-rw-r--r--helpcontent2/source/text/shared/00/00000004.xhp20
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000005.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000007.xhp7
-rw-r--r--helpcontent2/source/text/shared/00/00000010.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00000011.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00000020.xhp19
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/00/00000021.xhp420
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000099.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000202.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000203.xhp15
-rw-r--r--helpcontent2/source/text/shared/00/00000204.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000205.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000206.xhp7
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/00/00000207.xhp16
-rw-r--r--helpcontent2/source/text/shared/00/00000208.xhp33
-rw-r--r--helpcontent2/source/text/shared/00/00000210.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000212.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000213.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000214.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000215.xhp17
-rw-r--r--helpcontent2/source/text/shared/00/00000401.xhp103
-rw-r--r--helpcontent2/source/text/shared/00/00000402.xhp21
-rw-r--r--helpcontent2/source/text/shared/00/00000403.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00000404.xhp7
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp330
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000407.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000408.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00000409.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00000450.xhp7
-rw-r--r--helpcontent2/source/text/shared/00/00040500.xhp461
-rw-r--r--helpcontent2/source/text/shared/00/00040501.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00040502.xhp831
-rw-r--r--helpcontent2/source/text/shared/00/00040503.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/01000000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/00/01010000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/00/01020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/01050000.xhp20
-rw-r--r--helpcontent2/source/text/shared/00/icon_alt.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/01/01010000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010001.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01010100.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/01010200.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/01010201.xhp31
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010202.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010203.xhp19
-rw-r--r--helpcontent2/source/text/shared/01/01010300.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010301.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010302.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010303.xhp23
-rw-r--r--helpcontent2/source/text/shared/01/01010304.xhp17
-rw-r--r--helpcontent2/source/text/shared/01/01020000.xhp213
-rwxr-xr-xhelpcontent2/source/text/shared/01/01020101.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/01020103.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/01050000.xhp8
-rw-r--r--helpcontent2/source/text/shared/01/01060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01070000.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/01070001.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/01100000.xhp45
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100100.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100200.xhp130
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100300.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100400.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100500.xhp23
-rw-r--r--helpcontent2/source/text/shared/01/01100600.xhp92
-rwxr-xr-xhelpcontent2/source/text/shared/01/01110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01110100.xhp17
-rw-r--r--helpcontent2/source/text/shared/01/01110101.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/01110300.xhp15
-rw-r--r--helpcontent2/source/text/shared/01/01110400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01130000.xhp200
-rw-r--r--helpcontent2/source/text/shared/01/01140000.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/01160000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01160200.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/01/01160300.xhp42
-rw-r--r--helpcontent2/source/text/shared/01/01170000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01180000.xhp58
-rw-r--r--helpcontent2/source/text/shared/01/01190000.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/01/01990000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02010000.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/02020000.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/02030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02060000.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/02070000.xhp63
-rw-r--r--helpcontent2/source/text/shared/01/02090000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02100000.xhp318
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100001.xhp650
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100100.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100200.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/02100300.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/02110000.xhp56
-rw-r--r--helpcontent2/source/text/shared/01/02180000.xhp107
-rwxr-xr-xhelpcontent2/source/text/shared/01/02180100.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/02190000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02200000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/02200100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/02200200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/02210101.xhp55
-rw-r--r--helpcontent2/source/text/shared/01/02220000.xhp11
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/01/02220100.xhp80
-rwxr-xr-xhelpcontent2/source/text/shared/01/02230000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02230100.xhp20
-rw-r--r--helpcontent2/source/text/shared/01/02230150.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02230200.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/02230300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02230400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02230401.xhp84
-rw-r--r--helpcontent2/source/text/shared/01/02230402.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/02230500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02240000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/02250000.xhp205
-rw-r--r--helpcontent2/source/text/shared/01/03010000.xhp144
-rw-r--r--helpcontent2/source/text/shared/01/03020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/03040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/03050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/03060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/03110000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/03150100.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/03170000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/03990000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04050000.xhp135
-rw-r--r--helpcontent2/source/text/shared/01/04060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04060100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04060200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04100000.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/04110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04140000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/01/04150000.xhp69
-rw-r--r--helpcontent2/source/text/shared/01/04150100.xhp19
-rw-r--r--helpcontent2/source/text/shared/01/04150200.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/04150400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04150500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04160300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/04160500.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/04180100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/04990000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05020100.xhp39
-rw-r--r--helpcontent2/source/text/shared/01/05020200.xhp287
-rw-r--r--helpcontent2/source/text/shared/01/05020300.xhp25
-rw-r--r--helpcontent2/source/text/shared/01/05020301.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/05020400.xhp29
-rw-r--r--helpcontent2/source/text/shared/01/05020500.xhp33
-rwxr-xr-xhelpcontent2/source/text/shared/01/05020600.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/01/05020700.xhp17
-rw-r--r--helpcontent2/source/text/shared/01/05030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05030100.xhp179
-rwxr-xr-xhelpcontent2/source/text/shared/01/05030300.xhp33
-rw-r--r--helpcontent2/source/text/shared/01/05030500.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/05030600.xhp163
-rwxr-xr-xhelpcontent2/source/text/shared/01/05030700.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/01/05030800.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/05040100.xhp101
-rwxr-xr-xhelpcontent2/source/text/shared/01/05040200.xhp110
-rw-r--r--helpcontent2/source/text/shared/01/05040300.xhp133
-rw-r--r--helpcontent2/source/text/shared/01/05040400.xhp133
-rw-r--r--helpcontent2/source/text/shared/01/05050000.xhp46
-rw-r--r--helpcontent2/source/text/shared/01/05060000.xhp29
-rw-r--r--helpcontent2/source/text/shared/01/05070000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05070100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05070200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05070300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05070400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05070500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05070600.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05080000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05080100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05080200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05080300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05080400.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05090000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05100000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05100100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05100200.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/05100500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05100600.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05100700.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05110100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05110200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05110300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05110400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05110500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05110600m.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/05110700.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05110800.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05120000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05120100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05120200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05120300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05120600.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/05140100.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/01/05150101.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/05190000.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/05190100.xhp33
-rw-r--r--helpcontent2/source/text/shared/01/05200000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05200100.xhp35
-rwxr-xr-xhelpcontent2/source/text/shared/01/05200200.xhp43
-rwxr-xr-xhelpcontent2/source/text/shared/01/05200300.xhp17
-rw-r--r--helpcontent2/source/text/shared/01/05210000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05210100.xhp53
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210200.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210300.xhp127
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210400.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210500.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/05210600.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210700.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/05220000.xhp143
-rw-r--r--helpcontent2/source/text/shared/01/05230000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05230100.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/05230300.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/01/05230400.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/05230500.xhp19
-rwxr-xr-xhelpcontent2/source/text/shared/01/05240000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05240100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05240200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05250000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05250100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05250200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05250300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05250400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05250500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05250600.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05260000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05260100.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05260200.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05260300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05260400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05260500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05260600.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05270000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05280000.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/01/05290000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05290100.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/05290200.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/05290300.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05290400.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05320000.xhp33
-rw-r--r--helpcontent2/source/text/shared/01/05340100.xhp72
-rw-r--r--helpcontent2/source/text/shared/01/05340200.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/05340300.xhp23
-rw-r--r--helpcontent2/source/text/shared/01/05340400.xhp31
-rwxr-xr-xhelpcontent2/source/text/shared/01/05340402.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05340404.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05340405.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05340500.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/05340600.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05350000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/05350200.xhp31
-rw-r--r--helpcontent2/source/text/shared/01/05350300.xhp17
-rw-r--r--helpcontent2/source/text/shared/01/05350400.xhp31
-rw-r--r--helpcontent2/source/text/shared/01/05350500.xhp29
-rw-r--r--helpcontent2/source/text/shared/01/05350600.xhp23
-rw-r--r--helpcontent2/source/text/shared/01/05360000.xhp25
-rw-r--r--helpcontent2/source/text/shared/01/05990000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/06010000.xhp159
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010101.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010500.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010600.xhp35
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010601.xhp15
-rw-r--r--helpcontent2/source/text/shared/01/06020000.xhp50
-rw-r--r--helpcontent2/source/text/shared/01/06030000.xhp35
-rw-r--r--helpcontent2/source/text/shared/01/06040000.xhp52
-rw-r--r--helpcontent2/source/text/shared/01/06040100.xhp427
-rw-r--r--helpcontent2/source/text/shared/01/06040200.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/06040300.xhp37
-rwxr-xr-xhelpcontent2/source/text/shared/01/06040400.xhp66
-rwxr-xr-xhelpcontent2/source/text/shared/01/06040500.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/06040600.xhp137
-rw-r--r--helpcontent2/source/text/shared/01/06040700.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/06050000.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050100.xhp73
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050200.xhp69
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050300.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050400.xhp59
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050500.xhp378
-rw-r--r--helpcontent2/source/text/shared/01/06050600.xhp55
-rw-r--r--helpcontent2/source/text/shared/01/06130000.xhp55
-rwxr-xr-xhelpcontent2/source/text/shared/01/06130001.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/06130010.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06130100.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/01/06130200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06130500.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/06140000.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/06140100.xhp42
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140101.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140102.xhp18
-rw-r--r--helpcontent2/source/text/shared/01/06140200.xhp47
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140400.xhp32
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140402.xhp15
-rw-r--r--helpcontent2/source/text/shared/01/06140500.xhp18
-rw-r--r--helpcontent2/source/text/shared/01/06150000.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/01/06150100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06150110.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06150120.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/01/06150200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/06150210.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/06200000.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/01/06201000.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/01/06202000.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/01/06990000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/07010000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/07080000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/08060100.xhp71
-rw-r--r--helpcontent2/source/text/shared/01/about_meta_tags.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/digitalsignatures.xhp89
-rw-r--r--helpcontent2/source/text/shared/01/extensionupdate.xhp110
-rwxr-xr-xhelpcontent2/source/text/shared/01/formatting_mark.xhp85
-rw-r--r--helpcontent2/source/text/shared/01/gallery.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/01/gallery_files.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/01/grid.xhp7
-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/mediaplayer.xhp99
-rwxr-xr-xhelpcontent2/source/text/shared/01/moviesound.xhp135
-rw-r--r--helpcontent2/source/text/shared/01/online_update.xhp113
-rw-r--r--helpcontent2/source/text/shared/01/online_update_dialog.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/01/packagemanager.xhp31
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp61
-rwxr-xr-xhelpcontent2/source/text/shared/01/password_main.xhp86
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp506
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/securitywarning.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/selectcertificate.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/webhtml.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/xformsdata.xhp113
-rw-r--r--helpcontent2/source/text/shared/01/xformsdataadd.xhp31
-rw-r--r--helpcontent2/source/text/shared/01/xformsdataaddcon.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/xformsdatachange.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/xformsdataname.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/xformsdatatab.xhp141
-rw-r--r--helpcontent2/source/text/shared/02/01110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01140000.xhp646
-rw-r--r--helpcontent2/source/text/shared/02/01170000.xhp64
-rw-r--r--helpcontent2/source/text/shared/02/01170001.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170002.xhp5
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/02/01170003.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170004.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/01170100.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01170101.xhp1513
-rw-r--r--helpcontent2/source/text/shared/02/01170102.xhp5
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/02/01170103.xhp144
-rw-r--r--helpcontent2/source/text/shared/02/01170200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170201.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170202.xhp257
-rw-r--r--helpcontent2/source/text/shared/02/01170203.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/01170300.xhp17
-rw-r--r--helpcontent2/source/text/shared/02/01170400.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01170500.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01170600.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170700.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01170800.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170801.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170802.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/01170900.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170901.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170902.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170903.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170904.xhp11
-rw-r--r--helpcontent2/source/text/shared/02/01171000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01171100.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01171200.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01171300.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01171400.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/01220000.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/01230000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/02010000.xhp79
-rw-r--r--helpcontent2/source/text/shared/02/02020000.xhp82
-rw-r--r--helpcontent2/source/text/shared/02/02030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/02040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/02050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/02130000.xhp19
-rw-r--r--helpcontent2/source/text/shared/02/02140000.xhp155
-rwxr-xr-xhelpcontent2/source/text/shared/02/02160000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/02170000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/03110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/03120000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/03130000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/03140000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/03150000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/03200000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/04210000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/05020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/05090000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/05110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/06050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/06060000.xhp5
-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/06120000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/07010000.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/07060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/07070000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/07070100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/07070200.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/07080000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/07090000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/08010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/08020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/09010000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/09020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/09030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/09050000.xhp22
-rw-r--r--helpcontent2/source/text/shared/02/09060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/09070000.xhp116
-rwxr-xr-xhelpcontent2/source/text/shared/02/09070100.xhp61
-rwxr-xr-xhelpcontent2/source/text/shared/02/09070200.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/02/09070300.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/02/09070400.xhp15
-rw-r--r--helpcontent2/source/text/shared/02/10010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/10020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/10030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/10040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/10100000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12000000.xhp26
-rw-r--r--helpcontent2/source/text/shared/02/12010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12070000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12070100.xhp35
-rw-r--r--helpcontent2/source/text/shared/02/12070200.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/02/12070300.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/12080000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12090000.xhp94
-rw-r--r--helpcontent2/source/text/shared/02/12090100.xhp126
-rwxr-xr-xhelpcontent2/source/text/shared/02/12090101.xhp233
-rw-r--r--helpcontent2/source/text/shared/02/12100000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12100100.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12100200.xhp538
-rw-r--r--helpcontent2/source/text/shared/02/12110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12120000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12130000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/12140000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/13010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/13020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/14010000.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/14020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/14020100.xhp73
-rw-r--r--helpcontent2/source/text/shared/02/14020200.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/14030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/14040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/14050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/14060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/14070000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/18010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/18030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/19090000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/20020000.xhp54
-rw-r--r--helpcontent2/source/text/shared/02/20030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/20040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/20050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/20060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/20090000.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/20100000.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/24010000.xhp29
-rw-r--r--helpcontent2/source/text/shared/02/24020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24040000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24050000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24070000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24080000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24090000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/24100000.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/basicshapes.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/blockarrows.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/callouts.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/colortoolbar.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/flowcharts.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/fontwork.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/02/more_controls.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/02/paintbrush.xhp9
-rw-r--r--helpcontent2/source/text/shared/02/stars.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/symbolshapes.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/04/01010000.xhp1862
-rwxr-xr-xhelpcontent2/source/text/shared/04/01020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/04/makefile.mk8
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/05/00000001.xhp76
-rw-r--r--helpcontent2/source/text/shared/05/00000002.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000100.xhp14
-rw-r--r--helpcontent2/source/text/shared/05/00000110.xhp346
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000120.xhp86
-rw-r--r--helpcontent2/source/text/shared/05/00000130.xhp9
-rw-r--r--helpcontent2/source/text/shared/05/00000140.xhp17
-rw-r--r--helpcontent2/source/text/shared/05/00000150.xhp9
-rw-r--r--helpcontent2/source/text/shared/05/00000160.xhp5
-rw-r--r--helpcontent2/source/text/shared/05/err_html.xhp5
-rw-r--r--helpcontent2/source/text/shared/05/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/07/09000000.xhp5
-rw-r--r--helpcontent2/source/text/shared/07/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/3dsettings_toolbar.xhp105
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/01000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/02000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/03000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/04000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/05000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/06000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/07000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/08000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/09000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/10000000.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/11000000.xhp63
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/12000000.xhp10
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/13000000.xhp12
-rw-r--r--helpcontent2/source/text/shared/autokorr/makefile.mk9
-rw-r--r--helpcontent2/source/text/shared/autopi/01000000.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01010100.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01010200.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01010300.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01010400.xhp7
-rw-r--r--helpcontent2/source/text/shared/autopi/01010500.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01010600.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01020000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01020100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01020200.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01020300.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01020400.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01020500.xhp13
-rw-r--r--helpcontent2/source/text/shared/autopi/01040000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01040100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01040200.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01040300.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01040400.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01040500.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01040600.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01050000.xhp20
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050100.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050200.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050300.xhp19
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050400.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050500.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090100.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090210.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090220.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090300.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090400.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090500.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090600.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100150.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100300.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100400.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100500.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01110000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01110100.xhp13
-rw-r--r--helpcontent2/source/text/shared/autopi/01110200.xhp37
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01110300.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01110400.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01110500.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01110600.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01120000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01120100.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01120200.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01120300.xhp9
-rw-r--r--helpcontent2/source/text/shared/autopi/01120400.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01120500.xhp7
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/autopi/01130000.xhp16
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/autopi/01130100.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01130200.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/01150000.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170000.xhp30
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170300.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170400.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170500.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/autopi/purchase.xhp5
-rw-r--r--helpcontent2/source/text/shared/autopi/startup.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard00.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard01.xhp52
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard02.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard03.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard04.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard05.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard05bi.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard05is.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard06.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard07.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard07fc.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/02000000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02000002.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010100.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010101.xhp93
-rw-r--r--helpcontent2/source/text/shared/explorer/database/04000000.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/04030000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05000000.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05000001.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05000002.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05000003.xhp13
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05010000.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05010100.xhp11
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05020100.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05030000.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05030100.xhp20
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05030200.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05030300.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05030400.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05040000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05040100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/05040200.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11000002.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11020000.xhp7
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11030000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11030100.xhp19
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11080000.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11090000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11150200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11170000.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11170100.xhp17
-rw-r--r--helpcontent2/source/text/shared/explorer/database/30000000.xhp90
-rw-r--r--helpcontent2/source/text/shared/explorer/database/30100000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp117
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabadoc.xhp51
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaprop.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropadd.xhp10
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropcon.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropgen.xhp19
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz00.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz01.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/main.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/makefile.mk9
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/menubar.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/menuedit.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/menufile.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/menufilesave.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/menuinsert.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/menutools.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/menuview.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp68
-rw-r--r--helpcontent2/source/text/shared/explorer/database/password.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard00.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard01.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard02.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard03.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard04.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard05.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard06.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard07.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard08.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp21
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp409
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp16
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp15
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_prop.xhp47
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_sort.xhp128
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard00.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard01.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard02.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard03.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard04.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/toolbars.xhp5
-rw-r--r--helpcontent2/source/text/shared/fontwork_toolbar.xhp93
-rwxr-xr-xhelpcontent2/source/text/shared/guide/aaa_start.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/accessibility.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/guide/active_help_on_off.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/activex.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/assistive.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/guide/autocorr_url.xhp98
-rw-r--r--helpcontent2/source/text/shared/guide/autohide.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/background.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/border_paragraph.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/border_table.xhp31
-rwxr-xr-xhelpcontent2/source/text/shared/guide/breaking_lines.xhp114
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/guide/change_title.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_axis.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_barformat.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/chart_insert.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/chart_legend.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_title.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/collab.xhp45
-rwxr-xr-xhelpcontent2/source/text/shared/guide/configure_overview.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/contextmenu.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/copytable2application.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/copytext2application.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ctl.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_addressbook.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_dbase2office.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_enter_sql.xhp108
-rw-r--r--helpcontent2/source/text/shared/guide/data_forms.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_im_export.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_new.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_queries.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_register.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_report.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_reports.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_search.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_search2.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_tabledefine.xhp99
-rw-r--r--helpcontent2/source/text/shared/guide/data_tables.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_view.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/database_main.xhp5
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/guide/digital_signatures.xhp124
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_receive.xhp17
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_send.xhp185
-rwxr-xr-xhelpcontent2/source/text/shared/guide/doc_autosave.xhp13
-rw-r--r--helpcontent2/source/text/shared/guide/doc_open.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/doc_save.xhp12
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_gallery.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_graphic.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_table.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/edit_symbolbar.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/email.xhp12
-rw-r--r--helpcontent2/source/text/shared/guide/error_report.xhp79
-rwxr-xr-xhelpcontent2/source/text/shared/guide/export_ms.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fax.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/filternavigator.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/find_attributes.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/flat_icons.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/floating_toolbar.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fontwork.xhp192
-rwxr-xr-xhelpcontent2/source/text/shared/guide/formfields.xhp145
-rwxr-xr-xhelpcontent2/source/text/shared/guide/gallery_insert.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/groups.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_edit.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/hyperlink_insert.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_search.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/imagemap.xhp45
-rwxr-xr-xhelpcontent2/source/text/shared/guide/import_ms.xhp108
-rw-r--r--helpcontent2/source/text/shared/guide/insert_bitmap.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp118
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/guide/insert_specialchar.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/guide/integratinguno.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/keyboard.xhp779
-rwxr-xr-xhelpcontent2/source/text/shared/guide/labels.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/labels_database.xhp120
-rwxr-xr-xhelpcontent2/source/text/shared/guide/language_select.xhp317
-rw-r--r--helpcontent2/source/text/shared/guide/line_intext.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/lineend_define.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/linestyle_define.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/linestyles.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/macro_recording.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/main.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/makefile.mk8
-rwxr-xr-xhelpcontent2/source/text/shared/guide/measurement_units.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/guide/microsoft_terms.xhp13
-rw-r--r--helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_doctypes.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp44
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp16
-rwxr-xr-xhelpcontent2/source/text/shared/guide/navigator.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/navigator_setcursor.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/navpane_on.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/numbering_stop.xhp133
-rwxr-xr-xhelpcontent2/source/text/shared/guide/pageformat_max.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp245
-rwxr-xr-xhelpcontent2/source/text/shared/guide/pasting.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_blackwhite.xhp190
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_faster.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/protection.xhp230
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining.xhp74
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_accept.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_doccompare.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_docmerge.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_enter.xhp99
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_protect.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_versions.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/round_corner.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/scripting.xhp391
-rwxr-xr-xhelpcontent2/source/text/shared/guide/space_hyphen.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/spadmin.xhp114
-rwxr-xr-xhelpcontent2/source/text/shared/guide/standard_template.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/start_parameters.xhp10
-rw-r--r--helpcontent2/source/text/shared/guide/startcenter.xhp107
-rw-r--r--helpcontent2/source/text/shared/guide/tabs.xhp17
-rw-r--r--helpcontent2/source/text/shared/guide/text_color.xhp97
-rwxr-xr-xhelpcontent2/source/text/shared/guide/textmode_change.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/undo_formatting.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/version_number.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/viewing_file_properties.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/workfolder.xhp79
-rwxr-xr-xhelpcontent2/source/text/shared/guide/xforms.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/xsltfilter.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/xsltfilter_create.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp5
-rw-r--r--helpcontent2/source/text/shared/main0108.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/main0201.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/main0208.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/main0209.xhp5
-rw-r--r--helpcontent2/source/text/shared/main0212.xhp161
-rw-r--r--helpcontent2/source/text/shared/main0213.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/main0214.xhp5
-rw-r--r--helpcontent2/source/text/shared/main0226.xhp5
-rw-r--r--helpcontent2/source/text/shared/main0227.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/main0400.xhp5
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/main0500.xhp15
-rw-r--r--helpcontent2/source/text/shared/main0600.xhp5
-rw-r--r--helpcontent2/source/text/shared/main0650.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/main0800.xhp5
-rw-r--r--helpcontent2/source/text/shared/makefile.mk8
-rw-r--r--helpcontent2/source/text/shared/optionen/01000000.xhp116
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010000.xhp74
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010100.xhp75
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp288
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01010300.xhp30
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010301.xhp9
-rw-r--r--helpcontent2/source/text/shared/optionen/01010400.xhp35
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010401.xhp13
-rw-r--r--helpcontent2/source/text/shared/optionen/01010500.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010501.xhp31
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01010600.xhp158
-rw-r--r--helpcontent2/source/text/shared/optionen/01010700.xhp30
-rw-r--r--helpcontent2/source/text/shared/optionen/01010800.xhp112
-rw-r--r--helpcontent2/source/text/shared/optionen/01010900.xhp43
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01011000.xhp29
-rw-r--r--helpcontent2/source/text/shared/optionen/01012000.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01013000.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01014000.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/01020100.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01020200.xhp31
-rw-r--r--helpcontent2/source/text/shared/optionen/01020300.xhp9
-rw-r--r--helpcontent2/source/text/shared/optionen/01020400.xhp78
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01030000.xhp62
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01030300.xhp94
-rw-r--r--helpcontent2/source/text/shared/optionen/01030500.xhp77
-rw-r--r--helpcontent2/source/text/shared/optionen/01040000.xhp9
-rw-r--r--helpcontent2/source/text/shared/optionen/01040200.xhp45
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01040300.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01040301.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/01040400.xhp171
-rw-r--r--helpcontent2/source/text/shared/optionen/01040500.xhp33
-rw-r--r--helpcontent2/source/text/shared/optionen/01040600.xhp39
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01040700.xhp106
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01040900.xhp25
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/optionen/01041000.xhp55
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01041100.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01050000.xhp7
-rw-r--r--helpcontent2/source/text/shared/optionen/01050100.xhp137
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01050300.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/01060000.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp267
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060300.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060400.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060401.xhp11
-rw-r--r--helpcontent2/source/text/shared/optionen/01060500.xhp386
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060600.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060700.xhp21
-rw-r--r--helpcontent2/source/text/shared/optionen/01070000.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/01070100.xhp13
-rw-r--r--helpcontent2/source/text/shared/optionen/01070300.xhp144
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01070400.xhp32
-rw-r--r--helpcontent2/source/text/shared/optionen/01070500.xhp29
-rw-r--r--helpcontent2/source/text/shared/optionen/01080000.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/01090000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01090100.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01110000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01110100.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130100.xhp128
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130200.xhp66
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01140000.xhp161
-rw-r--r--helpcontent2/source/text/shared/optionen/01150000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01150100.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01150200.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01150300.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01160000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01160100.xhp19
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01160200.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01160201.xhp9
-rw-r--r--helpcontent2/source/text/shared/optionen/improvement.xhp118
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/java.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/javaclasspath.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/javaparameters.xhp13
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity.xhp10
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp13
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/mailmerge.xhp25
-rw-r--r--helpcontent2/source/text/shared/optionen/makefile.mk9
-rw-r--r--helpcontent2/source/text/shared/optionen/online_update.xhp98
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/serverauthentication.xhp33
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/testaccount.xhp15
-rw-r--r--helpcontent2/source/text/shared/optionen/viewcertificate.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp7
-rw-r--r--helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp7
-rw-r--r--helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/tree_strings.xhp7
910 files changed, 15510 insertions, 17535 deletions
diff --git a/helpcontent2/source/text/shared/00/00000001.xhp b/helpcontent2/source/text/shared/00/00000001.xhp
index f0840beb2e..6040de189f 100644
--- a/helpcontent2/source/text/shared/00/00000001.xhp
+++ b/helpcontent2/source/text/shared/00/00000001.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000001.xhp,v $
- * $Revision: 1.17.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,14 +32,14 @@
<meta>
-<topic id="textshared0000000001xml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Frequently-Used Buttons</title>
-<filename>/text/shared/00/00000001.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="U" oldref="1">Frequently-Used Buttons</paragraph>
-<section id="abbrechen">
+ <topic id="textshared0000000001xml" indexer="exclude">
+ <title xml-lang="en-US" id="tit">Frequently-Used Buttons</title>
+ <filename>/text/shared/00/00000001.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <paragraph xml-lang="en-US" id="hd_id3152952" role="heading" 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"/>
@@ -52,156 +49,169 @@
<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">
+<paragraph xml-lang="en-US" id="hd_id3147617" role="heading" level="2" l10n="U" oldref="4">Cancel</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155913" role="paragraph" 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>
-<section id="abreissleiste">
-<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="2" l10n="CHG" oldref="39">Toolbars</paragraph>
-<paragraph role="paragraph" id="par_id3149783" xml-lang="en-US" l10n="CHG" oldref="40">By clicking the arrow next to some icons you open a toolbar. To move a toolbar, drag the title bar. As soon as you release the mouse button, the toolbar remains at the new position. Drag the title bar to another position, or drag to an edge of the window, where the toolbar will dock. Close a toolbar by clicking the Close Window icon. Make the toolbar visible again by choosing <emph>View - Toolbars - (toolbar name)</emph>.</paragraph>
-</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="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>
-<listitem>
-<paragraph role="paragraph" id="par_id7493209" xml-lang="en-US" l10n="NEW">In the Basic IDE, a spin button is the name used for the numerical field together with the two arrow symbols.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3155599" xml-lang="en-US" l10n="CHG" oldref="78">You can type a numerical value into the field next to the spin button, or select the value with the up-arrow or down-arrow symbols on the spin button. On the keyboard you can press the up arrow and down arrow keys to increase or reduce the value. You can press the Page Up and Page Down keys to set the maximum and minimum value.</paragraph>
-<paragraph role="paragraph" id="par_id3150264" xml-lang="en-US" l10n="CHG" oldref="38">If the field next to the spin button defines numerical values, you can also define a <link href="text/shared/00/00000003.xhp#metrik" name="measurement unit">measurement unit</link>, for example, 1 cm or 5 mm, 12 pt or 2".</paragraph>
-</section>
-<section id="import">
-<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="76">Convert</paragraph>
-<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid=".">If you click forward through the dialog, this button is called <emph>Next</emph>. On the last page the button has the name <emph>Convert</emph>. The conversion is then performed by clicking the button.</ahelp></paragraph>
-</section>
-<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>
-</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"/>
+<paragraph xml-lang="en-US" id="hd_id2341685" role="heading" level="2" l10n="NEW">Finish</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6909390" role="paragraph" l10n="NEW"><ahelp hid=".">Applies all changes and closes the wizard.</ahelp></paragraph>
+ </section>
+ <section id="abreissleiste">
+ <paragraph xml-lang="en-US" id="hd_id3147477" role="heading" level="2" l10n="CHG"
+ oldref="39">Toolbars</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149783" role="paragraph" l10n="CHG" oldref="40">By clicking the arrow next to some icons you open a toolbar. To move a toolbar, drag the title bar. As soon as you release the mouse button, the toolbar remains at the new position. Drag the title bar to another position, or drag to an edge of the window, where the toolbar will dock. Close a toolbar by clicking the Close Window icon. Make the toolbar visible again by choosing <emph>View - Toolbars - (toolbar name)</emph>.</paragraph>
+ </section>
+ <section id="drehfeld">
+ <paragraph xml-lang="en-US" id="hd_id3152414" role="heading" level="2" l10n="CHG"
+ oldref="79">Spin button</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1094088" role="paragraph" 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>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7493209" role="paragraph" l10n="NEW">In the Basic IDE, a spin button is the name used for the numerical field together with the two arrow symbols.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3155599" role="paragraph" l10n="CHG" oldref="78">You can type a numerical value into the field next to the spin button, or select the value with the up-arrow or down-arrow symbols on the spin button. On the keyboard you can press the up arrow and down arrow keys to increase or reduce the value. You can press the Page Up and Page Down keys to set the maximum and minimum value.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150264" role="paragraph" l10n="CHG" oldref="38">If the field next to the spin button defines numerical values, you can also define a <link href="text/shared/00/00000003.xhp#metrik" name="measurement unit">measurement unit</link>, for example, 1 cm or 5 mm, 12 pt or 2".</paragraph>
+ </section>
+ <section id="import">
+ <paragraph xml-lang="en-US" id="hd_id3154232" role="heading" level="2" l10n="U"
+ oldref="76">Convert</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148983" role="paragraph" l10n="U" oldref="77"><ahelp hid=".">If you click forward through the dialog, this button is called <emph>Next</emph>. On the last page the button has the name <emph>Convert</emph>. The conversion is then performed by clicking the button.</ahelp></paragraph>
+ </section>
+ <section id="kontextmenue">
+ <paragraph xml-lang="en-US" id="hd_id3145129" role="heading" level="2" l10n="U"
+ oldref="42">Context Menu</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156553" role="paragraph" 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>
+ </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>
-<section id="metrik">
-<paragraph role="heading" id="hd_id3148620" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Metrics</paragraph>
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="7">You can enter values in the input fields in different units of measurement. The default unit is inches. However, if you want a space of exactly 1cm, then type "1cm". Additional units are available according to the context, for example, 12 pt for a 12 point spacing. If the value of the new unit is unrealistic, the program uses a predefined maximum or minimum value.</paragraph>
-</section>
-<section id="schliessen">
-<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="8">Close</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Closes the dialog and saves all changes.</ahelp></paragraph>
-</section>
-<section id="schliessen2">
-<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="57">Close</paragraph>
-<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>
-<paragraph role="paragraph" id="par_id3157808" xml-lang="en-US" l10n="E">
-<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>
+<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/cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE" id="bm_id3149762" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE" id="bm_id3148924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE" id="bm_id3153717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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/cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE" id="bm_id3150443" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149180" role="heading" level="2" l10n="U"
+ oldref="24">Delete</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" 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/cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE" id="bm_id7878353" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV" id="bm_id5413373" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS" id="bm_id2580950" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147557" role="heading" level="2" l10n="U"
+ oldref="45">Delete</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155338" role="paragraph" l10n="U" oldref="46"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
+ </section>
+ <section id="metrik">
+ <paragraph xml-lang="en-US" id="hd_id3148620" role="heading" level="2" l10n="CHG"
+ oldref="6">Metrics</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145345" role="paragraph" l10n="U" oldref="7">You can enter values in the input fields in different units of measurement. The default unit is inches. However, if you want a space of exactly 1cm, then type "1cm". Additional units are available according to the context, for example, 12 pt for a 12 point spacing. If the value of the new unit is unrealistic, the program uses a predefined maximum or minimum value.</paragraph>
+ </section>
+ <section id="schliessen">
+ <paragraph xml-lang="en-US" id="hd_id3155535" role="heading" level="2" l10n="U" oldref="8">Close</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="9"><ahelp hid=".">Closes the dialog and saves all changes.</ahelp></paragraph>
+ </section>
+ <section id="schliessen2">
+ <paragraph xml-lang="en-US" id="hd_id3147275" role="heading" level="2" l10n="U"
+ oldref="57">Close</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153031" role="paragraph" 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 xml-lang="en-US" id="hd_id3156113" role="heading" level="2" l10n="U"
+ oldref="16">Apply</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155341" role="paragraph" 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"/>
+<!-- removed HID SC:IMAGEBUTTON:RID_SCDLG_FORMULA:RB_REF -->
+<!-- removed HID HID_SC_FAP_BTN_REF1 -->
+<!-- removed HID HID_SC_FAP_BTN_REF2 -->
+<!-- removed HID HID_SC_FAP_BTN_REF3 -->
+<!-- removed HID HID_SC_FAP_BTN_REF4 -->
+<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 xml-lang="en-US" id="hd_id3153760" role="heading" level="2" l10n="U"
+ oldref="47">Shrink / Maximize</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153087" role="paragraph" 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 xml-lang="en-US" id="par_id3155062" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="par_id3157808" role="paragraph" l10n="E">
+<image id="img_id3148685" src="formula/res/refinp1.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3148685">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153321" xml-lang="en-US" l10n="U" oldref="50">Shrink</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="E">
-<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>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153321" role="paragraph" l10n="U" oldref="50">Shrink</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153349" role="paragraph" l10n="E">
+<image id="img_id3149784" src="formula/res/refinp2.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149784">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="51">Maximize</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="51">Maximize</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<section id="vorschau">
+ </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">
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="2" l10n="U"
+ oldref="34">Preview Field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154046" role="paragraph" 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"/>
@@ -209,36 +219,41 @@
<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"/>
+<!-- removed HID HID_DLGREPORT_0_CMDNEXTORREADY -->
<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>
-</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>
-<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">
+<paragraph xml-lang="en-US" id="hd_id3145609" role="heading" level="2" l10n="U"
+ oldref="70">Next</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" 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">
+<!-- removed HID OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK" id="bm_id4539933" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149670" role="heading" level="2" l10n="U"
+ oldref="13">Back<comment>in Tools - Options</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145068" role="paragraph" 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>
-<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">
-<paragraph role="heading" id="hd_id3143278" xml-lang="en-US" level="2" l10n="U" oldref="18">Reset<comment>whats this?</comment></paragraph>
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_TABDLG_RESET_BTN">Resets modified values back to the default values.</ahelp></paragraph>
-<paragraph role="warning" id="par_id3154331" xml-lang="en-US" l10n="U" oldref="20">A confirmation query does not appear. If you confirm the dialog with OK all settings in this dialog are reset.</paragraph>
-</section>
-<section id="standard">
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_STD_FONT_PB_STANDARD" id="bm_id481887" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148755" role="heading" level="2" l10n="U"
+ oldref="59">Reset<comment>all tab dialogs</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149651" role="paragraph" 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">
+ <paragraph xml-lang="en-US" id="hd_id3143278" role="heading" level="2" l10n="U"
+ oldref="18">Reset<comment>whats this?</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_TABDLG_RESET_BTN">Resets modified values back to the default values.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154331" role="warning" l10n="U" oldref="20">A confirmation query does not appear. If you confirm the dialog with OK all settings in this dialog are reset.</paragraph>
+ </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"/>
-<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/sd:PushButton:DLG_COPY:BTN_SET_DEFAULT" id="bm_id3083280" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145173" role="heading" 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 xml-lang="en-US" id="par_id3154153" role="paragraph" 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 xml-lang="en-US" id="par_id3154299" role="warning" 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"/>
@@ -247,24 +262,26 @@
<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>
-<section id="zusaetze">
-<paragraph role="heading" id="hd_id3147352" xml-lang="en-US" level="2" l10n="U" oldref="52">More</paragraph>
-<paragraph role="paragraph" id="par_id3155314" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_TABDLG_STANDARD_BTN">Click the<emph> More</emph> button to expand the dialog to show further options. Click again to restore the dialog.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3161659" xml-lang="en-US" l10n="U" oldref="41"><variable id="siehe">See also the following functions:
+<paragraph xml-lang="en-US" id="hd_id3147502" role="heading" level="2" l10n="U"
+ oldref="72">Back</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" 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>
+ <section id="zusaetze">
+ <paragraph xml-lang="en-US" id="hd_id3147352" role="heading" level="2" l10n="U"
+ oldref="52">More</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155314" role="paragraph" l10n="U" oldref="53"><ahelp hid="HID_TABDLG_STANDARD_BTN">Click the<emph> More</emph> button to expand the dialog to show further options. Click again to restore the dialog.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3161659" role="paragraph" l10n="U" oldref="41"><variable id="siehe">See also the following functions:
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147418" xml-lang="en-US" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <link href="text/shared/optionen/01060500.xhp">Tools - Options - %PRODUCTNAME Calc - Calculate</link>.
+ <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp">%PRODUCTNAME Calc - Calculate</link>.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3163714" xml-lang="en-US" l10n="U" oldref="56"><variable id="wahr">If an error occurs, the function returns a logical or numerical value.
+ <paragraph xml-lang="en-US" id="par_id3163714" role="paragraph" l10n="U" oldref="56"><variable id="wahr">If an error occurs, the function returns a logical or numerical value.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154145" xml-lang="en-US" l10n="U" oldref="54"><variable id="kontext">(This command is only accessible through the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link>).
+ <paragraph xml-lang="en-US" id="par_id3154145" role="paragraph" l10n="U" oldref="54"><variable id="kontext">(This command is only accessible through the <link href="text/shared/00/00000005.xhp#kontextmenue" name="context menu">context menu</link>).
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="61"><variable id="wiederholen">By double-clicking a tool, you can use it for multiple tasks. If you call the tool with a single-click, it reverts back to the last selection after completing the task.
+ <paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="U" oldref="61"><variable id="wiederholen">By double-clicking a tool, you can use it for multiple tasks. If you call the tool with a single-click, it reverts back to the last selection after completing the task.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id9345377" xml-lang="en-US" l10n="NEW"><variable id="ShiftF1">Press Shift+F1 and point to a control to learn more about that control.
+ <paragraph xml-lang="en-US" id="par_id9345377" role="paragraph" l10n="NEW"><variable id="ShiftF1">Press Shift+F1 and point to a control to learn more about that control.
</variable></paragraph>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00000002.xhp b/helpcontent2/source/text/shared/00/00000002.xhp
index ccea435549..25ddb8c548 100755
--- a/helpcontent2/source/text/shared/00/00000002.xhp
+++ b/helpcontent2/source/text/shared/00/00000002.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000002.xhp,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -115,7 +112,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3159125"><bookmark_value>Java; definition</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3159125" xml-lang="en-US" level="2" l10n="U" oldref="92">Java</paragraph>
-<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language developed by Sun Microsystems, Inc. (http://www.sun.com) that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
+<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
</section>
<section id="plugin">
<bookmark xml-lang="en-US" branch="index" id="bm_id3159153"><bookmark_value>plug-ins; definition</bookmark_value>
diff --git a/helpcontent2/source/text/shared/00/00000003.xhp b/helpcontent2/source/text/shared/00/00000003.xhp
index e56ee4b954..752f6846e9 100755
--- a/helpcontent2/source/text/shared/00/00000003.xhp
+++ b/helpcontent2/source/text/shared/00/00000003.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000003.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147543" xml-lang="en-US" level="1" l10n="U" oldref="1">Conversion of measurement units</paragraph>
<paragraph role="paragraph" id="par_idN1069F" xml-lang="en-US" l10n="CHG">In some dialogs, you can enter measurement values into input boxes. If you just enter a numerical value, the default measurement unit is used.</paragraph>
-<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
+<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
<paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="NEW">In input boxes for length units you can also add the unit abbreviation according to the following list:</paragraph>
<table id="tbl_id402233">
<tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000004.xhp b/helpcontent2/source/text/shared/00/00000004.xhp
index 36343e60f4..80fbf4adeb 100644
--- a/helpcontent2/source/text/shared/00/00000004.xhp
+++ b/helpcontent2/source/text/shared/00/00000004.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000004.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0000000004xml" indexer="exclude" status="PUBLISH">
@@ -45,12 +42,17 @@
</history>
</meta>
<body>
-<paragraph role="heading" id="hd_id3160447" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this command...
+<paragraph role="heading" id="hd_id3160447" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this command...
</variable></paragraph>
<section id="related">
<paragraph role="related" id="par_id3147212" xml-lang="en-US" l10n="U" oldref="47"><variable id="related"><emph>Related Topics</emph>
</variable></paragraph>
</section>
+
+<section id="agentoff">
+<paragraph role="tip" id="par_id56935339" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
+</section>
+
<section id="sytextfarbe">
<table id="tbl_id3156421">
<tablerow>
@@ -371,7 +373,7 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146915" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Go to the previous note</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3146915" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Go to the previous comment</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
@@ -386,7 +388,7 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the next note</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the next comment</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/helpcontent2/source/text/shared/00/00000005.xhp b/helpcontent2/source/text/shared/00/00000005.xhp
index d56be6eafa..31a5808247 100755
--- a/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/helpcontent2/source/text/shared/00/00000005.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000005.xhp,v $
- * $Revision: 1.11.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -95,7 +92,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id3148677" role="paragraph" l10n="U" oldref="170">Currently, $[officename] supports Hindi, Thai, Hebrew, and Arabic as CTL languages.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
<section id="kontextmenue">
@@ -126,9 +123,9 @@
<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.
+ <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 <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>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 <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> 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>
diff --git a/helpcontent2/source/text/shared/00/00000007.xhp b/helpcontent2/source/text/shared/00/00000007.xhp
index a21f7b1d7f..ca61787efd 100755
--- a/helpcontent2/source/text/shared/00/00000007.xhp
+++ b/helpcontent2/source/text/shared/00/00000007.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000007.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
<section id="asia">
<paragraph role="heading" id="par_id3153551" xml-lang="en-US" level="2" l10n="U" oldref="11">Asian Language Support</paragraph>
<section id="asiahinweis">
-<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000010.xhp b/helpcontent2/source/text/shared/00/00000010.xhp
index 502fb5c742..696ea7eb0d 100644
--- a/helpcontent2/source/text/shared/00/00000010.xhp
+++ b/helpcontent2/source/text/shared/00/00000010.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000010.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000011.xhp b/helpcontent2/source/text/shared/00/00000011.xhp
index 0c5e343782..89aad6e2ba 100644
--- a/helpcontent2/source/text/shared/00/00000011.xhp
+++ b/helpcontent2/source/text/shared/00/00000011.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000011.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index aed86801f8..789e8a457c 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000020.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,7 +59,7 @@
<paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically.
</caseinline><defaultinline>$[officename] normally recognizes the correct file type automatically on opening a file.</defaultinline></switchinline> There may be cases where you have to select the file type yourself in the <emph>Open</emph> dialog. For example, if you have a database table in text format that you want to open as a database table, you need to specify the file type "Text CSV" after selecting the file.</paragraph>
<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="2" l10n="U" oldref="238">Basic Macros in MS Office Documents</paragraph>
-<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties">Tools - Options - Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
+<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="5">Notes regarding external formats and file types</paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="226">Even if they are not installed, some filters can be selected in the <emph>Open</emph> and <emph>Save</emph> dialogs. If you select such a filter, a message will appear saying that you can still install the filter if you require.</paragraph>
<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components".
@@ -87,10 +84,10 @@
<paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Importing and Exporting in HTML Format </paragraph>
<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="12">When borders in HTML documents are exported, lines are exported in a width of exactly 1 pixel since Netscape Navigator and MS Internet Explorer do not recognize smaller lines. When importing, a border of 1 pixel width will appear with 0.05 pt width.<comment>still true? this para is very old.</comment></paragraph>
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="198">With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks.</paragraph>
-<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Notes are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Notes are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
+<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="201">The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph>Tools - Options - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
-<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
+<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
+<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="130">The "font" property corresponds to Netscape Navigator; that is, before the font size you can specify optional values for "font-style" (italic, none), "font-variant" (normal, small-caps) and "font-weight" (normal, bold).</paragraph>
<list type="unordered">
<listitem>
@@ -107,7 +104,7 @@
<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="46">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph>Tools - Options - %PRODUCTNAME Writer - General</emph> or <emph>Tools - Options - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
+<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph> or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
<table id="tbl_id3154346">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -176,9 +173,9 @@
</tablecell>
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
+<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="223">Importing and Exporting Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
+<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="225">A left paragraph indent in numbering is indicated as "margin-left" CSS1 property. First-line indents are ignored in numbering and not exported.</paragraph>
<paragraph role="heading" id="hd_id3148556" xml-lang="en-US" level="3" l10n="U" oldref="235">Importing and Exporting Spreadsheet Files</paragraph>
<paragraph role="paragraph" id="par_id3153365" xml-lang="en-US" l10n="U" oldref="236">$[officename] imports and exports references to deleted sections such as, for example, a referenced column. The whole formula can be viewed during the export process and the deleted reference contains an indication (#REF!) to the reference. A #REF! will be correspondingly created for the reference during the import.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index 77d406e68e..78fe467f88 100755..100644
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -1,19 +1,14 @@
<?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: 00000021.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.23.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -34,216 +29,227 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<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>
-</meta>
-<body>
+ <topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">XML File Formats</title>
+ <filename>/text/shared/00/00000021.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>exporting; XML files</bookmark_value>
-<bookmark_value>XML file formats</bookmark_value>
-<bookmark_value>extensions; file formats</bookmark_value>
-<bookmark_value>suffixes in file formats</bookmark_value>
-<bookmark_value>document types in $[officename]</bookmark_value>
-<bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
-<bookmark_value>defaults;file formats in $[officename]</bookmark_value>
-<bookmark_value>file formats;OpenDocument/XML</bookmark_value>
-<bookmark_value>OpenDocument file formats</bookmark_value>
-<bookmark_value>ODF file formats</bookmark_value>
-</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment>
+ <bookmark_value>XML file formats</bookmark_value>
+ <bookmark_value>extensions; file formats</bookmark_value>
+ <bookmark_value>suffixes in file formats</bookmark_value>
+ <bookmark_value>document types in $[officename]</bookmark_value>
+ <bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
+ <bookmark_value>defaults;file formats in $[officename]</bookmark_value>
+ <bookmark_value>file formats;OpenDocument/XML</bookmark_value>
+ <bookmark_value>OpenDocument file formats</bookmark_value>
+ <bookmark_value>ODF file formats</bookmark_value>
+</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment><comment>mw changed "defaults;..."</comment>
<bookmark xml-lang="en-US" branch="hid/HID_DID_SAVE_PACKED_XML" id="bm_id3159242" localize="false"/>
-<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
+<paragraph xml-lang="en-US" id="hd_id3154408" role="heading" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148919" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
-<paragraph role="note" id="par_idN10725" xml-lang="en-US" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="2" l10n="CHG" oldref="4">OpenDocument file format names</paragraph>
-<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph><comment>replaced OpenDocument by ODF in filter names, see http://specs.openoffice.org/appwide/fileIO/FileFormatNames.sxw</comment>
+ <paragraph xml-lang="en-US" id="par_id3148919" role="paragraph" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10725" role="note" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156324" role="heading" level="2" l10n="CHG"
+ oldref="4">OpenDocument file format names</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154926" role="paragraph" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph>
<table id="tbl_id3109850">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="6">Document format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="7">File extension</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10762" xml-lang="en-US" l10n="CHG">ODF Text </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10767" xml-lang="en-US" l10n="NEW">*.odt</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1076D" xml-lang="en-US" l10n="CHG">ODF Text Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10772" xml-lang="en-US" l10n="NEW">*.ott</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10778" xml-lang="en-US" l10n="NEW">ODF Master Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1077D" xml-lang="en-US" l10n="NEW">*.odm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10783" xml-lang="en-US" l10n="NEW">HTML Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10788" xml-lang="en-US" l10n="NEW">*.html</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1078E" xml-lang="en-US" l10n="NEW">HTML Document Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10793" xml-lang="en-US" l10n="NEW">*.oth</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10799" xml-lang="en-US" l10n="CHG">ODF Spreadsheet</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1079E" xml-lang="en-US" l10n="NEW">*.ods</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A4" xml-lang="en-US" l10n="CHG">ODF Spreadsheet Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A9" xml-lang="en-US" l10n="NEW">*.ots</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107AF" xml-lang="en-US" l10n="CHG">ODF Drawing</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107B4" xml-lang="en-US" l10n="NEW">*.odg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BA" xml-lang="en-US" l10n="CHG">ODF Drawing Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BF" xml-lang="en-US" l10n="NEW">*.otg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107C5" xml-lang="en-US" l10n="CHG">ODF Presentation</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107CA" xml-lang="en-US" l10n="NEW">*.odp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D0" xml-lang="en-US" l10n="CHG">ODF Presentation Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D5" xml-lang="en-US" l10n="NEW">*.otp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107DB" xml-lang="en-US" l10n="CHG">ODF Formula</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107E0" xml-lang="en-US" l10n="NEW">*.odf</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1085B" xml-lang="en-US" l10n="CHG">ODF Database</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10860" xml-lang="en-US" l10n="NEW">*.odb</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id9756157" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Extension</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2089907" xml-lang="en-US" l10n="NEW">*.oxt</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-<paragraph role="note" id="par_idN1088F" xml-lang="en-US" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
-<paragraph role="paragraph" id="par_id4818872" xml-lang="en-US" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
-<paragraph role="heading" id="par_idN107E3" xml-lang="en-US" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
-<paragraph role="paragraph" id="par_id0514200811525257" xml-lang="en-US" l10n="NEW">The OpenDocument format evolves over time.<comment>UFI: convert text to table as soon as Help Authoring Environment allows new tables</comment></paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id0514200811565671" xml-lang="en-US" l10n="NEW">ODF version</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530375" xml-lang="en-US" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of OpenOffice.org / StarOffice</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565662" xml-lang="en-US" l10n="NEW">ODF 1.0 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530487" xml-lang="en-US" l10n="NEW">2005-05-01</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530455" xml-lang="en-US" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565787" xml-lang="en-US" l10n="NEW">ODF 1.1 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530479" xml-lang="en-US" l10n="NEW">2007-02-02</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530467" xml-lang="en-US" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565762" xml-lang="en-US" l10n="NEW">ODF 1.2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530440" xml-lang="en-US" l10n="NEW">to be announced</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157898" role="tablehead" l10n="CHG" oldref="6">Document format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149549" role="tablehead" l10n="U" oldref="7">File extension</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10762" role="tablecontent" l10n="CHG">ODF Text </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10767" role="tablecontent" l10n="NEW">*.odt</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1076D" role="tablecontent" l10n="CHG">ODF Text Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10772" role="tablecontent" l10n="NEW">*.ott</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10778" role="tablecontent" l10n="NEW">ODF Master Document</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1077D" role="tablecontent" l10n="NEW">*.odm</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10783" role="tablecontent" l10n="NEW">HTML Document</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10788" role="tablecontent" l10n="NEW">*.html</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="tablecontent" l10n="NEW">HTML Document Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10793" role="tablecontent" l10n="NEW">*.oth</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10799" role="tablecontent" l10n="CHG">ODF Spreadsheet</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1079E" role="tablecontent" l10n="NEW">*.ods</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107A4" role="tablecontent" l10n="CHG">ODF Spreadsheet Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107A9" role="tablecontent" l10n="NEW">*.ots</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107AF" role="tablecontent" l10n="CHG">ODF Drawing</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107B4" role="tablecontent" l10n="NEW">*.odg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107BA" role="tablecontent" l10n="CHG">ODF Drawing Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107BF" role="tablecontent" l10n="NEW">*.otg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107C5" role="tablecontent" l10n="CHG">ODF Presentation</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107CA" role="tablecontent" l10n="NEW">*.odp</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107D0" role="tablecontent" l10n="CHG">ODF Presentation Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107D5" role="tablecontent" l10n="NEW">*.otp</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107DB" role="tablecontent" l10n="CHG">ODF Formula</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107E0" role="tablecontent" l10n="NEW">*.odf</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1085B" role="tablecontent" l10n="CHG">ODF Database</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10860" role="tablecontent" l10n="NEW">*.odb</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id9756157" role="tablecontent" l10n="NEW">%PRODUCTNAME Extension</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2089907" role="tablecontent" l10n="NEW">*.oxt</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1088F" role="note" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4818872" role="paragraph" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107E3" role="heading" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0514200811525257" role="paragraph" l10n="NEW">The OpenDocument format evolves over time.</paragraph>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565671" role="tablehead" l10n="NEW">ODF version</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530375" role="tablehead" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of the software</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565662" role="tablecontent" l10n="NEW">ODF 1.0 </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530487" role="tablecontent" l10n="NEW">2005-05-01</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530455" role="tablecontent" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565787" role="tablecontent" l10n="NEW">ODF 1.1 </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530479" role="tablecontent" l10n="NEW">2007-02-02</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530467" role="tablecontent" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565762" role="tablecontent" l10n="NEW">ODF 1.2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">to be announced</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Oracle Open Office</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent" l10n="NEW">ODF 1.2 (Extended)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
-<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
+<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph> to find alternative file formats for each $[officename] document type.</paragraph>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
<paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="CHG" oldref="29">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="30">The text content of the document is located in <emph>content.xml</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph>Tools - Options - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145152" xml-lang="en-US" l10n="U" oldref="32">The file <emph>meta.xml</emph> contains the meta information of the document, which you can enter under <emph>File - Properties</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000099.xhp b/helpcontent2/source/text/shared/00/00000099.xhp
index d2b2be4611..5c2a9ef18f 100755
--- a/helpcontent2/source/text/shared/00/00000099.xhp
+++ b/helpcontent2/source/text/shared/00/00000099.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000099.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELP_PI" id="bm_id562099" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelperDialog" id="bm_id3153681" localize="false"/>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>Tools - Options - $[officename] - General - Help Agent</emph>.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>$[officename] - General - Help Agent</emph> in the Options dialog box.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELPTIPS" id="bm_id2449436" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelpTip" id="bm_id3148491" localize="false"/>
<paragraph role="paragraph" id="par_idN10665" xml-lang="en-US" l10n="CHG"><ahelp hid=".uno:HelpTip">Enables the display of icon names at the mouse pointer and other Help contents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000202.xhp b/helpcontent2/source/text/shared/00/00000202.xhp
index 8d3f81d67d..1014fe03e3 100755
--- a/helpcontent2/source/text/shared/00/00000202.xhp
+++ b/helpcontent2/source/text/shared/00/00000202.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000202.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,20 +40,20 @@
<body>
- <bookmark branch="hid/SVTOOLS:MODALDIALOG:DLG_EXPORT_JPG" xml-lang="en-US" id="bm_id3150620"/><paragraph role="heading" level="1" id="hd_id3150467" l10n="U" xml-lang="en-US" oldref="1">JPEG Options</paragraph>
+ <bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_JPG" xml-lang="en-US" id="bm_id3150620"/><paragraph role="heading" level="1" id="hd_id3150467" l10n="U" xml-lang="en-US" oldref="1">JPEG Options</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149741" xml-lang="en-US" oldref="2"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_JPG" visibility="visible">Defines the settings for the import/export of files in JPEG format.</ahelp></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#jpegspeichern"/>
</section>
<paragraph role="heading" level="2" id="hd_id3154689" l10n="U" xml-lang="en-US" oldref="3">Quality</paragraph>
<paragraph role="paragraph" id="par_id3149877" l10n="U" xml-lang="en-US" oldref="4">Specifies the desired graphic quality.</paragraph>
- <bookmark branch="hid/SVTOOLS:NUMERICFIELD:DLG_EXPORT_JPG:NUM_FLD_QUALITY" xml-lang="en-US" id="bm_id3154841"/><paragraph role="heading" level="3" id="hd_id3155448" l10n="U" xml-lang="en-US" oldref="5">Quality</paragraph>
+ <bookmark branch="hid/svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY" xml-lang="en-US" id="bm_id3154841"/><paragraph role="heading" level="3" id="hd_id3155448" l10n="U" xml-lang="en-US" oldref="5">Quality</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3152952" xml-lang="en-US" oldref="6"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_EXPORT_JPG:NUM_FLD_QUALITY" visibility="visible">Sets the quality for the import/export. The value 1 denotes minimum quality and minimal file size, 100 denotes maximum quality and file size.</ahelp></paragraph>
<paragraph role="heading" level="2" id="hd_id3150431" l10n="U" xml-lang="en-US" oldref="7">Color resolution</paragraph>
<paragraph role="paragraph" id="par_id3155599" l10n="U" xml-lang="en-US" oldref="8">Specifies the desired color resolution.</paragraph>
- <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_GRAY" xml-lang="en-US" id="bm_id3151100"/><paragraph role="heading" level="3" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="9">Grayscale</paragraph>
+ <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY" xml-lang="en-US" id="bm_id3151100"/><paragraph role="heading" level="3" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="9">Grayscale</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3146938" xml-lang="en-US" oldref="10"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_GRAY" visibility="visible">Specifies whether to export or import a graphic object in a grayscale.</ahelp></paragraph>
- <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_RGB" xml-lang="en-US" id="bm_id3157898"/><paragraph role="heading" level="3" id="hd_id3153624" l10n="U" xml-lang="en-US" oldref="11">True Colors</paragraph>
+ <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB" xml-lang="en-US" id="bm_id3157898"/><paragraph role="heading" level="3" id="hd_id3153624" l10n="U" xml-lang="en-US" oldref="11">True Colors</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149525" xml-lang="en-US" oldref="12"><ahelp hid="SVTOOLS:RADIOBUTTON:DLG_EXPORT_JPG:RB_RGB" visibility="visible">Specifies whether to retain the original colors of the JPEG file when importing or exporting.</ahelp></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153539" xml-lang="en-US" oldref="13">For more details about filters, see <link href="text/shared/00/00000020.xhp" name="Information about Import/Export Filters">Information about Import/Export Filters</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000203.xhp b/helpcontent2/source/text/shared/00/00000203.xhp
index 336ade28b7..bfe46acab4 100755
--- a/helpcontent2/source/text/shared/00/00000203.xhp
+++ b/helpcontent2/source/text/shared/00/00000203.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000203.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,22 +40,22 @@
<body>
- <bookmark branch="hid/GOODIES:MODALDIALOG:DLG_EXPORT_EPCT" xml-lang="en-US" id="bm_id3149987"/><bookmark branch="hid/GOODIES:MODALDIALOG:DLG_EXPORT_EMET" xml-lang="en-US" id="bm_id3150467"/><bookmark branch="hid/SVTOOLS:MODALDIALOG:DLG_EXPORT_VEC" xml-lang="en-US" id="bm_id3149000"/><paragraph role="heading" level="1" id="hd_id3150127" l10n="U" xml-lang="en-US" oldref="1">SVM/WMF/PICT/MET Options</paragraph>
+ <bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EPCT" xml-lang="en-US" id="bm_id3149987"/><bookmark branch="hid/goodies:ModalDialog:DLG_EXPORT_EMET" xml-lang="en-US" id="bm_id3150467"/><bookmark branch="hid/svtools:ModalDialog:DLG_EXPORT_VEC" xml-lang="en-US" id="bm_id3149000"/><paragraph role="heading" level="1" id="hd_id3150127" l10n="U" xml-lang="en-US" oldref="1">SVM/WMF/PICT/MET Options</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3160463" xml-lang="en-US" oldref="9"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_EXPORT_VEC" visibility="visible">Defines the settings for SVM/WMF/PICT/MET export options.</ahelp></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#svmspeichern"/>
</section>
<paragraph role="heading" level="2" id="hd_id3143206" l10n="U" xml-lang="en-US" oldref="2">Mode</paragraph>
<paragraph role="paragraph" id="par_id3154400" l10n="U" xml-lang="en-US" oldref="10">Specifies the mode for file export.</paragraph>
- <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_VEC:RB_ORIGINAL_VEC" xml-lang="en-US" id="bm_id3151370"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPCT:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154044"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154613"/><paragraph role="heading" level="3" id="hd_id3151191" l10n="U" xml-lang="en-US" oldref="3">Original</paragraph>
+ <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC" xml-lang="en-US" id="bm_id3151370"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154044"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_ORIGINAL" xml-lang="en-US" id="bm_id3154613"/><paragraph role="heading" level="3" id="hd_id3151191" l10n="U" xml-lang="en-US" oldref="3">Original</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3145356" xml-lang="en-US" oldref="11"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL" visibility="visible">Retains the original size.</ahelp></paragraph>
- <bookmark branch="hid/SVTOOLS:RADIOBUTTON:DLG_EXPORT_VEC:RB_SIZE_VEC" xml-lang="en-US" id="bm_id3145160"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPCT:RB_SIZE" xml-lang="en-US" id="bm_id3146938"/><bookmark branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE" xml-lang="en-US" id="bm_id3154094"/><paragraph role="heading" level="3" id="hd_id3151097" l10n="U" xml-lang="en-US" oldref="4">Size</paragraph>
+ <bookmark branch="hid/svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC" xml-lang="en-US" id="bm_id3145160"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EPCT:RB_SIZE" xml-lang="en-US" id="bm_id3146938"/><bookmark branch="hid/goodies:RadioButton:DLG_EXPORT_EMET:RB_SIZE" xml-lang="en-US" id="bm_id3154094"/><paragraph role="heading" level="3" id="hd_id3151097" l10n="U" xml-lang="en-US" oldref="4">Size</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3148983" xml-lang="en-US" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE" visibility="visible">Specifies whether to modify size.</ahelp></paragraph>
<paragraph role="heading" level="2" id="hd_id3156183" l10n="U" xml-lang="en-US" oldref="5">Size</paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3149525" l10n="U" oldref="13">Defines the width and height. This is only active if the <emph>Size</emph> option has been selected.</paragraph>
- <bookmark branch="hid/SVTOOLS:METRICFIELD:DLG_EXPORT_VEC:MTF_SIZEX_VEC" xml-lang="en-US" id="bm_id3150808"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EPCT:MTF_SIZEX" xml-lang="en-US" id="bm_id3153389"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="U" xml-lang="en-US" oldref="6">Width</paragraph>
+ <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC" xml-lang="en-US" id="bm_id3150808"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX" xml-lang="en-US" id="bm_id3153389"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEX" xml-lang="en-US" id="bm_id3149140"/><paragraph role="heading" level="3" id="hd_id3151330" l10n="U" xml-lang="en-US" oldref="6">Width</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154561" xml-lang="en-US" oldref="14"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX" visibility="visible">Specifies the width.</ahelp></paragraph>
- <bookmark branch="hid/SVTOOLS:METRICFIELD:DLG_EXPORT_VEC:MTF_SIZEY_VEC" xml-lang="en-US" id="bm_id3154184"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EPCT:MTF_SIZEY" xml-lang="en-US" id="bm_id3157896"/><bookmark branch="hid/GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="U" xml-lang="en-US" oldref="7">Height</paragraph>
+ <bookmark branch="hid/svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC" xml-lang="en-US" id="bm_id3154184"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY" xml-lang="en-US" id="bm_id3157896"/><bookmark branch="hid/goodies:MetricField:DLG_EXPORT_EMET:MTF_SIZEY" xml-lang="en-US" id="bm_id3154751"/><paragraph role="heading" level="3" id="hd_id3156027" l10n="U" xml-lang="en-US" oldref="7">Height</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147226" xml-lang="en-US" oldref="15"><ahelp hid="GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY" visibility="visible">Specifies the height.</ahelp></paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3147250" l10n="U" oldref="8">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000204.xhp b/helpcontent2/source/text/shared/00/00000204.xhp
index 95e57ac824..440936eee1 100644
--- a/helpcontent2/source/text/shared/00/00000204.xhp
+++ b/helpcontent2/source/text/shared/00/00000204.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000204.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,14 +42,14 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_MODALDIALOG_DLG_EXPORT_PIX" id="bm_id3150960" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ModalDialog:DLG_EXPORT_PIX" id="bm_id3150960" localize="false"/>
<paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1">BMP Options</paragraph>
<paragraph role="paragraph" id="par_id3149662" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVTOOLS_MODALDIALOG_DLG_EXPORT_PIX">Defines the import/export settings for files in BMP format.</ahelp></paragraph>
<embed href="text/shared/00/00000401.xhp#bmpexport"/>
<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="2" l10n="U" oldref="2">Color Resolution</paragraph>
<paragraph role="paragraph" id="par_id3151253" xml-lang="en-US" l10n="U" oldref="11">Specifies the color resolution of the BMP file to be exported.</paragraph>
<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="U" oldref="22">The <emph>Color Resolution</emph> command also appears on the context menu of a BMP graphic that has been loaded in <item type="productname">%PRODUCTNAME</item> Draw.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS" id="bm_id3153070" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS" id="bm_id3153070" localize="false"/>
<paragraph role="heading" id="hd_id3149200" xml-lang="en-US" level="3" l10n="U" oldref="18">Color Resolution</paragraph>
<paragraph role="paragraph" id="par_id3150402" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVTOOLS_LISTBOX_DLG_EXPORT_PIX_LB_COLORS">In the <emph>Color Resolution</emph> list you will find the following color resolution variants:</ahelp></paragraph>
<paragraph role="heading" id="par_id3150379" xml-lang="en-US" level="4" l10n="U" oldref="37">Original</paragraph>
@@ -85,25 +82,25 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ConvertToTrueColor" id="bm_id3154823" localize="false"/>
<paragraph role="heading" id="par_id3155338" xml-lang="en-US" level="4" l10n="U" oldref="35">24-Bit True Colors</paragraph>
<paragraph role="paragraph" id="par_id3147010" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:ConvertToTrueColor">Allows the object to be converted to a palette of approximately 16 million colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_EXPORT_PIX_CBX_RLE" id="bm_id3145072" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE" id="bm_id3145072" localize="false"/>
<paragraph role="heading" id="par_id3145313" xml-lang="en-US" level="4" l10n="U" oldref="20">RLE Encoding</paragraph>
<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVTOOLS_CHECKBOX_DLG_EXPORT_PIX_CBX_RLE">Applies RLE (Run Length Encoding) to the BMP graphics</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="2" l10n="U" oldref="3">Mode</paragraph>
<paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="12">Determines the type of export mode.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_ORIGINAL_PIX" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX" id="bm_id3154381" localize="false"/>
<paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="3" l10n="U" oldref="4">Original</paragraph>
<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_ORIGINAL_PIX">Retains the original mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_RES_PIX" id="bm_id3153700" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_COMBOBOX_DLG_EXPORT_PIX_CBB_RES_PIX" id="bm_id3153698" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX" id="bm_id3153700" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX" id="bm_id3153698" localize="false"/>
<paragraph role="heading" id="hd_id3150944" xml-lang="en-US" level="3" l10n="U" oldref="5">Resolution</paragraph>
<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_COMBOBOX_DLG_EXPORT_PIX_CBB_RES_PIX">Allows you to define the resolution for an image. Select the desired DPI from the <emph>Resolution</emph> list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_SIZE_PIX" id="bm_id3159177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX" id="bm_id3159177" localize="false"/>
<paragraph role="heading" id="hd_id3152910" xml-lang="en-US" level="3" l10n="U" oldref="6">Size</paragraph>
<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_EXPORT_PIX_RB_SIZE_PIX">Allows you modify the image size by a given measurement.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEX_PIX" id="bm_id3149785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX" id="bm_id3149785" localize="false"/>
<paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="7">Width</paragraph>
<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEX_PIX">Specifies the image width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEY_PIX" id="bm_id3155136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX" id="bm_id3155136" localize="false"/>
<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="8">Height</paragraph>
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVTOOLS_METRICFIELD_DLG_EXPORT_PIX_MTF_SIZEY_PIX">Specifies the image height.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154811" xml-lang="en-US" l10n="U" oldref="9">See <link href="text/shared/00/00000020.xhp" name="Import and Export Filter Information">Import and Export Filter Information</link> for more information about filters.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000205.xhp b/helpcontent2/source/text/shared/00/00000205.xhp
index 2f0861c06f..b7bac24c75 100755
--- a/helpcontent2/source/text/shared/00/00000205.xhp
+++ b/helpcontent2/source/text/shared/00/00000205.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000205.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,18 +45,18 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3145759"><bookmark_value>transparency; saving</bookmark_value>
<bookmark_value>GIF format</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/VCL:MODALDIALOG:DLG_EXPORT_GIF" id="bm_id3147519" localize="false"/>
+<!-- removed HID VCL:MODALDIALOG:DLG_EXPORT_GIF -->
<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">GIF Options</paragraph>
<paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="VCL:MODALDIALOG:DLG_EXPORT_GIF">In the<emph> GIF Options </emph>dialog, you can select the settings for the export of files in GIF format.</ahelp></paragraph>
<embed href="text/shared/00/00000401.xhp#gifexport"/>
<paragraph role="heading" id="hd_id3149877" xml-lang="en-US" level="2" l10n="U" oldref="2">Mode</paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED" id="bm_id3153679" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_CheckBox_DLG_EXPORT_GIF_CBX_INTERLACED" id="bm_id9410382" localize="false"/>
+<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED -->
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED" id="bm_id9410382" localize="false"/>
<paragraph role="heading" id="hd_id3153272" xml-lang="en-US" level="3" l10n="U" oldref="3">Interlaced</paragraph>
<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_INTERLACED">Specifies whether to use interlaced mode for saving the GIF image.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="2" l10n="U" oldref="8">Drawing objects</paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT" id="bm_id3148731" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_CheckBox_DLG_EXPORT_GIF_CBX_TRANSLUCENT" id="bm_id6792504" localize="false"/>
+<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT -->
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT" id="bm_id6792504" localize="false"/>
<paragraph role="heading" id="hd_id3154094" xml-lang="en-US" level="3" l10n="U" oldref="10">Save transparency</paragraph>
<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_GIF:CBX_TRANSLUCENT">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147102" xml-lang="en-US" l10n="U" oldref="4">For more information regarding filters, refer to the topic: <link href="text/shared/00/00000020.xhp" name="Information about Import and Export Filters">Information about Import and Export Filters</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000206.xhp b/helpcontent2/source/text/shared/00/00000206.xhp
index e2df677712..3b6ad27df0 100755
--- a/helpcontent2/source/text/shared/00/00000206.xhp
+++ b/helpcontent2/source/text/shared/00/00000206.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000206.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
<body>
<paragraph role="heading" id="hd_id3155354" xml-lang="en-US" level="1" l10n="U" oldref="1">Dif Import/Export/ Lotus import/ dBASE import</paragraph>
<paragraph role="paragraph" id="par_id3150620" xml-lang="en-US" l10n="U" oldref="4">Defines the options for import/export. These dialogs will be automatically shown if the corresponding file type is selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_IMPORTOPT:LB_FONT" id="bm_id3149987" localize="false"/><paragraph role="heading" id="hd_id3149000" xml-lang="en-US" level="2" l10n="U" oldref="2">Character set</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT" id="bm_id3149987" localize="false"/><paragraph role="heading" id="hd_id3149000" xml-lang="en-US" level="2" l10n="U" oldref="2">Character set</paragraph>
<paragraph role="paragraph" id="par_id3152790" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SC:LISTBOX:RID_SCDLG_IMPORTOPT:LB_FONT">Select the character set from the options used for import/export.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="U" oldref="3">For further information regarding filters, refer to the topic: <link href="text/shared/00/00000020.xhp" name="Information about Import and Export Filters">Information about Import and Export Filters</link>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000207.xhp b/helpcontent2/source/text/shared/00/00000207.xhp
index dd2c198338..3b770282ee 100755..100644
--- a/helpcontent2/source/text/shared/00/00000207.xhp
+++ b/helpcontent2/source/text/shared/00/00000207.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000207.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -47,14 +44,15 @@
<paragraph role="paragraph" id="par_id3150379" xml-lang="en-US" l10n="U" oldref="7">The <emph>Export of text files</emph> dialog allows you to define the export options for text files. The dialog will be displayed if you save spreadsheet data as file type "Text CSV", and if the <emph>Edit filter settings</emph> check box is marked in the <emph>Save As</emph> dialog.</paragraph>
<paragraph role="heading" id="hd_id3155577" xml-lang="en-US" level="2" l10n="U" oldref="2">Field options</paragraph>
<paragraph role="paragraph" id="par_id3152427" xml-lang="en-US" l10n="U" oldref="8">Defines the field separator, text separator and character set that is used for the text export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_IMPORTOPT:DDLB_FONT" id="bm_id3154841" localize="false"/><paragraph role="heading" id="hd_id3152876" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT" id="bm_id3154841" localize="false"/><paragraph role="heading" id="hd_id3152876" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
<paragraph role="paragraph" id="par_id3154689" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:LISTBOX:RID_SCDLG_IMPORTOPT:DDLB_FONT">Specifies the character set for text export.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_FIELDSEP" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3145138" xml-lang="en-US" level="3" l10n="U" oldref="3">Field delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3145138" xml-lang="en-US" level="3" l10n="U" oldref="3">Field delimiter</paragraph>
<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_FIELDSEP">Choose or enter the field delimiter, which separates data fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_TEXTSEP" id="bm_id3146938" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="4">Text delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP" id="bm_id3146938" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="4">Text delimiter</paragraph>
<paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_TEXTSEP">Choose or enter the text delimiter, which encloses every data field.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_IMPORTOPT_CB_SAVESHOWN" id="bm_id7735831" localize="false"/><paragraph role="heading" id="hd_id7145298" xml-lang="en-US" level="3" l10n="NEW">Save cell content as shown</paragraph>
-<paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of %PRODUCTNAME.</ahelp></paragraph><comment>i76507, see http://specs.openoffice.org/calc/filters/csv/save-to-csv.odt</comment><paragraph role="warning" id="par_id3541062" xml-lang="en-US" l10n="NEW">Depending on the number format, saving cell content as shown may write values that during an import cannot be interpreted as numerical values anymore.</paragraph>
+<paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of the software.</ahelp></paragraph>
+<paragraph role="warning" id="par_id3541062" xml-lang="en-US" l10n="NEW">Depending on the number format, saving cell content as shown may write values that during an import cannot be interpreted as numerical values anymore.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH" id="bm_id3143281" localize="false"/><paragraph role="heading" id="hd_id3149793" xml-lang="en-US" level="3" l10n="U" oldref="12">Fixed column width</paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC_CHECKBOX_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH">Exports all data fields with a fixed width.</ahelp></paragraph>
<list type="unordered">
diff --git a/helpcontent2/source/text/shared/00/00000208.xhp b/helpcontent2/source/text/shared/00/00000208.xhp
index 6107cac36b..f4171df4ec 100644
--- a/helpcontent2/source/text/shared/00/00000208.xhp
+++ b/helpcontent2/source/text/shared/00/00000208.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000208.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SC:MODALDIALOG:RID_SCDLG_ASCII" id="bm_id3148919" localize="false"/><paragraph role="heading" id="hd_id3150960" xml-lang="en-US" level="1" l10n="U" oldref="1">Text Import</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ModalDialog:RID_SCDLG_ASCII" id="bm_id3148919" localize="false"/><paragraph role="heading" id="hd_id3150960" xml-lang="en-US" level="1" l10n="U" oldref="1">Text Import</paragraph>
<paragraph role="paragraph" id="par_id3149987" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC:MODALDIALOG:RID_SCDLG_ASCII">Sets the import options for delimited data.</ahelp></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#textimport"/>
@@ -54,34 +51,34 @@
</case>
</switch>
<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="2" l10n="U" oldref="45">Import</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET" id="bm_id3155934" localize="false"/><paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Set</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET" id="bm_id3155934" localize="false"/><paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Character Set</paragraph>
<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET">Specifies the character set to be used in the imported file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW" id="bm_id3153377" localize="false"/><paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="47">From Row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCDLG_ASCII:NF_AT_ROW" id="bm_id3153377" localize="false"/><paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="47">From Row</paragraph>
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW">Specifies the row where you want to start the import.</ahelp> The rows are visible in the preview window at the bottom of the dialog.</paragraph>
<paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">Separator Options</paragraph>
<paragraph role="paragraph" id="par_id3149640" xml-lang="en-US" l10n="U" oldref="4">Specifies whether your data uses separators or fixed widths as delimiters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_FIXED" id="bm_id3153894" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="U" oldref="7">Fixed width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_ASCII:RB_FIXED" id="bm_id3153894" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="U" oldref="7">Fixed width</paragraph>
<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_FIXED">Separates fixed-width data (equal number of characters) into columns.</ahelp> Click on the ruler in the preview window to set the width.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_SEPARATED" id="bm_id3147043" localize="false"/><paragraph role="heading" id="hd_id3156560" xml-lang="en-US" level="3" l10n="U" oldref="5">Separated by</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_ASCII:RB_SEPARATED" id="bm_id3147043" localize="false"/><paragraph role="heading" id="hd_id3156560" xml-lang="en-US" level="3" l10n="U" oldref="5">Separated by</paragraph>
<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_SEPARATED">Select the separator used in your data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_TAB" id="bm_id3153345" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="3" l10n="U" oldref="49">Tab</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_TAB" id="bm_id3153345" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="3" l10n="U" oldref="49">Tab</paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_TAB">Separates data delimited by tabs into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SEMICOLON" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="3" l10n="U" oldref="51">Semicolon</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_SEMICOLON" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="3" l10n="U" oldref="51">Semicolon</paragraph>
<paragraph role="paragraph" id="par_id3157863" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SEMICOLON">Separates data delimited by semicolons into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_COMMA" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="53">Comma</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_COMMA" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="53">Comma</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_COMMA">Separates data delimited by commas into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SPACE" id="bm_id3109848" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="55">Space</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_SPACE" id="bm_id3109848" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="55">Space</paragraph>
<paragraph role="paragraph" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SPACE">Separates data delimited by spaces into columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CKB_OTHER" id="bm_id3149098" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_ASCII:ED_OTHER" id="bm_id3149801" localize="false"/><paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="3" l10n="U" oldref="57">Other</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CKB_OTHER" id="bm_id3149098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_ASCII:ED_OTHER" id="bm_id3149801" localize="false"/><paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="3" l10n="U" oldref="57">Other</paragraph>
<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="SC:EDIT:RID_SCDLG_ASCII:ED_OTHER">Separates data into columns using the custom separator that you specify. Note: The custom separator must also be contained in your data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE" id="bm_id3146807" localize="false"/><paragraph role="heading" id="hd_id3150978" xml-lang="en-US" level="3" l10n="U" oldref="59">Merge delimiters</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ASCII:CB_ASONCE" id="bm_id3146807" localize="false"/><paragraph role="heading" id="hd_id3150978" xml-lang="en-US" level="3" l10n="U" oldref="59">Merge delimiters</paragraph>
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE">Combines consecutive delimiters and removes blank data fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="15">Text delimiter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_ASCII:CB_TEXTSEP" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="15">Text delimiter</paragraph>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP">Select a character to delimit text data. You can can also enter a character in the text box.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="61">Fields</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="62">Shows how your data will look when it is separated into columns.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_TYPE1" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
<paragraph role="paragraph" id="par_id3149957" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1">Choose a column in the preview window and select the data type to be applied the imported data.</ahelp> You can select one of the following options:</paragraph>
<table id="tbl_id3155179">
<tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000210.xhp b/helpcontent2/source/text/shared/00/00000210.xhp
index 9eca3c1edb..b462f3341d 100644
--- a/helpcontent2/source/text/shared/00/00000210.xhp
+++ b/helpcontent2/source/text/shared/00/00000210.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000210.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,15 +40,15 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SD:MODALDIALOG:DLG_PRINT_WARNINGS" id="bm_id3158421" localize="false"/><paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">Warning Print Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ModalDialog:DLG_PRINT_WARNINGS" id="bm_id3158421" localize="false"/><paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1">Warning Print Options</paragraph>
<paragraph role="paragraph" id="par_id3152352" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SD:MODALDIALOG:DLG_PRINT_WARNINGS">The<emph> Warning Print Options </emph>dialog appears when the page setup does not match the defined print range.</ahelp> This is the case, for example, if you draw a rectangle that is larger than the current page format.</paragraph>
<paragraph role="heading" id="hd_id3150620" xml-lang="en-US" level="2" l10n="U" oldref="3">Print options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_SCALE" id="bm_id3148765" localize="false"/><paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="5">Fit page to print range</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PRINT_WARNINGS:RBT_SCALE" id="bm_id3148765" localize="false"/><paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="5">Fit page to print range</paragraph>
<embed href="text/shared/optionen/01070400.xhp#fittopage"/>
<paragraph role="note" id="par_id3158405" xml-lang="en-US" l10n="U" oldref="7">If you select the <emph>Fit page to print range </emph>option, the <emph>Warning Print Options</emph> dialog will not appear in subsequent print runs of this document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_POSTER" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Print on multiple pages<comment>i78245</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PRINT_WARNINGS:RBT_POSTER" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Print on multiple pages<comment>i78245</comment></paragraph>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_POSTER">Specifies whether to distribute the printout on multiple pages.</ahelp> The print range will be printed on multiple pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_CUT" id="bm_id3160302" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="10">Trim</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PRINT_WARNINGS:RBT_CUT" id="bm_id3160302" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="10">Trim</paragraph>
<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:RADIOBUTTON:DLG_PRINT_WARNINGS:RBT_CUT">Specifies that anything extending beyond the maximum print range will be cut off and not included in the printing.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000212.xhp b/helpcontent2/source/text/shared/00/00000212.xhp
index 18d418d595..4c5fc36826 100755
--- a/helpcontent2/source/text/shared/00/00000212.xhp
+++ b/helpcontent2/source/text/shared/00/00000212.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000212.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,12 +48,12 @@
<embed href="text/shared/00/00000401.xhp#pngspeichern"/>
</section>
<paragraph role="heading" id="hd_id3155354" xml-lang="en-US" level="2" l10n="U" oldref="7">Mode</paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION" id="bm_id3156053" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_NumericField_DLG_EXPORT_EPNG_NUM_COMPRESSION" id="bm_id2915128" localize="false"/>
+<!-- removed HID VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION -->
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION" id="bm_id2915128" localize="false"/>
<paragraph role="heading" id="hd_id3150672" xml-lang="en-US" level="3" l10n="U" oldref="3">Compression 0..9</paragraph>
<paragraph role="paragraph" id="par_id3150960" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="VCL:NUMERICFIELD:DLG_EXPORT_EPNG:NUM_COMPRESSION">Specifies the compression setting from 0 (no compression) to 9 (maximum compression). The calculation time increases with the compression value, while the resulting file is smaller in bytes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED" id="bm_id3143206" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_CheckBox_DLG_EXPORT_EPNG_CBX_INTERLACED" id="bm_id5851924" localize="false"/>
+<!-- removed HID VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED -->
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED" id="bm_id5851924" localize="false"/>
<paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="3" l10n="U" oldref="5">Interlaced</paragraph>
<paragraph role="paragraph" id="par_id3154840" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="VCL:CHECKBOX:DLG_EXPORT_EPNG:CBX_INTERLACED">Specifies whether the graphic is to be saved in interlaced mode.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000213.xhp b/helpcontent2/source/text/shared/00/00000213.xhp
index e589165b64..4eef472d89 100755
--- a/helpcontent2/source/text/shared/00/00000213.xhp
+++ b/helpcontent2/source/text/shared/00/00000213.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000213.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,34 +50,34 @@
</section>
<paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="3">Preview</paragraph>
<paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="4">Specifies options for embedded preview for the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_TIFF" id="bm_id3153884" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF" id="bm_id3153884" localize="false"/>
<paragraph role="heading" id="hd_id3145348" xml-lang="en-US" level="3" l10n="U" oldref="5">Image preview (TIFF)</paragraph>
<paragraph role="paragraph" id="par_id3155271" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_TIFF">Specifies whether a preview image is exported in the TIFF format together with the actual PostScript file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_EPSI" id="bm_id3155069" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI" id="bm_id3155069" localize="false"/>
<paragraph role="heading" id="hd_id3149748" xml-lang="en-US" level="3" l10n="U" oldref="29">Interchange (EPSI)</paragraph>
<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="GOODIES:CHECKBOX:DLG_EXPORT_EPS:CB_PREVIEW_EPSI">Specifies whether a monochrome preview graphic in EPSI format is exported together with the PostScript file.</ahelp> This format only contains printable characters from the 7-bit ASCII code.</paragraph>
<paragraph role="heading" id="hd_id3159224" xml-lang="en-US" level="2" l10n="U" oldref="9">Version</paragraph>
<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="10">Determines the PostScript level for exporting the EPS file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL1" id="bm_id3150040" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1" id="bm_id3150040" localize="false"/>
<paragraph role="heading" id="hd_id3143281" xml-lang="en-US" level="3" l10n="U" oldref="11">Level 1</paragraph>
<paragraph role="paragraph" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL1">Compression is not available at this level. Select the<emph> Level 1 </emph>option if your PostScript printer does not offer the capabilities of Level 2.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL2" id="bm_id3149640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2" id="bm_id3149640" localize="false"/>
<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="3" l10n="U" oldref="13">Level 2</paragraph>
<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_LEVEL2">Select the<emph> Level 2 </emph>option if your output device supports colored bitmaps, palette graphics and compressed graphics.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147261" xml-lang="en-US" level="2" l10n="U" oldref="15">Color format</paragraph>
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="16">The <emph>Color format</emph> option gives you the choice between exporting in color or in grayscale.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COLOR" id="bm_id3153049" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COLOR" id="bm_id3153049" localize="false"/>
<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="3" l10n="U" oldref="17">Color</paragraph>
<paragraph role="paragraph" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COLOR">Exports the file in color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_GRAYSCALE" id="bm_id3153346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE" id="bm_id3153346" localize="false"/>
<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="3" l10n="U" oldref="19">Grayscale</paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_GRAYSCALE">Exports the file in grayscale tones.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="2" l10n="U" oldref="21">Compression</paragraph>
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="22">Specifies whether the data is exported with compression.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_LZW" id="bm_id3157863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW" id="bm_id3157863" localize="false"/>
<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="23">LZW encoding</paragraph>
<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_LZW">LZW compression is the compression of a file into a smaller file using a table-based lookup algorithm invented by Abraham Lempel, Jacob Ziv, and Terry Welch. If you choose to activate this, select the<emph> LZW encoding </emph>option.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_NONE" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE" id="bm_id3147653" localize="false"/>
<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="25">None</paragraph>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="GOODIES:RADIOBUTTON:DLG_EXPORT_EPS:RB_COMPRESSION_NONE">Specifies that you do not wish to use compression.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000214.xhp b/helpcontent2/source/text/shared/00/00000214.xhp
index f9261891cd..570cde3d5f 100755
--- a/helpcontent2/source/text/shared/00/00000214.xhp
+++ b/helpcontent2/source/text/shared/00/00000214.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000214.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,14 +48,14 @@
<embed href="text/shared/00/00000401.xhp#pbmppmpgm"/>
</section>
<paragraph role="heading" id="hd_id3155577" xml-lang="en-US" level="2" l10n="U" oldref="3">File format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPBM_RB_RAW" id="bm_id9971617" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPPM_RB_RAW" id="bm_id9391460" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPGM_RB_RAW" id="bm_id702536" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_RAW" id="bm_id9971617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW" id="bm_id9391460" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_RAW" id="bm_id702536" localize="false"/>
<paragraph role="heading" id="hd_id3154290" xml-lang="en-US" level="3" l10n="U" oldref="5">Binary</paragraph>
<paragraph role="paragraph" id="par_id3154841" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Exports the file in binary format. The resulting file is smaller than a (ASCII) text file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPBM_RB_ASCII" id="bm_id3917661" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPPM_RB_ASCII" id="bm_id1909543" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/goodies_RadioButton_DLG_EXPORT_EPGM_RB_ASCII" id="bm_id5302591" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII" id="bm_id3917661" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII" id="bm_id1909543" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/goodies:RadioButton:DLG_EXPORT_EPGM:RB_ASCII" id="bm_id5302591" localize="false"/>
<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="3" l10n="U" oldref="7">Text</paragraph>
<paragraph role="paragraph" id="par_id3149783" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid=".">Exports the file in the ASCII text format. This file type is larger than a binary.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000215.xhp b/helpcontent2/source/text/shared/00/00000215.xhp
index f9b3036d24..073dbcffb9 100755
--- a/helpcontent2/source/text/shared/00/00000215.xhp
+++ b/helpcontent2/source/text/shared/00/00000215.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000215.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,24 +49,24 @@
</section>
<paragraph role="heading" id="hd_id3159217" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
<paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for importing or exporting your file. When exporting, only the character set and paragraph break can be defined.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_ASCII_FILTER:LB_CHARSET" id="bm_id3159242" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET" id="bm_id3159242" localize="false"/>
<paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
<paragraph role="paragraph" id="par_id3143206" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:DLG_ASCII_FILTER:LB_CHARSET">Specifies the character set of the file for export or import.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_ASCII_FILTER:LB_FONT" id="bm_id3150008" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_ASCII_FILTER:LB_FONT" id="bm_id3150008" localize="false"/>
<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="3" l10n="U" oldref="7">Default fonts</paragraph>
<paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SW:LISTBOX:DLG_ASCII_FILTER:LB_FONT">By setting a default font, you specify that the text should be displayed in a specific font. The default fonts can only be selected when importing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_ASCII_FILTER:LB_LANGUAGE" id="bm_id3153124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE" id="bm_id3153124" localize="false"/>
<paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="3" l10n="U" oldref="9">Language</paragraph>
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:LISTBOX:DLG_ASCII_FILTER:LB_LANGUAGE">Specifies the language of the text, if this has not already been defined. This setting is only available when importing.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="3" l10n="U" oldref="11">Paragraph break</paragraph>
<paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="12">Defines the type of paragraph break for a text line.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CRLF" id="bm_id3149640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_ASCII_FILTER:RB_CRLF" id="bm_id3149640" localize="false"/>
<paragraph role="heading" id="hd_id3150935" xml-lang="en-US" level="3" l10n="U" oldref="13">CR &amp; LF</paragraph>
<paragraph role="paragraph" id="par_id3145829" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CRLF">Produces a "Carriage Return" and a "Linefeed". This option is the default.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CR" id="bm_id3150178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_ASCII_FILTER:RB_CR" id="bm_id3150178" localize="false"/>
<paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="3" l10n="U" oldref="15">CR</paragraph>
<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_CR">Produces a "Carriage Return" as the paragraph break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_LF" id="bm_id3147374" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_ASCII_FILTER:RB_LF" id="bm_id3147374" localize="false"/>
<paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="3" l10n="U" oldref="17">LF</paragraph>
<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:DLG_ASCII_FILTER:RB_LF">Produces a "Linefeed" as the paragraph break.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 560fec4726..54f65d415c 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000401.xhp,v $
- * $Revision: 1.14.4.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0000000401xml" indexer="exclude">
<title id="tit" xml-lang="en-US">File Menu</title>
@@ -54,7 +51,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150127" xml-lang="en-US" l10n="E">
-<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 id="img_id3156053" src="res/sx03251.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156053" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -73,7 +70,7 @@
</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>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="161"><variable id="etikettenein">Choose <emph>File - New - Labels - Labels</emph> tab
+<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="161"><variable id="etikettenein">Choose <emph>File - New - Labels - Labels</emph> tab
</variable></paragraph>
<section id="formateti">
<paragraph role="paragraph" id="par_id3154522" xml-lang="en-US" l10n="U" oldref="162">Choose <emph>File - New - Labels - Format</emph> tab</paragraph>
@@ -85,13 +82,13 @@
</section>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="166"><variable id="visikart">Choose <emph>File - New - Business Cards</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="167"><variable id="visikartform">Choose <emph>File - New - Business Cards - Medium</emph> tab
+<paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="167"><variable id="visikartform">Choose <emph>File - New - Business Cards - Medium</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152824" xml-lang="en-US" l10n="U" oldref="168"><variable id="viskartinhalt">Choose <emph>File - New - Business Cards - Business cards</emph> tab
+<paragraph role="paragraph" id="par_id3152824" xml-lang="en-US" l10n="U" oldref="168"><variable id="viskartinhalt">Choose <emph>File - New - Business Cards - Business cards</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="169"><variable id="viskartpriv">Choose <emph>File - New - Business Cards - Private</emph> tab
+<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="169"><variable id="viskartpriv">Choose <emph>File - New - Business Cards - Private</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="170"><variable id="viskartgesch">Choose <emph>File - New - Business Cards - Business</emph> tab
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="170"><variable id="viskartgesch">Choose <emph>File - New - Business Cards - Business</emph> tab
</variable></paragraph>
<section id="oeffnen">
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Open</emph>
@@ -103,7 +100,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -173,23 +170,23 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145592" xml-lang="en-US" l10n="U" oldref="107"><variable id="dtapsf">Choose <emph>File - Wizards - Presentation - Page 5</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10C46" xml-lang="en-US" l10n="CHG"><variable id="autopilotformular">Click <emph>Use Wizard to Create Form</emph> in a database file window.
+<paragraph role="paragraph" id="par_idN10C46" xml-lang="en-US" l10n="CHG"><variable id="autopilotformular">Click <emph>Use Wizard to Create Form</emph> in a database file window.
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10C5F" xml-lang="en-US" l10n="CHG"><variable id="autopilotreport">Click <emph>Use Wizard to Create Report</emph> in a database file window.
+<paragraph role="paragraph" id="par_idN10C5F" xml-lang="en-US" l10n="CHG"><variable id="autopilotreport">Click <emph>Use Wizard to Create Report</emph> in a database file window.
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10C24" xml-lang="en-US" l10n="NEW"><variable id="webwizard">Choose <emph>File - Wizards - Web Page</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154064" xml-lang="en-US" l10n="U" oldref="143"><variable id="gruppen">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame.
+<paragraph role="paragraph" id="par_id3154064" xml-lang="en-US" l10n="U" oldref="143"><variable id="gruppen">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152807" xml-lang="en-US" l10n="U" oldref="144"><variable id="gruppen1">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 1
+<paragraph role="paragraph" id="par_id3152807" xml-lang="en-US" l10n="U" oldref="144"><variable id="gruppen1">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 1
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150571" xml-lang="en-US" l10n="U" oldref="148"><variable id="gruppen2">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 2
+<paragraph role="paragraph" id="par_id3150571" xml-lang="en-US" l10n="U" oldref="148"><variable id="gruppen2">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 2
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="145"><variable id="gruppen3">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 3
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="145"><variable id="gruppen3">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 3
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156109" xml-lang="en-US" l10n="U" oldref="146"><variable id="gruppen4">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 4, there must be a database connection.
+<paragraph role="paragraph" id="par_id3156109" xml-lang="en-US" l10n="U" oldref="146"><variable id="gruppen4">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - Wizards page 4, there must be a database connection.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159347" xml-lang="en-US" l10n="U" oldref="147"><variable id="gruppen5">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - last page of Wizards
+<paragraph role="paragraph" id="par_id3159347" xml-lang="en-US" l10n="U" oldref="147"><variable id="gruppen5">In form design, click the <emph>Group Box</emph> icon on the toolbar and use the mouse to create a frame - last page of Wizards
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="150"><variable id="autopilotmsimport">Choose <emph>File - Wizards - Document Converter</emph>
</variable></paragraph>
@@ -224,7 +221,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -240,7 +237,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -250,33 +247,33 @@
</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
+<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>
-<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="79"><variable id="pngspeichern">Choose <emph>File - Save As</emph>, if PNG selected as file type, dialog opens automatically
+<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="79"><variable id="pngspeichern">Choose <emph>File - Save As</emph>, if PNG selected as file type, dialog opens automatically
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="97"><variable id="bmpspeichern">Choose <emph>File - Save As</emph>, if BMP selected as file type, dialog opens automatically
+<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="97"><variable id="bmpspeichern">Choose <emph>File - Save As</emph>, if BMP selected as file type, dialog opens automatically
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="98"><variable id="jpegspeichern">Choose <emph>File - Save As</emph>, if JPEG selected as file type, dialog opens automatically
+<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="98"><variable id="jpegspeichern">Choose <emph>File - Save As</emph>, if JPEG selected as file type, dialog opens automatically
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="99"><variable id="htmlspeichern">$[officename] Draw or $[officename] Impress menu <emph>File - Export</emph>, select "HTML Document" file type, this dialog opens automatically
+<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="99"><variable id="htmlspeichern">$[officename] Draw or $[officename] Impress menu <emph>File - Export</emph>, select "HTML Document" file type, this dialog opens automatically
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="137"><variable id="htmlspeichern1">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 1 of the wizard
+<paragraph role="paragraph" id="par_id3153387" xml-lang="en-US" l10n="U" oldref="137"><variable id="htmlspeichern1">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 1 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154021" xml-lang="en-US" l10n="U" oldref="138"><variable id="htmlspeichern2">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 2 of the wizard
+<paragraph role="paragraph" id="par_id3154021" xml-lang="en-US" l10n="U" oldref="138"><variable id="htmlspeichern2">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 2 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147246" xml-lang="en-US" l10n="U" oldref="159"><variable id="htmlspeichern3">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 3 of the wizard
+<paragraph role="paragraph" id="par_id3147246" xml-lang="en-US" l10n="U" oldref="159"><variable id="htmlspeichern3">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 3 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="U" oldref="140"><variable id="htmlspeichern4">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 4 of the wizard
+<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="U" oldref="140"><variable id="htmlspeichern4">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 4 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150235" xml-lang="en-US" l10n="U" oldref="141"><variable id="htmlspeichern5">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 5 of the wizard
+<paragraph role="paragraph" id="par_id3150235" xml-lang="en-US" l10n="U" oldref="141"><variable id="htmlspeichern5">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 5 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="142"><variable id="htmlspeichern6">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 6 of the wizard
+<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="142"><variable id="htmlspeichern6">$[officename] Draw/$[officename] Impress menu<emph> File - Export</emph>, select HTML file type, page 6 of the wizard
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="100"><variable id="svmspeichern">Choose <emph>File - Export</emph>, if SVM/WMF/PICT/MET selected as file type, dialog opens automatically
+<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="100"><variable id="svmspeichern">Choose <emph>File - Export</emph>, if SVM/WMF/PICT/MET selected as file type, dialog opens automatically
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="217"><variable id="bmpexport">Choose <emph>File - Export</emph>, if BMP selected as file type, dialog opens automatically
+<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="217"><variable id="bmpexport">Choose <emph>File - Export</emph>, if BMP selected as file type, dialog opens automatically
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155112" xml-lang="en-US" l10n="U" oldref="218"><variable id="gifexport">Choose <emph>File - Export</emph>, if GIF selected as file type, dialog opens
+<paragraph role="paragraph" id="par_id3155112" xml-lang="en-US" l10n="U" oldref="218"><variable id="gifexport">Choose <emph>File - Export</emph>, if GIF selected as file type, dialog opens
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154901" xml-lang="en-US" l10n="U" oldref="58"><variable id="saveall">Choose <emph>File - Save All</emph>
</variable></paragraph>
@@ -288,7 +285,7 @@
</section>
<paragraph role="paragraph" id="par_id3166425" xml-lang="en-US" l10n="U" oldref="61"><variable id="info1">Choose <emph>File - Properties</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150381" xml-lang="en-US" l10n="U" oldref="62"><variable id="info2">Choose <emph>File - Properties - General</emph> tab
+<paragraph role="paragraph" id="par_id3150381" xml-lang="en-US" l10n="U" oldref="62"><variable id="info2">Choose <emph>File - Properties - General</emph> tab
</variable></paragraph>
<section id="digitalsig">
<paragraph role="paragraph" id="par_idN11163" xml-lang="en-US" l10n="NEW">Choose <emph>File - Digital Signatures</emph>
@@ -298,15 +295,17 @@
<paragraph role="paragraph" id="par_idN11156" xml-lang="en-US" l10n="NEW">Choose <emph>File - Properties - General</emph> tab, click <emph>Digital Signatures</emph> button </paragraph>
<paragraph role="paragraph" id="par_idN1117E" xml-lang="en-US" l10n="NEW">Double-click the Signature field on the Status Bar.</paragraph>
</section>
-<paragraph role="paragraph" id="par_idN11173" xml-lang="en-US" l10n="NEW"><variable id="digitalsigsel">Choose <emph>File - Properties - General</emph> tab, click <emph>Digital Signatures</emph> button, then click <emph>Add</emph> button
+<paragraph role="paragraph" id="par_idN11173" xml-lang="en-US" l10n="NEW"><variable id="digitalsigsel">Choose <emph>File - Properties - General</emph> tab, click <emph>Digital Signatures</emph> button, then click <emph>Add</emph> button
+</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_id3150662" xml-lang="en-US" l10n="U" oldref="63"><variable id="info3">Choose <emph>File - Properties - Description</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_id3153792" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="info4">Choose <emph>File - Properties - Custom Properties</emph> tab
+<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>
-<paragraph role="paragraph" id="par_id3153701" xml-lang="en-US" l10n="U" oldref="65"><variable id="info5">Choose <emph>File - Properties - Statistics</emph> tab
+<paragraph role="paragraph" id="par_id315370199" xml-lang="en-US" l10n="NEW"><variable id="infosec">Choose <emph>File - Properties - Security</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149570" xml-lang="en-US" l10n="U" oldref="66"><variable id="info6">Choose <emph>File - Properties - Internet</emph> tab
+<paragraph role="paragraph" id="par_id3149570" xml-lang="en-US" l10n="U" oldref="66"><variable id="info6">Choose <emph>File - Properties - Internet</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154275" xml-lang="en-US" l10n="U" oldref="67"><variable id="dokuvorlage">Choose <emph>File - Templates</emph>
</variable></paragraph>
@@ -335,7 +334,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -362,7 +361,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -383,7 +382,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -410,7 +409,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -428,7 +427,7 @@
<tablerow>
<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.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -451,9 +450,9 @@
<paragraph role="paragraph" id="par_id3145827" xml-lang="en-US" l10n="CHG" oldref="76">Choose <emph>File - Open</emph> - select under "File type": "Text CSV" </paragraph>
<paragraph role="paragraph" id="par_id6071352" xml-lang="en-US" l10n="NEW">Choose <emph>Data - Text to Columns</emph> (Calc)</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3148608" xml-lang="en-US" l10n="U" oldref="81"><variable id="epsexport">Choose <emph>File - Export</emph>, if EPS is selected as file type, this dialog opens automatically
+<paragraph role="paragraph" id="par_id3148608" xml-lang="en-US" l10n="U" oldref="81"><variable id="epsexport">Choose <emph>File - Export</emph>, if EPS is selected as file type, this dialog opens automatically
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150107" xml-lang="en-US" l10n="U" oldref="87"><variable id="pbmppmpgm">Choose <emph>File - Export</emph>, if PBM, PPM or PGM is selected as file type, the dialog opens automatically
+<paragraph role="paragraph" id="par_id3150107" xml-lang="en-US" l10n="U" oldref="87"><variable id="pbmppmpgm">Choose <emph>File - Export</emph>, if PBM, PPM or PGM is selected as file type, the dialog opens automatically
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145305" xml-lang="en-US" l10n="U" oldref="96"><variable id="versionen"><variable id="autopilotberichtfeldauswahl">Choose <emph>File - Versions</emph>
</variable>
diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp
index a21661bec0..fd9831ea0a 100644
--- a/helpcontent2/source/text/shared/00/00000402.xhp
+++ b/helpcontent2/source/text/shared/00/00000402.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000402.xhp,v $
- * $Revision: 1.5.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3155577" src="res/commandimagelist/sc_undo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155577" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155577" src="res/commandimagelist/sc_undo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155577" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -72,7 +69,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="E">
-<image id="img_id3150358" src="res/commandimagelist/sc_redo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150358" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3150358" src="res/commandimagelist/sc_redo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150358" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -95,7 +92,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3145744" src="res/commandimagelist/sc_helpmenu.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145744" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145744" src="res/commandimagelist/sc_helpmenu.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145744" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -116,7 +113,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3154985" xml-lang="en-US" l10n="E">
-<image id="img_id3156441" src="res/commandimagelist/sc_copy.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156441" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3156441" src="res/commandimagelist/sc_copy.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156441" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -137,7 +134,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3159196" src="res/commandimagelist/sc_paste.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159196" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159196" src="res/commandimagelist/sc_paste.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159196" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -159,7 +156,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="E">
-<image id="img_id3153095" src="res/commandimagelist/sc_selectall.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153095" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153095" src="res/commandimagelist/sc_selectall.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153095" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -206,7 +203,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150020" xml-lang="en-US" l10n="E">
-<image id="img_id3149121" src="res/commandimagelist/sc_recsearch.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149121" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149121" src="res/commandimagelist/sc_recsearch.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149121" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -234,7 +231,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3159183" xml-lang="en-US" l10n="E">
-<image id="img_id3154508" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154508" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154508" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000403.xhp b/helpcontent2/source/text/shared/00/00000403.xhp
index 497c8b5bda..8fada8b835 100644
--- a/helpcontent2/source/text/shared/00/00000403.xhp
+++ b/helpcontent2/source/text/shared/00/00000403.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000403.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000404.xhp b/helpcontent2/source/text/shared/00/00000404.xhp
index f1a98a00e6..58da4f2d66 100644
--- a/helpcontent2/source/text/shared/00/00000404.xhp
+++ b/helpcontent2/source/text/shared/00/00000404.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000404.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Menu</paragraph>
-<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Note</emph> (in Writer or Calc)
+<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Comment</emph> (in Writer or Calc)
</variable></paragraph>
<section id="scannen">
<paragraph role="paragraph" id="par_id3155619" xml-lang="en-US" l10n="CHG" oldref="71">Choose <emph>Insert - Picture - Scan</emph>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index cd019d9589..d16dda5565 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000406.xhp,v $
- * $Revision: 1.18.4.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0000000406xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Tools Menu</title>
@@ -49,18 +46,18 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153551" xml-lang="en-US" l10n="U" oldref="127">Gallery</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153551" role="paragraph" 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
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" 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 - Spelling and Grammar</emph>
@@ -72,133 +69,122 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spelling and Grammar</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157809" role="paragraph" 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)
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156326" role="paragraph" l10n="CHG" oldref="164"><variable id="hangul">Choose <emph>Tools - Language - Hangul/Hanja Conversion</emph> (Asian language support must be enabled)
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10705" xml-lang="en-US" l10n="NEW"><variable id="chinese">Choose <emph>Tools - Language - Chinese Translation</emph> (Asian language support must be enabled)
+ <paragraph xml-lang="en-US" id="par_idN10705" role="paragraph" l10n="NEW"><variable id="chinese">Choose <emph>Tools - Language - Chinese Conversion</emph> (Asian language support must be enabled)
</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
+ <paragraph xml-lang="en-US" id="par_idN1071E" role="paragraph" l10n="NEW"><variable id="chineseedit">Choose <emph>Tools - Language - Chinese Conversion</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 - Spelling and Grammar</emph>
+ <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" 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 - Spelling and Grammar</emph>, then click <emph>Options</emph>
+ <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" 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>
+ <section id="thesaurus">
+ <paragraph xml-lang="en-US" id="par_id3151338" role="paragraph" l10n="CHG" oldref="8">Choose <emph>Tools - Language - Thesaurus</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149884" xml-lang="en-US" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3149884" role="paragraph" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
-</section>
-<section id="etpip">
-<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>Tools - Eyedropper</emph> ($[officename] Draw and $[officename] Impress)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
+ </section>
+ <section id="etpip">
+ <paragraph xml-lang="en-US" id="par_id3153320" role="paragraph" l10n="U" oldref="10">Choose <emph>Tools - Eyedropper</emph> ($[officename] Draw and $[officename] Impress)</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN107E9" role="paragraph" 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 <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system)
+ <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" 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>
+ <section id="recordmacro">
+ <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph>
</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="CHG" oldref="14"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, click the <emph>Organizer</emph> button, click the <emph>Libraries</emph> tab, and then click the <emph>Password</emph> button
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3150398" role="paragraph" l10n="CHG" oldref="14"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, click the <emph>Organizer</emph> button, click the <emph>Libraries</emph> tab, and then click the <emph>Password</emph> button
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10843" xml-lang="en-US" l10n="CHG"><variable id="packagemanager">Choose <emph>Tools - Extension Manager</emph>
+ <paragraph xml-lang="en-US" id="par_idN10843" role="paragraph" l10n="CHG"><variable id="packagemanager">Choose <emph>Tools - Extension Manager</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id9988402" xml-lang="en-US" l10n="NEW"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Updates</emph> button
+ <paragraph xml-lang="en-US" id="par_id9988402" role="paragraph" l10n="NEW"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Updates</emph> button
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151106" xml-lang="en-US" l10n="U" oldref="161"><variable id="xmlfilter">Choose <emph>Tools - XML Filter Settings</emph>
+ <paragraph xml-lang="en-US" id="par_id3151106" role="paragraph" l10n="U" oldref="161"><variable id="xmlfilter">Choose <emph>Tools - XML Filter Settings</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="CHG" oldref="162"><variable id="xmlfilteredit">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>New</emph> or <emph>Edit</emph>
+ <paragraph xml-lang="en-US" id="par_id3153778" role="paragraph" l10n="CHG" oldref="162"><variable id="xmlfilteredit">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>New</emph> or <emph>Edit</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148979" xml-lang="en-US" l10n="CHG" oldref="163"><variable id="xmlfiltertest">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>Test XSLTs</emph>
+ <paragraph xml-lang="en-US" id="par_id3148979" role="paragraph" l10n="CHG" oldref="163"><variable id="xmlfiltertest">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>Test XSLTs</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="CHG" oldref="15"><variable id="anpassen">Choose <emph>Tools - Customize</emph>
+ <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="CHG" oldref="15"><variable id="anpassen">Choose <emph>Tools - Customize</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize - Menu</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize - Menu</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN108E9" xml-lang="en-US" l10n="NEW"><variable id="menuenew">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>New</emph>
+ <paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph" l10n="NEW"><variable id="menuenew">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>New</emph>
</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>
+ <paragraph xml-lang="en-US" id="par_idN10919" role="paragraph" 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 (a document must be opened)
+ <paragraph xml-lang="en-US" id="par_id3145171" role="paragraph" 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
+ <paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="19"><variable id="symbole">Choose <emph>Tools - Customize - Toolbars</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
+ <paragraph xml-lang="en-US" id="par_id3157895" role="paragraph" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect Options</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
+ <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect Options</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options- Smart Tags</emph> tab
+ <paragraph xml-lang="en-US" id="par_id1978514" role="paragraph" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options - Smart Tags</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Replace</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3155368" role="paragraph" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect Options - Replace</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Exceptions</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3155860" role="paragraph" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect Options - Exceptions</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153094" xml-lang="en-US" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Custom Quotes</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3153094" role="paragraph" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect Options - Localized Options</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153945" xml-lang="en-US" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph> - Word Completion</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3153945" role="paragraph" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect Options - Word Completion</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151352" xml-lang="en-US" l10n="U" oldref="80"><variable id="exopas">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3151352" role="paragraph" l10n="U" oldref="80"><variable id="exopas">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3154127" role="paragraph" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="93"><variable id="etotm">Choose <emph>Tools - Options - %PRODUCTNAME Draw - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="93"><variable id="etotm">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw - General</emph>
</variable></paragraph>
-<section id="verzeichnis">
-<paragraph role="paragraph" id="par_id3145112" xml-lang="en-US" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
-<paragraph role="paragraph" id="par_id3153953" xml-lang="en-US" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph>Tools - Options - $[officename] - Paths</emph>
-</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3147295" xml-lang="en-US" l10n="U" oldref="23"><variable id="optionen">Choose <emph>Tools - Options</emph>
+ <section id="verzeichnis">
+ <paragraph xml-lang="en-US" id="par_id3145112" role="paragraph" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156006" xml-lang="en-US" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph>Tools - Options - $[officename]</emph>
+ <paragraph xml-lang="en-US" id="par_id3156006" role="paragraph" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph>Tools - Options - $[officename] - User Data</emph>
+ <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="136"><variable id="allg">Choose <emph>Tools - Options - $[officename] - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="136"><variable id="allg">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150032" xml-lang="en-US" l10n="U" oldref="147"><variable id="arbeit">Choose <emph>Tools - Options - $[officename] - Memory</emph>
+ <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="147"><variable id="arbeit">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="61"><variable id="ansicht">Choose <emph>Tools - Options - $[officename] - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3159153" role="paragraph" l10n="U" oldref="61"><variable id="ansicht">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3166413" xml-lang="en-US" l10n="U" oldref="137"><variable id="drucken">Choose <emph>Tools - Options - $[officename] - Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3166413" role="paragraph" l10n="U" oldref="137"><variable id="drucken">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>
</variable></paragraph>
<section id="pfade">
-<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3150036" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Edit - AutoText - Path</emph>
</paragraph>
</section>
<section id="color">
-<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Tools - Options - $[officename] - Colors</emph>
+<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Format - Area - Colors</emph> tab</paragraph>
</section>
<section id="color2">
-<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Tools - Options - $[officename] - Colors - Edit</emph>
+<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors - Edit</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3145729" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Format - Area - Colors</emph> tab<emph> - Edit</emph> button</paragraph>
<paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="67">Choose <emph>Format - 3D Effects</emph> icon on the <emph>Illumination</emph> tab</paragraph>
@@ -207,141 +193,139 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="E">
-<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 id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
</image></paragraph>
-</tablecell>
-<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>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151037" role="paragraph" l10n="U" oldref="68">Select color on the <emph>Color</emph> tab page</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149403" role="paragraph" l10n="U" oldref="72"><variable id="schriers">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Fonts</emph>
+</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U" oldref="43"><variable id="scripting">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Security</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="U" oldref="43"><variable id="scripting">Choose <emph>Tools - Options - $[officename] - Security</emph>
+ <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10C3D" xml-lang="en-US" l10n="NEW"><variable id="java">Choose <emph>Tools - Options - $[officename] - Java</emph>
+ <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Online Update </emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id5485702" xml-lang="en-US" l10n="NEW"><variable id="online_update">Choose <emph>Tools - Options - $[officename] - Online Update </emph>
+ <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Accessibility</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146989" xml-lang="en-US" l10n="U" oldref="152"><variable id="accessibility">Choose <emph>Tools - Options - $[officename] - Accessibility</emph>
+ <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3144746" xml-lang="en-US" l10n="U" oldref="153"><variable id="appearance">Choose <emph>Tools - Options - $[officename] - Appearance</emph>
+ <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="U" oldref="32"><variable id="landen">Choose <emph>Tools - Options - Load/Save</emph>
+ <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147223" xml-lang="en-US" l10n="U" oldref="27"><variable id="rsave">Choose <emph>Tools - Options - Load/Save - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153958" xml-lang="en-US" l10n="U" oldref="119"><variable id="etsofi">Choose <emph>Tools - Options - Load/Save</emph> - <emph>VBA Properties</emph>
+ <paragraph xml-lang="en-US" id="par_id3153958" role="paragraph" l10n="U" oldref="119"><variable id="etsofi">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>VBA Properties</emph>
</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>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - 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 </emph>
-<emph>Compatibility</emph>
+ <paragraph xml-lang="en-US" id="par_id3145667" role="paragraph" l10n="U" oldref="49"><variable id="html">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>HTML 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>
+ <paragraph xml-lang="en-US" id="par_id3146792" role="paragraph" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3157965" xml-lang="en-US" l10n="U" oldref="131"><variable id="sprachen">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+ <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="131"><variable id="sprachen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155446" xml-lang="en-US" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph>Tools - Options - Language Settings - Languages - Complex Text Layout</emph>
+ <paragraph xml-lang="en-US" id="par_id3155446" role="paragraph" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages - Complex Text Layout</emph>
</variable></paragraph>
-<section id="linguistik">
-<paragraph role="paragraph" id="par_id3150745" xml-lang="en-US" l10n="U" oldref="45">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+ <section id="linguistik">
+ <paragraph xml-lang="en-US" id="par_id3150745" role="paragraph" l10n="U" oldref="45">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
</paragraph>
-</section>
-<section id="linguistikmodule">
-<paragraph role="paragraph" id="par_id3148407" xml-lang="en-US" l10n="U" oldref="134">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
-</section>
-<section id="writingaids">
-<paragraph role="paragraph" id="par_id3150324" xml-lang="en-US" l10n="U" oldref="157">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>
+ </section>
+ <section id="linguistikmodule">
+ <paragraph xml-lang="en-US" id="par_id3148407" role="paragraph" l10n="U" oldref="134">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
+ </section>
+ <section id="writingaids">
+ <paragraph xml-lang="en-US" id="par_id3150324" role="paragraph" l10n="U" oldref="157">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>
</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="135"><variable id="suchja">Choose <emph>Tools - Options - Language Settings - Searching in Japanese</emph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3145620" role="paragraph" l10n="U" oldref="135"><variable id="suchja">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Searching in Japanese</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="U" oldref="133"><variable id="asialayout">Choose <emph>Tools - Options - Language Settings - Asian Layout</emph>
+ <paragraph xml-lang="en-US" id="par_id3147341" role="paragraph" l10n="U" oldref="133"><variable id="asialayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Asian Layout</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147359" xml-lang="en-US" l10n="U" oldref="138"><variable id="internet">Choose <emph>Tools - Options - Internet</emph>
+ <paragraph xml-lang="en-US" id="par_id3147359" role="paragraph" l10n="U" oldref="138"><variable id="internet">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="33"><variable id="internet1">Choose <emph>Tools - Options - Internet - Proxy</emph>
+ <paragraph xml-lang="en-US" id="par_id3156374" role="paragraph" l10n="U" oldref="33"><variable id="internet1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159339" xml-lang="en-US" l10n="U" oldref="36"><variable id="internet4">Choose <emph>Tools - Options - Internet - Search</emph>
+ <paragraph xml-lang="en-US" id="par_id3159339" role="paragraph" l10n="U" oldref="36"><variable id="internet4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Search</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149280" xml-lang="en-US" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph>
+ <paragraph xml-lang="en-US" id="par_id3149280" role="paragraph" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10E4F" xml-lang="en-US" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Compatibility</emph>
+ <paragraph xml-lang="en-US" id="par_idN10E4F" role="paragraph" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Compatibility</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148929" xml-lang="en-US" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3148929" role="paragraph" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10F2F" xml-lang="en-US" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
+ <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149825" xml-lang="en-US" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>
+ <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
+ <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
+ <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153534" xml-lang="en-US" l10n="U" oldref="47"><variable id="raster">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
+ <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="U" oldref="47"><variable id="raster">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
</variable></paragraph>
-<section id="grundschriften">
-<paragraph role="paragraph" id="par_id3155961" xml-lang="en-US" l10n="U" oldref="97">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
+ <section id="grundschriften">
+ <paragraph xml-lang="en-US" id="par_id3155961" role="paragraph" l10n="U" oldref="97">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3159313" xml-lang="en-US" l10n="U" oldref="151">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
-</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>
+ <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="U" oldref="151">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3155607" role="paragraph" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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 xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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>
+ <paragraph xml-lang="en-US" id="par_id3145769" role="paragraph" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph>
+ <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Changes</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159333" xml-lang="en-US" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web</emph>
+ <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149448" xml-lang="en-US" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - Background</emph>
+ <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - Background</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149336" xml-lang="en-US" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>
+ <paragraph xml-lang="en-US" id="par_id3149336" role="paragraph" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152966" xml-lang="en-US" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3152966" role="paragraph" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - General</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph>
+ <paragraph xml-lang="en-US" id="par_id3154656" role="paragraph" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152494" xml-lang="en-US" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>
+ <paragraph xml-lang="en-US" id="par_id3152494" role="paragraph" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>
</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
+ <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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 - </emph>
-<emph>Options - %PRODUCTNAME Calc - Changes</emph>
+ <paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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 </emph>
-<emph>- Options - %PRODUCTNAME Impress</emph>
+ <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148418" xml-lang="en-US" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3148418" role="paragraph" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150380" xml-lang="en-US" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3166423" xml-lang="en-US" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
+ <paragraph xml-lang="en-US" id="par_id3166423" role="paragraph" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148873" xml-lang="en-US" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3148873" role="paragraph" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145220" xml-lang="en-US" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph>Tools - Options - %PRODUCTNAME Draw</emph>
+ <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149573" xml-lang="en-US" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math</emph>
+ <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145613" xml-lang="en-US" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math - Settings</emph>
+ <paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math - Settings</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155137" xml-lang="en-US" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph>Tools - Options - Charts</emph>
+ <paragraph xml-lang="en-US" id="par_id3155137" role="paragraph" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149211" xml-lang="en-US" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph>Tools - Options - Charts - Default Colors</emph>
+ <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts - Default Colors</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150862" xml-lang="en-US" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph>Tools - Options - %PRODUCTNAME Base</emph>
+ <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147368" xml-lang="en-US" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>
+ <paragraph xml-lang="en-US" id="par_id3147368" role="paragraph" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Connections</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1120D" xml-lang="en-US" l10n="NEW"><variable id="registered">Choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>
+ <paragraph xml-lang="en-US" id="par_idN1120D" role="paragraph" l10n="NEW"><variable id="registered">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>
</variable></paragraph>
-</body>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000407.xhp b/helpcontent2/source/text/shared/00/00000407.xhp
index df8e8ca3aa..f2ac95df43 100755
--- a/helpcontent2/source/text/shared/00/00000407.xhp
+++ b/helpcontent2/source/text/shared/00/00000407.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000407.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000408.xhp b/helpcontent2/source/text/shared/00/00000408.xhp
index 8a4b21bf28..161eec726b 100755
--- a/helpcontent2/source/text/shared/00/00000408.xhp
+++ b/helpcontent2/source/text/shared/00/00000408.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000408.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000409.xhp b/helpcontent2/source/text/shared/00/00000409.xhp
index 60b2758d34..d334819870 100644
--- a/helpcontent2/source/text/shared/00/00000409.xhp
+++ b/helpcontent2/source/text/shared/00/00000409.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000409.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00000450.xhp b/helpcontent2/source/text/shared/00/00000450.xhp
index 32c4ea11c9..6f828ec3fc 100644
--- a/helpcontent2/source/text/shared/00/00000450.xhp
+++ b/helpcontent2/source/text/shared/00/00000450.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000450.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type
</variable><comment>see #i56356</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp
index 36585d1c46..ec099022ec 100644
--- a/helpcontent2/source/text/shared/00/00040500.xhp
+++ b/helpcontent2/source/text/shared/00/00040500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,300 +32,302 @@
<meta>
-<topic id="textshared0000040500xml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Format Menu</title>
-<filename>/text/shared/00/00040500.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-<paragraph role="paragraph" id="par_id3145356" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="standard">Choose <emph>Format - Default Formatting</emph>
+ <topic id="textshared0000040500xml" indexer="exclude">
+ <title xml-lang="en-US" id="tit">Format Menu</title>
+ <filename>/text/shared/00/00040500.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <paragraph xml-lang="en-US" id="hd_id3150347" role="heading" level="1" l10n="U" oldref="1">Format Menu</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145356" role="paragraph" l10n="CHG" oldref="8"><variable id="standard">Choose <emph>Format - Default Formatting</emph>
</variable></paragraph>
-<section id="zeichen">
-<paragraph role="paragraph" id="par_id3153244" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - Character</emph>
+ <section id="zeichen">
+ <paragraph xml-lang="en-US" id="par_id3153244" role="paragraph" l10n="U" oldref="9">Choose <emph>Format - Character</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152352" xml-lang="en-US" l10n="CHG" oldref="10">On <emph>Text Formatting</emph> Bar (with cursor in object), click</paragraph>
-<section id="syzeich">
-<table id="tbl_id3150008">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148998" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_outlineformat.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <paragraph xml-lang="en-US" id="par_id3152352" role="paragraph" l10n="CHG" oldref="10">On <emph>Text Formatting</emph> Bar (with cursor in object), click</paragraph>
+ <section id="syzeich">
+ <table id="tbl_id3150008">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148998" role="paragraph" l10n="E">
+<image id="img_id3154894" src="res/commandimagelist/sc_outlineformat.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154894">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="11">Character</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149999" role="paragraph" l10n="U" oldref="11">Character</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="schrift">
-<paragraph role="paragraph" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Format - Character - Font</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="14">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="16">Open context menu of a row header in a database table - choose <emph>Table Format - Font</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Format - Title - Character</emph> tab (Chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>Format - Legend - Character</emph> tab (Chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3153717" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Format - Axis - Character</emph> tab (Chart documents)</paragraph>
+ </section>
+ </section>
+ <section id="schrift">
+ <paragraph xml-lang="en-US" id="par_id3153935" role="paragraph" l10n="U" oldref="12">Choose <emph>Format - Character - Font</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157958" role="paragraph" l10n="CHG" oldref="14">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155338" role="paragraph" l10n="U" oldref="16">Open context menu of a row header in a database table - choose <emph>Table Format - Font</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150355" role="paragraph" l10n="U" oldref="18">Choose <emph>Format - Title - Character</emph> tab (Chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149812" role="paragraph" l10n="U" oldref="19">Choose <emph>Format - Legend - Character</emph> tab (Chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153717" role="paragraph" l10n="U" oldref="20">Choose <emph>Format - Axis - Character</emph> tab (Chart documents)</paragraph>
<switch select="appl">
<case select="CALC">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Cell - Font</emph> tab (spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3156306" xml-lang="en-US" l10n="U" oldref="199">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="17">Choose <emph>Format - Cell - Font</emph> tab (spreadsheets)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156306" role="paragraph" l10n="U" oldref="199">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
</case>
</switch>
</section>
-<section id="schrifteffekt">
-<paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="21">Choose <emph>Format - Character - Font Effects</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="CHG" oldref="23">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font Effects</emph> tab</paragraph>
+ <section id="schrifteffekt">
+ <paragraph xml-lang="en-US" id="par_id3155829" role="paragraph" l10n="U" oldref="21">Choose <emph>Format - Character - Font Effects</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="CHG" oldref="23">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Font Effects</emph> tab</paragraph>
<switch select="appl">
<case select="CALC">
-<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="200">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159176" role="paragraph" l10n="U" oldref="200">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
</case>
</switch>
</section>
-<section id="position">
-<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="181">Choose <emph>Format - Character - Position</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="183">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Alignment</emph> tab</paragraph>
+ <section id="position">
+ <paragraph xml-lang="en-US" id="par_id3153541" role="paragraph" l10n="U" oldref="181">Choose <emph>Format - Character - Position</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159256" role="paragraph" l10n="CHG" oldref="183">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Alignment</emph> tab</paragraph>
<switch select="appl">
<case select="CALC">
-<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="201">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" l10n="U" oldref="201">Menu <emph>Format - Page - Header/Footer</emph> - <emph>Edit</emph> button (spreadsheets)</paragraph>
</case>
</switch>
</section>
-<section id="asilayout">
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="186">Choose <emph>Format - Character - Asian Layout</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="CHG" oldref="188">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Layout</emph> tab</paragraph>
-</section>
-<section id="asitypo">
-<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="190">Choose <emph>Format - Paragraph - Asian Typography</emph> tab (not in HTML)</paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="191"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cell - Asian Typography</emph> tab
+ <section id="asilayout">
+ <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="186">Choose <emph>Format - Character - Asian Layout</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152811" role="paragraph" l10n="CHG" oldref="188">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Layout</emph> tab</paragraph>
+ </section>
+ <section id="asitypo">
+ <paragraph xml-lang="en-US" id="par_id3153524" role="paragraph" l10n="U" oldref="190">Choose <emph>Format - Paragraph - Asian Typography</emph> tab (not in HTML)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="191"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cell - Asian Typography</emph> tab
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148742" xml-lang="en-US" l10n="CHG" oldref="193">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Typography</emph> tab</paragraph>
-</section>
-<section id="hyperl">
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Format - Character - Hyperlink</emph> tab</paragraph>
-</section>
-<section id="absatz">
-<paragraph role="paragraph" id="par_id3149169" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Format - Paragraph</emph>
+ <paragraph xml-lang="en-US" id="par_id3148742" role="paragraph" l10n="CHG" oldref="193">Choose <emph>Format - Styles and Formatting - </emph>open context menu of an entry and click <emph>Modify/New - Asian Typography</emph> tab</paragraph>
+ </section>
+ <section id="hyperl">
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="26">Choose <emph>Format - Character - Hyperlink</emph> tab</paragraph>
+ </section>
+ <section id="absatz">
+ <paragraph xml-lang="en-US" id="par_id3149169" role="paragraph" l10n="U" oldref="29">Choose <emph>Format - Paragraph</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3151381" xml-lang="en-US" l10n="CHG" oldref="30">On <emph>Text Formatting</emph> bar (with cursor in object), click</paragraph>
-<section id="syabsatz">
-<table id="tbl_id3150652">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155995" xml-lang="en-US" l10n="E">
-<image id="img_id3150495" src="res/commandimagelist/sc_paragraphdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150495" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <paragraph xml-lang="en-US" id="par_id3151381" role="paragraph" l10n="CHG" oldref="30">On <emph>Text Formatting</emph> bar (with cursor in object), click</paragraph>
+ <section id="syabsatz">
+ <table id="tbl_id3150652">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155995" role="paragraph" l10n="E">
+<image id="img_id3150495" src="res/commandimagelist/sc_paragraphdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150495">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="CHG" oldref="31">Paragraph</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147299" role="paragraph" l10n="CHG" oldref="31">Paragraph</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="absatzausrichtung">
-<paragraph role="paragraph" id="par_id3147289" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Format - Paragraph - Alignment</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147352" xml-lang="en-US" l10n="CHG" oldref="179">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Alignment</emph> tab</paragraph>
-</section>
-<section id="einzug">
-<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="32">Choose <emph>Format - Paragraph - Indents &amp; Spacing</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3152463" xml-lang="en-US" l10n="CHG" oldref="34">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Indents &amp; Spacing</emph> tab</paragraph>
-</section>
-<section id="tabulator">
-<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="39">Choose <emph>Format - Paragraph - Tabs</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154833" xml-lang="en-US" l10n="CHG" oldref="41">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Tabs</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3159155" xml-lang="en-US" l10n="U" oldref="43">Double-click the ruler</paragraph>
-</section>
-<section id="umrandung">
-<paragraph role="paragraph" id="par_idN109E2" xml-lang="en-US" l10n="NEW">(all options only in Writer or Calc)</paragraph>
-<paragraph role="paragraph" id="par_id3156105" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Format - Paragraph - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154149" xml-lang="en-US" l10n="CHG" oldref="45">Choose <emph>Format - Picture - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3163822" xml-lang="en-US" l10n="U" oldref="48">Choose <emph>Format - Frame/Object - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="51">Choose <emph>Format - Page - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149911" xml-lang="en-US" l10n="CHG" oldref="53">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Borders</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="CHG" oldref="55">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Borders</emph> tab
+ </section>
+ </section>
+ <section id="absatzausrichtung">
+ <paragraph xml-lang="en-US" id="par_id3147289" role="paragraph" l10n="U" oldref="4">Choose <emph>Format - Paragraph - Alignment</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG" oldref="179">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Alignment</emph> tab</paragraph>
+ </section>
+ <section id="einzug">
+ <paragraph xml-lang="en-US" id="par_id3154640" role="paragraph" l10n="U" oldref="32">Choose <emph>Format - Paragraph - Indents &amp; Spacing</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152463" role="paragraph" l10n="CHG" oldref="34">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Indents &amp; Spacing</emph> tab</paragraph>
+ </section>
+ <section id="tabulator">
+ <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="39">Choose <emph>Format - Paragraph - Tabs</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154833" role="paragraph" l10n="CHG" oldref="41">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Tabs</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159155" role="paragraph" l10n="U" oldref="43">Double-click the ruler</paragraph>
+ </section>
+ <section id="umrandung">
+ <paragraph xml-lang="en-US" id="par_idN109E2" role="paragraph" l10n="NEW">(all options only in Writer or Calc)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156105" role="paragraph" l10n="CHG" oldref="44">Choose <emph>Format - Paragraph - Borders</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154149" role="paragraph" l10n="CHG" oldref="45">Choose <emph>Format - Picture - Borders</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163822" role="paragraph" l10n="U" oldref="48">Choose <emph>Format - Frame/Object - Borders</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150048" role="paragraph" l10n="U" oldref="51">Choose <emph>Format - Page - Borders</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149911" role="paragraph" l10n="CHG" oldref="53">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Borders</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150094" role="paragraph" l10n="U" oldref="54">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154501" role="paragraph" l10n="CHG" oldref="55">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148455" role="paragraph" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Borders</emph> tab
</caseinline></switchinline></paragraph>
-</section>
-<section id="umrandungab">
-<paragraph role="paragraph" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="177"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Paragraph</emph> - <emph>Border</emph> tab -<emph> Spacing to contents</emph>
+ </section>
+ <section id="umrandungab">
+ <paragraph xml-lang="en-US" id="par_id3155915" role="paragraph" l10n="U" oldref="177"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Paragraph</emph> - <emph>Border</emph> tab -<emph> Spacing to contents</emph>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3159130" xml-lang="en-US" l10n="U" oldref="178"><switchinline select="appl"><caseinline select="CALC">Menu<emph> Format - Page - Border - Spacing to contents</emph>
+ <paragraph xml-lang="en-US" id="par_id3159130" role="paragraph" l10n="U" oldref="178"><switchinline select="appl"><caseinline select="CALC">Menu<emph> Format - Page - Border - Spacing to contents</emph>
</caseinline></switchinline></paragraph>
-</section>
-<section id="hintergrund">
-<paragraph role="paragraph" id="par_id3155853" xml-lang="en-US" l10n="U" oldref="57">Choose <emph>Format - Paragraph - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="58">Choose <emph>Format - Character - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="59">Choose <emph>Format - Picture - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3150592" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Frame/Object - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Format - Page - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3159110" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3153532" xml-lang="en-US" l10n="CHG" oldref="67">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3144747" xml-lang="en-US" l10n="U" oldref="174">Choose <emph>Insert/Edit - Section - Background</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3146900" xml-lang="en-US" l10n="U" oldref="71"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Background</emph> tab
+ </section>
+ <section id="hintergrund">
+ <paragraph xml-lang="en-US" id="par_id3155853" role="paragraph" l10n="U" oldref="57">Choose <emph>Format - Paragraph - Background</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147330" role="paragraph" l10n="U" oldref="58">Choose <emph>Format - Character - Background</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149486" role="paragraph" l10n="CHG" oldref="59">Choose <emph>Format - Picture - Background</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="U" oldref="61">Choose <emph>Format - Frame/Object - Background</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151321" role="paragraph" l10n="U" oldref="65">Choose <emph>Format - Page - Background</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154510" role="paragraph" l10n="U" oldref="68">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159110" role="paragraph" l10n="U" oldref="69">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="CHG" oldref="67">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Background</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144747" role="paragraph" l10n="U" oldref="174">Choose <emph>Insert/Edit - Section - Background</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146900" role="paragraph" l10n="U" oldref="71"><switchinline select="appl"><caseinline select="CALC">Choose <emph>Format - Cells - Background</emph> tab
</caseinline></switchinline></paragraph>
-</section>
-<section id="seiteverwalten">
-<paragraph role="paragraph" id="par_id3146791" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Format - Page - Organizer</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="CHG" oldref="74">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Organizer</emph> tab</paragraph>
-</section>
-<section id="seite">
-<paragraph role="paragraph" id="par_id3153357" xml-lang="en-US" l10n="U" oldref="75">Choose <emph>Format - Page - Page</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154362" xml-lang="en-US" l10n="CHG" oldref="77">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Page</emph> tab</paragraph>
-</section>
-<section id="kopfzeile">
-<paragraph role="paragraph" id="par_id3155515" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>Format - Page - Header</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="CHG" oldref="80">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Header</emph> tab</paragraph>
-</section>
-<section id="fusszeile">
-<paragraph role="paragraph" id="par_id3145618" xml-lang="en-US" l10n="U" oldref="81">Choose <emph>Format - Page - Footer</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3155175" xml-lang="en-US" l10n="CHG" oldref="83">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Footer</emph> tab</paragraph>
-</section>
-<section id="gestalter">
-<paragraph role="paragraph" id="par_id3147404" xml-lang="en-US" l10n="U" oldref="84">Choose <emph>Format - Styles and Formatting</emph>
+ </section>
+ <section id="seiteverwalten">
+ <paragraph xml-lang="en-US" id="par_id3146791" role="paragraph" l10n="U" oldref="72">Choose <emph>Format - Page - Organizer</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154482" role="paragraph" l10n="CHG" oldref="74">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Organizer</emph> tab</paragraph>
+ </section>
+ <section id="seite">
+ <paragraph xml-lang="en-US" id="par_id3153357" role="paragraph" l10n="U" oldref="75">Choose <emph>Format - Page - Page</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154362" role="paragraph" l10n="CHG" oldref="77">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Page</emph> tab</paragraph>
+ </section>
+ <section id="kopfzeile">
+ <paragraph xml-lang="en-US" id="par_id3155515" role="paragraph" l10n="U" oldref="78">Choose <emph>Format - Page - Header</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148405" role="paragraph" l10n="CHG" oldref="80">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Header</emph> tab</paragraph>
+ </section>
+ <section id="fusszeile">
+ <paragraph xml-lang="en-US" id="par_id3145618" role="paragraph" l10n="U" oldref="81">Choose <emph>Format - Page - Footer</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155175" role="paragraph" l10n="CHG" oldref="83">Choose <emph>Format - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Footer</emph> tab</paragraph>
+ </section>
+ <section id="gestalter">
+ <paragraph xml-lang="en-US" id="par_id3147404" role="paragraph" l10n="U" oldref="84">Choose <emph>Format - Styles and Formatting</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3166447" xml-lang="en-US" l10n="U" oldref="95">F11 key</paragraph>
-<paragraph role="paragraph" id="par_id3147321" xml-lang="en-US" l10n="CHG" oldref="85">On <emph>Formatting</emph> Bar, click</paragraph>
-<table id="tbl_id3163807">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148533" xml-lang="en-US" l10n="E">
-<image id="img_id3149568" src="res/commandimagelist/sc_designerdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149568" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <paragraph xml-lang="en-US" id="par_id3166447" role="paragraph" l10n="U" oldref="95"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147321" role="paragraph" l10n="CHG" oldref="85">On <emph>Formatting</emph> Bar, click</paragraph>
+ <table id="tbl_id3163807">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148533" role="paragraph" l10n="E">
+<image id="img_id3149568" src="res/commandimagelist/sc_designerdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149568">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153534" xml-lang="en-US" l10n="CHG" oldref="86">Styles and Formatting</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="CHG" oldref="86">Styles and Formatting</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<section id="3d">
-<paragraph role="paragraph" id="par_id3159313" xml-lang="en-US" l10n="CHG" oldref="88"><switchinline select="appl"><caseinline select="CHART">
+ </section>
+ <section id="3d">
+ <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="CHG" oldref="88"><switchinline select="appl"><caseinline select="CHART">
</caseinline><caseinline select="CALC">
</caseinline><caseinline select="WRITER">
</caseinline><caseinline select="MATH">
</caseinline><defaultinline>On the <emph>Drawing</emph> bar, click</defaultinline></switchinline></paragraph>
-<section id="sy3d">
-<table id="tbl_id3150297">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3109845" xml-lang="en-US" l10n="E">
-<image id="img_id3159236" src="res/commandimagelist/sc_window3d.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159236" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="sy3d">
+ <table id="tbl_id3150297">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3109845" role="paragraph" l10n="E">
+<image id="img_id3159236" src="res/commandimagelist/sc_window3d.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3159236">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152498" xml-lang="en-US" l10n="CHG" oldref="3">
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152498" role="paragraph" l10n="CHG" oldref="3">
<emph>3D Effects</emph>
</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="90"><variable id="3dgeometrie">Choose <emph>Format - 3D Effects - Geometry</emph> tab
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3145256" role="paragraph" l10n="CHG" oldref="90"><variable id="3dgeometrie">Open the context menu of the 3D object, choose <emph>3D Effects - Geometry</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154203" xml-lang="en-US" l10n="U" oldref="91"><variable id="3ddarstellung">Choose <emph>Format - 3D Effects - Shading</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3154203" role="paragraph" l10n="CHG" oldref="91"><variable id="3ddarstellung">Open the context menu of the 3D object, choose <emph>3D Effects - Shading</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151284" xml-lang="en-US" l10n="U" oldref="92"><variable id="3dbeleuchtung">Choose <emph>Format - 3D Effects - Illumination</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3151284" role="paragraph" l10n="CHG" oldref="92"><variable id="3dbeleuchtung">Open the context menu of the 3D object, choose <emph>3D Effects - Illumination</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152475" xml-lang="en-US" l10n="U" oldref="93"><variable id="3dtexturen">Choose <emph>Format - 3D Effects - Textures</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3152475" role="paragraph" l10n="CHG" oldref="93"><variable id="3dtexturen">Open the context menu of the 3D object, choose <emph>3D Effects - Textures</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154572" xml-lang="en-US" l10n="U" oldref="94"><variable id="3dmaterial">Choose <emph>Format - 3D Effects - Material</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3154572" role="paragraph" l10n="CHG" oldref="94"><variable id="3dmaterial">Open the context menu of the 3D object, choose <emph>3D Effects - Material</emph> tab
</variable></paragraph>
-<section id="numauf">
-<paragraph role="paragraph" id="par_id3145220" xml-lang="en-US" l10n="CHG" oldref="155">Choose <emph>Format - Bullets and Numbering </emph>
+ <section id="numauf">
+ <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="155">Choose <emph>Format - Bullets and Numbering </emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="CHG" oldref="156">On <emph>Formatting</emph> toolbar, click</paragraph>
-<section id="synumauf">
-<table id="tbl_id3152774">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149445" xml-lang="en-US" l10n="E">
-<image id="img_id3149964" src="res/commandimagelist/sc_defaultbullet.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <paragraph xml-lang="en-US" id="par_id3148771" role="paragraph" l10n="CHG" oldref="156">On <emph>Formatting</emph> toolbar, click</paragraph>
+ <section id="synumauf">
+ <table id="tbl_id3152774">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149445" role="paragraph" l10n="E">
+<image id="img_id3149964" src="res/commandimagelist/sc_defaultbullet.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149964">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="163">Bullets On/Off</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157970" role="paragraph" l10n="U" oldref="163">Bullets On/Off</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="numoptionen">
-<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="CHG" oldref="157">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Options</emph> tab page</paragraph>
-<paragraph role="paragraph" id="par_id3150785" xml-lang="en-US" l10n="U" oldref="164"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
+ </section>
+ </section>
+ <section id="numoptionen">
+ <paragraph xml-lang="en-US" id="par_id3149735" role="paragraph" l10n="CHG" oldref="157">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Options</emph> tab page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150785" role="paragraph" l10n="U" oldref="164"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148420" xml-lang="en-US" l10n="CHG" oldref="165"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+ <paragraph xml-lang="en-US" id="par_id3148420" role="paragraph" l10n="CHG" oldref="165"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-</section>
-<section id="numbullets">
-<paragraph role="paragraph" id="par_id3148888" xml-lang="en-US" l10n="CHG" oldref="158">Choose <emph>Format - Bullets and Numbering - Bullets</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149917" xml-lang="en-US" l10n="U" oldref="166"><switchinline select="appl"><caseinline select="IMPRESS">Open Styles and Formatting - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
+ </section>
+ <section id="numbullets">
+ <paragraph xml-lang="en-US" id="par_id3148888" role="paragraph" l10n="CHG" oldref="158">Choose <emph>Format - Bullets and Numbering - Bullets</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149917" role="paragraph" l10n="U" oldref="166"><switchinline select="appl"><caseinline select="IMPRESS">Open Styles and Formatting - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154930" xml-lang="en-US" l10n="CHG" oldref="167"><switchinline select="appl"><caseinline select="WRITER">Open Styles and Formatting - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+ <paragraph xml-lang="en-US" id="par_id3154930" role="paragraph" l10n="CHG" oldref="167"><switchinline select="appl"><caseinline select="WRITER">Open Styles and Formatting - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-</section>
-<section id="numnumerierungsart">
-<paragraph role="paragraph" id="par_id3150862" xml-lang="en-US" l10n="CHG" oldref="159">Choose <emph>Format - Bullets and Numbering - Numbering</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3155378" xml-lang="en-US" l10n="U" oldref="168"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
+ </section>
+ <section id="numnumerierungsart">
+ <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="159">Choose <emph>Format - Bullets and Numbering - Numbering</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155378" role="paragraph" l10n="U" oldref="168"><switchinline select="appl"><caseinline select="IMPRESS">Open <emph>Styles and Formatting</emph> - Presentation Styles - context menu of an Outline Style - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156011" xml-lang="en-US" l10n="CHG" oldref="169"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+ <paragraph xml-lang="en-US" id="par_id3156011" role="paragraph" l10n="CHG" oldref="169"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-</section>
-<section id="numnumerierung">
-<paragraph role="paragraph" id="par_id3155848" xml-lang="en-US" l10n="CHG" oldref="160">Choose <emph>Format - Bullets and Numbering - Outline</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148733" xml-lang="en-US" l10n="CHG" oldref="170"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id0611200904324832" role="paragraph" l10n="NEW"><variable id="graphics">Choose <emph>Format - Bullets and Numbering - Graphics</emph> tab
+</variable></paragraph>
+ <section id="numnumerierung">
+ <paragraph xml-lang="en-US" id="par_id3155848" role="paragraph" l10n="CHG" oldref="160">Choose <emph>Format - Bullets and Numbering - Outline</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148733" role="paragraph" l10n="CHG" oldref="170"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting</emph> - Numbering Styles - context menu of an entry - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-</section>
-<section id="numposition">
-<paragraph role="paragraph" id="par_id3156658" xml-lang="en-US" l10n="CHG" oldref="162">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Position</emph> tab page</paragraph>
-<paragraph role="paragraph" id="par_id3156170" xml-lang="en-US" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Tools - Outline Numbering - Position</emph> tab
+ </section>
+ <section id="numposition">
+ <paragraph xml-lang="en-US" id="par_id3156658" role="paragraph" l10n="CHG" oldref="162">Choose <emph>Format - Bullets and Numbering</emph>. Open <emph>Position</emph> tab page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156170" role="paragraph" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Tools - Outline Numbering - Position</emph> tab
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153812" xml-lang="en-US" l10n="CHG" oldref="173"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting - Numbering Styles</emph> - context menu of an entry - choose <emph>New/Modify</emph>
+ <paragraph xml-lang="en-US" id="par_id3153812" role="paragraph" l10n="CHG" oldref="173"><switchinline select="appl"><caseinline select="WRITER">Open <emph>Styles and Formatting - Numbering Styles</emph> - context menu of an entry - choose <emph>New/Modify</emph>
</caseinline></switchinline></paragraph>
-</section>
-<section id="grafikzuschn">
-<paragraph role="paragraph" id="par_id3151332" xml-lang="en-US" l10n="CHG" oldref="194"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Picture </emph>- <emph>Crop</emph> tab
+ </section>
+ <section id="grafikzuschn">
+ <paragraph xml-lang="en-US" id="par_id3151332" role="paragraph" l10n="CHG" oldref="194"><switchinline select="appl"><caseinline select="WRITER">Menu <emph>Format - Picture </emph>- <emph>Crop</emph> tab
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153317" xml-lang="en-US" l10n="CHG" oldref="198"><switchinline select="appl"><caseinline select="WRITER">
+ <paragraph xml-lang="en-US" id="par_id3153317" role="paragraph" l10n="CHG" oldref="198"><switchinline select="appl"><caseinline select="WRITER">
</caseinline><defaultinline>Icon on the <emph>Picture</emph> toolbar:</defaultinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
</case>
<default>
<table id="tbl_id3154374">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149953" xml-lang="en-US" l10n="E">
-<image id="img_id3155092" src="res/commandimagelist/sc_grafattrcrop.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155092" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="E">
+<image id="img_id3155092" src="res/commandimagelist/sc_grafattrcrop.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155092">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153695" xml-lang="en-US" l10n="U" oldref="209">Crop</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153695" role="paragraph" l10n="U" oldref="209">Crop</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</default>
</switch>
</section>
-<section id="grossklein">
-<paragraph role="paragraph" id="par_id3151254" xml-lang="en-US" l10n="CHG" oldref="195">Choose <emph>Format - Change Case</emph>
+ <section id="grossklein">
+ <paragraph xml-lang="en-US" id="par_id3151254" role="paragraph" l10n="CHG" oldref="195">Choose <emph>Format - Change Case</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3159624" xml-lang="en-US" l10n="U" oldref="196">Open context menu (text) - choose <emph>Case/Characters</emph>
+ <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="196">Open context menu (text) - choose <emph>Case/Characters</emph>
</paragraph>
-</section>
-<section id="ruby">
-<paragraph role="paragraph" id="par_id3153579" xml-lang="en-US" l10n="CHG" oldref="197">Menu <emph>Format - Asian phonetic guide</emph>
+ </section>
+ <section id="ruby">
+ <paragraph xml-lang="en-US" id="par_id3153579" role="paragraph" l10n="CHG" oldref="197">Menu <emph>Format - Asian phonetic guide</emph>
</paragraph>
-</section>
-</body>
-</helpdocument>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00040501.xhp b/helpcontent2/source/text/shared/00/00040501.xhp
index 1ab3dfc39d..6e26a5989c 100644
--- a/helpcontent2/source/text/shared/00/00040501.xhp
+++ b/helpcontent2/source/text/shared/00/00040501.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00040501.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp
index 7e0eff3118..9851cd999b 100644
--- a/helpcontent2/source/text/shared/00/00040502.xhp
+++ b/helpcontent2/source/text/shared/00/00040502.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,522 +32,502 @@
<meta>
-<topic id="textshared0000040502xml" indexer="exclude">
-<title id="tit" xml-lang="en-US">Format Menu</title>
-<filename>/text/shared/00/00040502.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3149741" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-<section id="linie1">
-<paragraph role="paragraph" id="par_id3146857" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Format - Line</emph> (Impress and Draw)<comment>i64150</comment></paragraph>
-<paragraph role="paragraph" id="par_id366527" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Object - Line </emph>(Calc)</paragraph>
-<paragraph role="paragraph" id="par_id3835261" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Graphic - Line </emph>(Writer)</paragraph>
-<paragraph role="paragraph" id="par_id3148668" xml-lang="en-US" l10n="CHG" oldref="3">On <emph>Line and Filling</emph> Bar, click</paragraph>
-<section id="sylinie">
-<table id="tbl_id3145160">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148889" xml-lang="en-US" l10n="E">
-<image id="img_id3150669" src="res/commandimagelist/sc_formatline.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150669" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <topic id="textshared0000040502xml" indexer="exclude">
+ <title xml-lang="en-US" id="tit">Format Menu</title>
+ <filename>/text/shared/00/00040502.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <paragraph xml-lang="en-US" id="hd_id3149741" role="heading" level="1" l10n="U" oldref="1">Format Menu</paragraph>
+ <section id="linie1">
+ <paragraph xml-lang="en-US" id="par_id3146857" role="paragraph" l10n="CHG" oldref="2">Choose <emph>Format - Line</emph> (Impress and Draw)<comment>i64150</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id366527" role="paragraph" l10n="CHG">Choose <emph>Format - Object - Line </emph>(Writer)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3835261" role="paragraph" l10n="CHG">Choose <emph>Format - Graphic - Line </emph>(Calc)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148668" role="paragraph" l10n="CHG" oldref="3">On <emph>Line and Filling</emph> Bar, click</paragraph>
+ <section id="sylinie">
+ <table id="tbl_id3145160">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148889" role="paragraph" l10n="E">
+<image id="img_id3150669" src="res/commandimagelist/sc_formatline.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150669">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="4">Line</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159147" role="paragraph" l10n="U" oldref="4">Line</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="linie2">
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ </section>
+ </section>
+ <section id="linie2">
+ <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="CHG" oldref="5">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Line - Line</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Line</emph> tab (presentation documents)</paragraph>
-<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="8">Choose <emph>Format - Title - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - Legend - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>Format - Axis - Line</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="11">Choose <emph>Format - Grid - Line</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Format - Chart Wall - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3153960" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Format - Chart Floor - Borders</emph> tab (charts)</paragraph>
-<paragraph role="paragraph" id="par_id3154939" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Format - Chart Area - Borders</emph> tab (charts)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3151293" xml-lang="en-US" l10n="CHG" oldref="15"><variable id="linienstile">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+</caseinline></switchinline><emph>Line - Line</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147335" role="paragraph" l10n="U" oldref="7">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Line</emph> tab (presentation documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156023" role="paragraph" l10n="U" oldref="8">Choose <emph>Format - Title - Borders</emph> tab (charts)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153061" role="paragraph" l10n="U" oldref="9">Choose <emph>Format - Legend - Borders</emph> tab (charts)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="10">Choose <emph>Format - Axis - Line</emph> tab (charts)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="U" oldref="11">Choose <emph>Format - Grid - Line</emph> tab (charts)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154758" role="paragraph" l10n="U" oldref="12">Choose <emph>Format - Chart Wall - Borders</emph> tab (charts)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153960" role="paragraph" l10n="U" oldref="13">Choose <emph>Format - Chart Floor - Borders</emph> tab (charts)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="U" oldref="14">Choose <emph>Format - Chart Area - Borders</emph> tab (charts)</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3151293" role="paragraph" l10n="CHG" oldref="15"><variable id="linienstile">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Line - Line Styles</emph> tab
+</caseinline></switchinline><emph>Line - Line Styles</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149317" xml-lang="en-US" l10n="CHG" oldref="16"><variable id="linienenden">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <paragraph xml-lang="en-US" id="par_id3149317" role="paragraph" l10n="CHG" oldref="16"><variable id="linienenden">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Line - Arrow Styles</emph> tab
+</caseinline></switchinline><emph>Line - Arrow Styles</emph> tab
</variable></paragraph>
-<section id="flaeche1">
-<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="CHG" oldref="17">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <section id="flaeche1">
+ <paragraph xml-lang="en-US" id="par_id3156082" role="paragraph" l10n="CHG" oldref="17">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="CHG" oldref="18">On <emph>Line and Filling</emph> Bar, click</paragraph>
-<section id="syflaeche">
-<table id="tbl_id3145174">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="E">
-<image id="img_id3150868" src="res/commandimagelist/sc_fillstyle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150868" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+</caseinline></switchinline><emph>Area</emph>
+ </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="CHG" oldref="18">On <emph>Line and Filling</emph> Bar, click</paragraph>
+ <section id="syflaeche">
+ <table id="tbl_id3145174">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156424" role="paragraph" l10n="E">
+<image id="img_id3150868" src="res/commandimagelist/sc_fillstyle.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150868">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="19">Area</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150393" role="paragraph" l10n="U" oldref="19">Area</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="flaeche2">
-<paragraph role="paragraph" id="par_id3154948" xml-lang="en-US" l10n="CHG" oldref="20">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
+ </section>
+ </section>
+ <section id="flaeche2">
+ <paragraph xml-lang="en-US" id="par_id3154948" role="paragraph" l10n="CHG" oldref="20">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Area</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3145607" xml-lang="en-US" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Area</emph> tab (presentation documents)</paragraph>
-<paragraph role="paragraph" id="par_id3152922" xml-lang="en-US" l10n="U" oldref="23">Choose <emph>Format - Title - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3157894" xml-lang="en-US" l10n="U" oldref="24">Choose <emph>Format - Legend - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3144444" xml-lang="en-US" l10n="U" oldref="25">Choose <emph>Format - Chart Wall - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3156543" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Format - Chart Floor - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3150685" xml-lang="en-US" l10n="U" oldref="27">Choose <emph>Format - Chart Area - Area</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="120">Choose <emph>Format - Page - Background</emph> tab (in $[officename] Impress and $[officename] Draw)</paragraph>
-</section>
-<section id="farben">
-<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Drawing Object - </emph>
+</caseinline></switchinline><emph>Area - Area</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145607" role="paragraph" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting</emph> - open context menu and choose <emph>Modify/New - Area</emph> tab (presentation documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152922" role="paragraph" l10n="U" oldref="23">Choose <emph>Format - Title - Area</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157894" role="paragraph" l10n="U" oldref="24">Choose <emph>Format - Legend - Area</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144444" role="paragraph" l10n="U" oldref="25">Choose <emph>Format - Chart Wall - Area</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156543" role="paragraph" l10n="U" oldref="26">Choose <emph>Format - Chart Floor - Area</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150685" role="paragraph" l10n="U" oldref="27">Choose <emph>Format - Chart Area - Area</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="120">Choose <emph>Format - Page - Background</emph> tab (in $[officename] Impress and $[officename] Draw)</paragraph>
+ </section>
+ <section id="farben">
+ <paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Colors</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Tools - Options - $[officename] - Colors</emph> tab</paragraph>
-</section>
-<section id="trans">
-<paragraph role="paragraph" id="par_id3154985" xml-lang="en-US" l10n="U" oldref="141">Choose <emph>Format - Area - Transparency</emph> tab (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="142">Choose <emph>Format - Area - Transparency</emph> tab (presentation documents)</paragraph>
-<paragraph role="paragraph" id="par_id3151117" xml-lang="en-US" l10n="U" oldref="143">Choose <emph>Format - Chart Wall - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="U" oldref="144">Choose <emph>Format - Chart Area - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="145">Choose <emph>Format - Chart Floor - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="146">Choose <emph>Format - Title - All Titles - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="147">Choose <emph>Format - Title - Main Title - Transparency </emph>tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3148556" xml-lang="en-US" l10n="U" oldref="148">Choose <emph>Format - Title - Subtitle - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="149">Choose <emph>Format - Title - Title (X Axis) - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="150">Choose <emph>Format - Title - Title (Y Axis) - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="151">Choose <emph>Format - Title - Title (Z Axis) - Transparency</emph> tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="152">Choose <emph>Format - Object Properties - Data Point - Transparency</emph> - tab (chart documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="153">Choose <emph>Format - Object Properties - Data Series - Transparency</emph> tab (chart documents)</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="CHG" oldref="30"><variable id="schatte">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+</caseinline></switchinline><emph>Area - Colors</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph> tab</paragraph>
+ </section>
+ <section id="trans">
+ <paragraph xml-lang="en-US" id="par_id3154985" role="paragraph" l10n="U" oldref="141">Choose <emph>Format - Area - Transparency</emph> tab (drawing documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="142">Choose <emph>Format - Area - Transparency</emph> tab (presentation documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151117" role="paragraph" l10n="U" oldref="143">Choose <emph>Format - Chart Wall - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147326" role="paragraph" l10n="U" oldref="144">Choose <emph>Format - Chart Area - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154920" role="paragraph" l10n="U" oldref="145">Choose <emph>Format - Chart Floor - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145591" role="paragraph" l10n="U" oldref="146">Choose <emph>Format - Title - All Titles - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145750" role="paragraph" l10n="U" oldref="147">Choose <emph>Format - Title - Main Title - Transparency </emph>tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148556" role="paragraph" l10n="U" oldref="148">Choose <emph>Format - Title - Subtitle - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph" l10n="U" oldref="149">Choose <emph>Format - Title - Title (X Axis) - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150487" role="paragraph" l10n="U" oldref="150">Choose <emph>Format - Title - Title (Y Axis) - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154320" role="paragraph" l10n="U" oldref="151">Choose <emph>Format - Title - Title (Z Axis) - Transparency</emph> tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151113" role="paragraph" l10n="U" oldref="152">Choose <emph>Format - Object Properties - Data Point - Transparency</emph> - tab (chart documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149266" role="paragraph" l10n="U" oldref="153">Choose <emph>Format - Object Properties - Data Series - Transparency</emph> tab (chart documents)</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3150011" role="paragraph" l10n="CHG" oldref="30"><variable id="schatte">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Shadow</emph> tab
+</caseinline></switchinline><emph>Area - Shadow</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="verlauf">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <paragraph xml-lang="en-US" id="par_id3147441" role="paragraph" l10n="CHG" oldref="31"><variable id="verlauf">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Gradients</emph> tab
+</caseinline></switchinline><emph>Area - Gradients</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="schraffur">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="CHG" oldref="32"><variable id="schraffur">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Hatching</emph> tab
+</caseinline></switchinline><emph>Area - Hatching</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="bitmap">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="CHG" oldref="33"><variable id="bitmap">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Area - Bitmaps</emph> tab
+</caseinline></switchinline><emph>Area - Bitmaps</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="formattext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
+ <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="34"><variable id="formattext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
</caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
-</caseinline><defaultinline>
-<emph>Text</emph></defaultinline></switchinline>
+</caseinline><defaultinline><emph>Text</emph></defaultinline></switchinline>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152810" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="text">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
+ <paragraph xml-lang="en-US" id="par_id3152810" role="paragraph" l10n="CHG" oldref="35"><variable id="text">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
</caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
-</caseinline><defaultinline>
-<emph>Text</emph></defaultinline></switchinline>
-<emph>- Text</emph> tab
+</caseinline><defaultinline><emph>Text</emph></defaultinline></switchinline><emph>- Text</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151060" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="laufext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - Text - Text Attributes</emph>
+ <paragraph xml-lang="en-US" id="par_id3151060" role="paragraph" l10n="CHG" oldref="36"><variable id="laufext">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - Text - Text Attributes</emph>
</caseinline><caseinline select="CALC"><emph>Graphic - Define Text Attributes</emph>
-</caseinline><defaultinline>
-<emph>Text</emph></defaultinline></switchinline>
-<emph>- Text Animation</emph> tab
+</caseinline><defaultinline><emph>Text</emph></defaultinline></switchinline><emph>- Text Animation</emph> tab
</variable></paragraph>
-<section id="position1">
-<paragraph role="paragraph" id="par_id3149911" xml-lang="en-US" l10n="CHG" oldref="37">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <section id="position1">
+ <paragraph xml-lang="en-US" id="par_id3149911" role="paragraph" l10n="CHG" oldref="37">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="89"><switchinline select="appl"><caseinline select="DRAW">F4 key
+</caseinline></switchinline><emph>Position and Size</emph>
+ </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156286" role="paragraph" l10n="U" oldref="89"><switchinline select="appl"><caseinline select="DRAW">F4 key
</caseinline><caseinline select="IMPRESS">F4 key
</caseinline></switchinline></paragraph>
-</section>
-<section id="syposition">
-<table id="Table1">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153052" xml-lang="en-US" l10n="E">
-<image id="img_id3150965" src="res/commandimagelist/sc_transformdialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150965" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </section>
+ <section id="syposition">
+ <table id="Table1">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153052" role="paragraph" l10n="E">
+<image id="img_id3150965" src="res/commandimagelist/sc_transformdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150965">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149938" xml-lang="en-US" l10n="U" oldref="39">Position and Size<comment>UFI: in Form Design toolbar</comment></paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149938" role="paragraph" l10n="U" oldref="39">Position and Size<comment>UFI: in Form Design toolbar</comment></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<section id="adngpb">
-<paragraph role="paragraph" id="par_id3148833" xml-lang="en-US" l10n="CHG" oldref="170">Open the context menu for the object - choose <emph>Name</emph>
+ </section>
+ <section id="adngpb">
+ <paragraph xml-lang="en-US" id="par_id3148833" role="paragraph" l10n="CHG" oldref="170">Open the context menu for the object - choose <emph>Name</emph>
</paragraph>
-</section>
-<section id="descript">
-<paragraph role="paragraph" id="par_id411999" xml-lang="en-US" l10n="NEW">Open the context menu for the object - choose <emph>Description</emph>
+ </section>
+ <section id="descript">
+ <paragraph xml-lang="en-US" id="par_id411999" role="paragraph" l10n="NEW">Open the context menu for the object - choose <emph>Description</emph>
</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3153099" xml-lang="en-US" l10n="CHG" oldref="40"><variable id="position2">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3153099" role="paragraph" l10n="CHG" oldref="40"><variable id="position2">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Position and Size</emph> tab
+</caseinline></switchinline><emph>Position and Size - Position and Size</emph> tab
</variable></paragraph>
-<section id="drehung">
-<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="CHG" oldref="42">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <section id="drehung">
+ <paragraph xml-lang="en-US" id="par_id3152973" role="paragraph" l10n="CHG" oldref="42">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Rotation</emph> tab</paragraph>
-<table id="tbl_id3147496">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148495" xml-lang="en-US" l10n="E">
-<image id="img_id3146898" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146898" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+</caseinline></switchinline><emph>Position and Size - Rotation</emph> tab</paragraph>
+ <table id="tbl_id3147496">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148495" role="paragraph" l10n="E">
+<image id="img_id3146898" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3146898">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146790" xml-lang="en-US" l10n="U" oldref="44">Rotate</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146790" role="paragraph" l10n="U" oldref="44">Rotate</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<paragraph role="paragraph" id="par_id3145666" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="ecke">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3145666" role="paragraph" l10n="CHG" oldref="45"><variable id="ecke">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Slant &amp; Corner Radius</emph> tab
+</caseinline></switchinline><emph>Position and Size - Slant &amp; Corner Radius</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146081" xml-lang="en-US" l10n="CHG" oldref="46"><variable id="legende">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER">Drawing <emph>Object - </emph>
+ <paragraph xml-lang="en-US" id="par_id3146081" role="paragraph" l10n="CHG" oldref="46"><variable id="legende">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
-</caseinline></switchinline>
-<emph>Position and Size - Legend</emph> tab (only for textbox callouts, not for custom shapes callouts)
+</caseinline></switchinline><emph>Position and Size - Callout</emph> tab (only for textbox callouts, not for custom shapes callouts)
</variable></paragraph>
-<section id="punkte">
-<paragraph role="paragraph" id="par_id3083283" xml-lang="en-US" l10n="U" oldref="172">Choose <emph>Edit - Points</emph>
+ <section id="punkte">
+ <paragraph xml-lang="en-US" id="par_id3083283" role="paragraph" l10n="U" oldref="172">Choose <emph>Edit - Points</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3145642" xml-lang="en-US" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="DRAW">Open context menu - choose <emph>Edit Points</emph>
+ <paragraph xml-lang="en-US" id="par_id3145642" role="paragraph" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="DRAW">Open context menu - choose <emph>Edit Points</emph>
</caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">Open context menu - choose <emph>Edit Points</emph>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149019" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="appl"><caseinline select="DRAW">F8 key
+ <paragraph xml-lang="en-US" id="par_id3149019" role="paragraph" l10n="U" oldref="90"><switchinline select="appl"><caseinline select="DRAW">F8 key
</caseinline><caseinline select="IMPRESS">F8 key
</caseinline></switchinline></paragraph>
-<section id="sypunktebearbeiten">
-<table id="tbl_id3145618">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150044" xml-lang="en-US" l10n="E">
-<image id="img_id3147100" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147100" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="sypunktebearbeiten">
+ <table id="tbl_id3145618">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150044" role="paragraph" l10n="E">
+<image id="img_id3147100" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147100">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="49">Edit Points</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153966" role="paragraph" l10n="U" oldref="49">Edit Points</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="schrift2">
-<paragraph role="paragraph" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="50">Choose <emph>Format - Character</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3145229" xml-lang="en-US" l10n="U" oldref="121">Open context menu - choose <emph>Character</emph>
+ </section>
+ </section>
+ <section id="schrift2">
+ <paragraph xml-lang="en-US" id="par_id3151248" role="paragraph" l10n="U" oldref="50">Choose <emph>Format - Character</emph> (drawing functions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145229" role="paragraph" l10n="U" oldref="121">Open context menu - choose <emph>Character</emph>
</paragraph>
-</section>
-<section id="groesse">
-<paragraph role="paragraph" id="par_id3151342" xml-lang="en-US" l10n="U" oldref="122">Open context menu - choose <emph>Size</emph>
+ </section>
+ <section id="groesse">
+ <paragraph xml-lang="en-US" id="par_id3151342" role="paragraph" l10n="U" oldref="122">Open context menu - choose <emph>Size</emph>
</paragraph>
-</section>
-<section id="stil">
-<paragraph role="paragraph" id="par_id3149255" xml-lang="en-US" l10n="U" oldref="123">Open context menu - choose <emph>Style</emph>
+ </section>
+ <section id="stil">
+ <paragraph xml-lang="en-US" id="par_id3149255" role="paragraph" l10n="U" oldref="123">Open context menu - choose <emph>Style</emph>
</paragraph>
-</section>
-<section id="stilfett">
-<paragraph role="paragraph" id="par_id3155177" xml-lang="en-US" l10n="U" oldref="124">Open context menu - choose <emph>Style - Bold</emph>
+ </section>
+ <section id="stilfett">
+ <paragraph xml-lang="en-US" id="par_id3155177" role="paragraph" l10n="U" oldref="124">Open context menu - choose <emph>Style - Bold</emph>
</paragraph>
-<section id="syfett">
-<table id="tbl_id3147252">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145766" xml-lang="en-US" l10n="E">
-<image id="img_id3156558" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3156558" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="syfett">
+ <table id="tbl_id3147252">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145766" role="paragraph" l10n="E">
+<image id="img_id3156558" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3156558">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147001" xml-lang="en-US" l10n="U" oldref="55">Bold</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147001" role="paragraph" l10n="U" oldref="55">Bold</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="stilkursiv">
-<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="U" oldref="125">Open context menu - choose <emph>Style - Italic</emph>
+ </section>
+ </section>
+ <section id="stilkursiv">
+ <paragraph xml-lang="en-US" id="par_id3151276" role="paragraph" l10n="U" oldref="125">Open context menu - choose <emph>Style - Italic</emph>
</paragraph>
-<section id="sykursiv">
-<table id="tbl_id3144416">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3159091" xml-lang="en-US" l10n="E">
-<image id="img_id3155578" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3155578" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="sykursiv">
+ <table id="tbl_id3144416">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159091" role="paragraph" l10n="E">
+<image id="img_id3155578" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3155578">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150234" xml-lang="en-US" l10n="U" oldref="58">Italic</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150234" role="paragraph" l10n="U" oldref="58">Italic</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="stilunter">
-<paragraph role="paragraph" id="par_id3154589" xml-lang="en-US" l10n="U" oldref="126">open context menu - choose <emph>Style - Underline</emph>
-</paragraph>
-<section id="syunterstreichen">
-<table id="tbl_id3148875">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145223" xml-lang="en-US" l10n="E">
-<image id="img_id3151068" src="res/commandimagelist/sc_underline.png" width="0.2228in" height="0.2228in" localize="true"><alt id="alt_id3151068" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </section>
+ </section>
+ <section id="stilunter">
+ <paragraph xml-lang="en-US" id="par_id3154589" role="paragraph" l10n="U" oldref="126">Open context menu - choose <emph>Style - Underline</emph>
+ </paragraph>
+ <section id="syunterstreichen">
+ <table id="tbl_id3148875">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145223" role="paragraph" l10n="E">
+<image id="img_id3151068" src="res/commandimagelist/sc_underline.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3151068">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154715" xml-lang="en-US" l10n="U" oldref="88">Underline</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154715" role="paragraph" l10n="U" oldref="88">Underline</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="stildurch">
-<paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="U" oldref="127">Open context menu - choose <emph>Style - Strikethrough</emph>
+ </section>
+ </section>
+ <section id="stildurch">
+ <paragraph xml-lang="en-US" id="par_id3145131" role="paragraph" l10n="U" oldref="127">Open context menu - choose <emph>Style - Strikethrough</emph>
</paragraph>
-</section>
-<section id="stilschatten">
-<paragraph role="paragraph" id="par_id3158214" xml-lang="en-US" l10n="U" oldref="128">Open context menu - choose <emph>Style - Shadow</emph>
+ </section>
+ <section id="stilschatten">
+ <paragraph xml-lang="en-US" id="par_id3158214" role="paragraph" l10n="U" oldref="128">Open context menu - choose <emph>Style - Shadow</emph>
</paragraph>
-</section>
-<section id="stilkontur">
-<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="U" oldref="129">Open context menu - choose <emph>Style - Contour</emph>
+ </section>
+ <section id="stilkontur">
+ <paragraph xml-lang="en-US" id="par_id3150207" role="paragraph" l10n="U" oldref="129">Open context menu - choose <emph>Style - Contour</emph>
</paragraph>
-</section>
-<section id="stilhoch">
-<paragraph role="paragraph" id="par_id3154383" xml-lang="en-US" l10n="U" oldref="130">Open context menu - choose <emph>Style - Superscript</emph>
+ </section>
+ <section id="stilhoch">
+ <paragraph xml-lang="en-US" id="par_id3154383" role="paragraph" l10n="U" oldref="130">Open context menu - choose <emph>Style - Superscript</emph>
</paragraph>
-</section>
-<section id="stiltief">
-<paragraph role="paragraph" id="par_id3152767" xml-lang="en-US" l10n="U" oldref="131">Open context menu - choose <emph>Style - Subscript</emph>
+ </section>
+ <section id="stiltief">
+ <paragraph xml-lang="en-US" id="par_id3152767" role="paragraph" l10n="U" oldref="131">Open context menu - choose <emph>Style - Subscript</emph>
</paragraph>
-</section>
-<section id="zeilenabstand">
-<paragraph role="paragraph" id="par_id3155377" xml-lang="en-US" l10n="U" oldref="132">Open context menu - choose <emph>Line Spacing</emph>
+ </section>
+ <section id="zeilenabstand">
+ <paragraph xml-lang="en-US" id="par_id3155377" role="paragraph" l10n="U" oldref="132">Open context menu - choose <emph>Line Spacing</emph>
</paragraph>
-</section>
-<section id="zeilenabstandein">
-<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="U" oldref="133">Open context menu - choose <emph>Line Spacing - Single</emph>
+ </section>
+ <section id="zeilenabstandein">
+ <paragraph xml-lang="en-US" id="par_id3154475" role="paragraph" l10n="U" oldref="133">Open context menu - choose <emph>Line Spacing - Single</emph>
</paragraph>
-</section>
-<section id="zeilenabstandeinsfuenf">
-<paragraph role="paragraph" id="par_id3150478" xml-lang="en-US" l10n="U" oldref="134">Open context menu - choose <emph>Line Spacing - 1.5 Lines</emph>
+ </section>
+ <section id="zeilenabstandeinsfuenf">
+ <paragraph xml-lang="en-US" id="par_id3150478" role="paragraph" l10n="U" oldref="134">Open context menu - choose <emph>Line Spacing - 1.5 Lines</emph>
</paragraph>
-</section>
-<section id="zeilenabstandzwei">
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="135">Open context menu - choose <emph>Line Spacing - Double</emph>
+ </section>
+ <section id="zeilenabstandzwei">
+ <paragraph xml-lang="en-US" id="par_id3147167" role="paragraph" l10n="U" oldref="135">Open context menu - choose <emph>Line Spacing - Double</emph>
</paragraph>
-</section>
-<section id="linkstext">
-<paragraph role="paragraph" id="par_id3146978" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Format - Alignment - Left</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3153009" xml-lang="en-US" l10n="U" oldref="136">Open context menu - choose <emph>Alignment - Left</emph>
+ </section>
+ <section id="linkstext">
+ <paragraph xml-lang="en-US" id="par_id3146978" role="paragraph" l10n="U" oldref="69">Choose <emph>Format - Alignment - Left</emph> (drawing functions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153009" role="paragraph" l10n="U" oldref="136">Open context menu - choose <emph>Alignment - Left</emph>
</paragraph>
-<section id="sylinksbuendig">
-<table id="tbl_id3152453">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="E">
-<image id="img_id3155370" src="res/commandimagelist/sc_alignleft.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155370" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="sylinksbuendig">
+ <table id="tbl_id3152453">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147310" role="paragraph" l10n="E">
+<image id="img_id3155370" src="res/commandimagelist/sc_alignleft.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155370">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151336" xml-lang="en-US" l10n="U" oldref="71">Align Left</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151336" role="paragraph" l10n="U" oldref="71">Align Left</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="rechtstext">
-<paragraph role="paragraph" id="par_id3155823" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Format - Alignment - Right</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3155762" xml-lang="en-US" l10n="U" oldref="137">Open context menu - choose <emph>Alignment - Right</emph>
+ </section>
+ </section>
+ <section id="rechtstext">
+ <paragraph xml-lang="en-US" id="par_id3155823" role="paragraph" l10n="U" oldref="72">Choose <emph>Format - Alignment - Right</emph> (drawing functions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155762" role="paragraph" l10n="U" oldref="137">Open context menu - choose <emph>Alignment - Right</emph>
</paragraph>
-<section id="syrechtsbuendig">
-<table id="tbl_id3149949">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="E">
-<image id="img_id3154421" src="res/commandimagelist/sc_alignright.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154421" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="syrechtsbuendig">
+ <table id="tbl_id3149949">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149408" role="paragraph" l10n="E">
+<image id="img_id3154421" src="res/commandimagelist/sc_alignright.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154421">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153607" xml-lang="en-US" l10n="U" oldref="74">Align Right</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153607" role="paragraph" l10n="U" oldref="74">Align Right</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="zentrierttext">
-<paragraph role="paragraph" id="par_id3149189" xml-lang="en-US" l10n="U" oldref="75">Choose <emph>Format - Alignment - Centered</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3154624" xml-lang="en-US" l10n="U" oldref="138">Open context menu - choose <emph>Alignment - Center</emph>
+ </section>
+ </section>
+ <section id="zentrierttext">
+ <paragraph xml-lang="en-US" id="par_id3149189" role="paragraph" l10n="U" oldref="75">Choose <emph>Format - Alignment - Centered</emph> (drawing functions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154624" role="paragraph" l10n="U" oldref="138">Open context menu - choose <emph>Alignment - Center</emph>
</paragraph>
-<section id="syzentriert">
-<table id="tbl_id3151270">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="E">
-<image id="img_id3149757" src="res/commandimagelist/sc_centerpara.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149757" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="syzentriert">
+ <table id="tbl_id3151270">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153815" role="paragraph" l10n="E">
+<image id="img_id3149757" src="res/commandimagelist/sc_centerpara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149757">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153076" xml-lang="en-US" l10n="U" oldref="77"><switchinline select="appl"><caseinline select="CALC">Align Center Horizontally
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153076" role="paragraph" l10n="U" oldref="77"><switchinline select="appl"><caseinline select="CALC">Align Center Horizontally
</caseinline><defaultinline>Centered</defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="blocktext">
-<paragraph role="paragraph" id="par_id3146151" xml-lang="en-US" l10n="U" oldref="78">Choose <emph>Format - Alignment - Justified</emph> (drawing functions)</paragraph>
-<paragraph role="paragraph" id="par_id3168612" xml-lang="en-US" l10n="U" oldref="139">Open context menu - choose <emph>Alignment - Justified</emph>
+ </section>
+ </section>
+ <section id="blocktext">
+ <paragraph xml-lang="en-US" id="par_id3146151" role="paragraph" l10n="U" oldref="78">Choose <emph>Format - Alignment - Justified</emph> (drawing functions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3168612" role="paragraph" l10n="U" oldref="139">Open context menu - choose <emph>Alignment - Justified</emph>
</paragraph>
-<section id="syblocksatz">
-<table id="tbl_id3154828">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156189" xml-lang="en-US" l10n="E">
-<image id="img_id3145308" src="res/commandimagelist/sc_justifypara.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145308" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="syblocksatz">
+ <table id="tbl_id3154828">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156189" role="paragraph" l10n="E">
+<image id="img_id3145308" src="res/commandimagelist/sc_justifypara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145308">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153131" xml-lang="en-US" l10n="U" oldref="80">Justified</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153131" role="paragraph" l10n="U" oldref="80">Justified</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<paragraph role="paragraph" id="par_id3150527" xml-lang="en-US" l10n="CHG" oldref="81"><variable id="font">Click <emph>Fontwork</emph> icon on <emph>Drawing</emph> bar
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3150527" role="paragraph" l10n="CHG" oldref="81"><variable id="font">Click <emph>Fontwork</emph> icon on <emph>Drawing</emph> bar
</variable></paragraph>
-<section id="gruppe">
-<paragraph role="paragraph" id="par_id3144503" xml-lang="en-US" l10n="U" oldref="103">Choose <emph>Format - Group</emph>
+ <section id="gruppe">
+ <paragraph xml-lang="en-US" id="par_id3144503" role="paragraph" l10n="U" oldref="103">Choose <emph>Format - Group</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3154854" xml-lang="en-US" l10n="U" oldref="140">Open context menu - choose <emph>Group</emph>
+ <paragraph xml-lang="en-US" id="par_id3154854" role="paragraph" l10n="U" oldref="140">Open context menu - choose <emph>Group</emph>
</paragraph>
-</section>
-<section id="gruppie">
-<paragraph role="paragraph" id="par_id3157985" xml-lang="en-US" l10n="U" oldref="83">Choose <emph>Format - Group - Group</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3157980" xml-lang="en-US" l10n="U" oldref="104">Choose <emph>Modify - Group</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149508" xml-lang="en-US" l10n="U" oldref="84">Open context menu - choose <emph>Group - Group</emph> (form objects)</paragraph>
-<section id="sygruppieren">
-<table id="tbl_id3143218">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146858" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_formatgroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </section>
+ <section id="gruppie">
+ <paragraph xml-lang="en-US" id="par_id3157985" role="paragraph" l10n="U" oldref="83">Choose <emph>Format - Group - Group</emph> (text documents, spreadsheets)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157980" role="paragraph" l10n="U" oldref="104">Choose <emph>Modify - Group</emph> (drawing documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149508" role="paragraph" l10n="U" oldref="84">Open context menu - choose <emph>Group - Group</emph> (form objects)</paragraph>
+ <section id="sygruppieren">
+ <table id="tbl_id3143218">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146858" role="paragraph" l10n="E">
+<image id="img_id3154344" src="res/commandimagelist/sc_formatgroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154344">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3149593" xml-lang="en-US" l10n="U" oldref="113">Group</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149593" role="paragraph" l10n="U" oldref="113">Group</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="gruppieauf">
-<paragraph role="paragraph" id="par_id3153023" xml-lang="en-US" l10n="U" oldref="85">Choose <emph>Format - Group - Ungroup</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3163378" xml-lang="en-US" l10n="U" oldref="105">Choose <emph>Modify - Ungroup</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3156038" xml-lang="en-US" l10n="U" oldref="86">Open context menu - choose <emph>Ungroup</emph>
+ </section>
+ </section>
+ <section id="gruppieauf">
+ <paragraph xml-lang="en-US" id="par_id3153023" role="paragraph" l10n="U" oldref="85">Choose <emph>Format - Group - Ungroup</emph> (text documents, spreadsheets)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163378" role="paragraph" l10n="U" oldref="105">Choose <emph>Modify - Ungroup</emph> (drawing documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156038" role="paragraph" l10n="U" oldref="86">Open context menu - choose <emph>Ungroup</emph>
</paragraph>
-<section id="sygrupaufh">
-<table id="tbl_id3149971">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151300" xml-lang="en-US" l10n="E">
-<image id="img_id3150831" src="res/commandimagelist/sc_formatungroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150831" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="sygrupaufh">
+ <table id="tbl_id3149971">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151300" role="paragraph" l10n="E">
+<image id="img_id3150831" src="res/commandimagelist/sc_formatungroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150831">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="115">Ungroup</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146894" role="paragraph" l10n="U" oldref="115">Ungroup</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="adngvl">
-<paragraph role="paragraph" id="par_id3153109" xml-lang="en-US" l10n="U" oldref="106">Choose <emph>Format - Group - Exit Group</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3145678" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Modify - Exit Group</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3152367" xml-lang="en-US" l10n="U" oldref="108">Open context menu - choose <emph>Exit Group</emph>
+ </section>
+ </section>
+ <section id="adngvl">
+ <paragraph xml-lang="en-US" id="par_id3153109" role="paragraph" l10n="U" oldref="106">Choose <emph>Format - Group - Exit Group</emph> (text documents, spreadsheets)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145678" role="paragraph" l10n="U" oldref="107">Choose <emph>Modify - Exit Group</emph> (drawing documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152367" role="paragraph" l10n="U" oldref="108">Open context menu - choose <emph>Exit Group</emph>
</paragraph>
-<section id="sygrupverl">
-<table id="tbl_id3152538">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3158402" xml-lang="en-US" l10n="E">
-<image id="img_id3149422" src="res/commandimagelist/sc_leavegroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149422" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="sygrupverl">
+ <table id="tbl_id3152538">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3158402" role="paragraph" l10n="E">
+<image id="img_id3149422" src="res/commandimagelist/sc_leavegroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149422">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155347" xml-lang="en-US" l10n="U" oldref="117">Exit Group</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155347" role="paragraph" l10n="U" oldref="117">Exit Group</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-<section id="adngte">
-<paragraph role="paragraph" id="par_id3149129" xml-lang="en-US" l10n="U" oldref="109">Choose <emph>Format - Group - Enter Group</emph> (text documents, spreadsheets)</paragraph>
-<paragraph role="paragraph" id="par_id3145354" xml-lang="en-US" l10n="U" oldref="110">Choose <emph>Modify - Enter Group</emph> (drawing documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149946" xml-lang="en-US" l10n="U" oldref="111">Open context menu - choose <emph>Enter Group</emph>
+ </section>
+ </section>
+ <section id="adngte">
+ <paragraph xml-lang="en-US" id="par_id3149129" role="paragraph" l10n="U" oldref="109">Choose <emph>Format - Group - Enter Group</emph> (text documents, spreadsheets)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145354" role="paragraph" l10n="U" oldref="110">Choose <emph>Modify - Enter Group</emph> (drawing documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149946" role="paragraph" l10n="U" oldref="111">Open context menu - choose <emph>Enter Group</emph>
</paragraph>
-<section id="sygrupbetr">
-<table id="tbl_id3149546">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152388" xml-lang="en-US" l10n="E">
-<image id="img_id3149900" src="res/commandimagelist/sc_entergroup.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149900" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ <section id="sygrupbetr">
+ <table id="tbl_id3149546">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152388" role="paragraph" l10n="E">
+<image id="img_id3149900" src="res/commandimagelist/sc_entergroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149900">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152547" xml-lang="en-US" l10n="U" oldref="119">Enter Group</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152547" role="paragraph" l10n="U" oldref="119">Enter Group</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-</section>
-</body>
-</helpdocument>
+ </section>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00040503.xhp b/helpcontent2/source/text/shared/00/00040503.xhp
index 2e7a3bb859..93a0bff4c8 100644
--- a/helpcontent2/source/text/shared/00/00040503.xhp
+++ b/helpcontent2/source/text/shared/00/00040503.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00040503.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/01000000.xhp b/helpcontent2/source/text/shared/00/01000000.xhp
index 8c7eddb5a9..1f5ebcc1a8 100644
--- a/helpcontent2/source/text/shared/00/01000000.xhp
+++ b/helpcontent2/source/text/shared/00/01000000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/01010000.xhp b/helpcontent2/source/text/shared/00/01010000.xhp
index 7e43d0ef62..0dcc4be24d 100755
--- a/helpcontent2/source/text/shared/00/01010000.xhp
+++ b/helpcontent2/source/text/shared/00/01010000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_MN_PREVIEW" id="bm_id3156560" localize="false"/>
<paragraph role="paragraph" id="par_id3158428" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="HID_GALLERY_MN_PREVIEW">The<emph> Preview </emph>command displays the selected graphic.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_TITLE" id="bm_id3152926" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLE" id="bm_id3152551" localize="false"/>
+<!-- removed HID SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLE -->
<paragraph role="paragraph" id="par_id3154522" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLE">Assigns a title to a selected Gallery object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_MN_DELETE" id="bm_id3155892" localize="false"/>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_GALLERY_MN_DELETE">Deletes the selected graphic after confirmation.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/00/01020000.xhp b/helpcontent2/source/text/shared/00/01020000.xhp
index cbd99b716a..5b5f162ac6 100755
--- a/helpcontent2/source/text/shared/00/01020000.xhp
+++ b/helpcontent2/source/text/shared/00/01020000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/01050000.xhp b/helpcontent2/source/text/shared/00/01050000.xhp
index 6e5869911f..d1b38a1422 100644
--- a/helpcontent2/source/text/shared/00/01050000.xhp
+++ b/helpcontent2/source/text/shared/00/01050000.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -30,26 +27,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0001050000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">General</title>
<filename>/text/shared/00/01050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-24T12:28:20">UFI: test what must remain, delete the rest
-YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="allgemein">
-<bookmark xml-lang="en-US" branch="hid/SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL" id="bm_id3151370" localize="false"/>
+<!-- removed HID SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL -->
<paragraph role="heading" id="hd_id3158397" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/00/01050000.xhp" name="General">General</link><comment>UFI: this is a tab page of the Gallery. Deleted everything else</comment></paragraph>
-<paragraph role="paragraph" id="par_id3159242" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SVX_TABPAGE_RID_SVXTABPAGE_GALLERY_GENERAL">The<emph> General </emph>tab page lists the general properties of the current theme.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3159242" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The<emph> General </emph>tab page lists the general properties of the current theme.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_PROPERTIES_GENERAL" id="bm_id3152895" localize="false"/>
<paragraph role="heading" id="hd_id3150264" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
<paragraph role="paragraph" id="par_id3154094" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SVX_EDIT_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME">Displays the name of the theme.</ahelp> If no name has been assigned, you can type a new name in the text box.</paragraph>
<paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="5">Type</paragraph>
diff --git a/helpcontent2/source/text/shared/00/icon_alt.xhp b/helpcontent2/source/text/shared/00/icon_alt.xhp
index da878a72ff..0d425e9a02 100644
--- a/helpcontent2/source/text/shared/00/icon_alt.xhp
+++ b/helpcontent2/source/text/shared/00/icon_alt.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: icon_alt.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/00/makefile.mk b/helpcontent2/source/text/shared/00/makefile.mk
index a9c8e493ad..098d531d6e 100644
--- a/helpcontent2/source/text/shared/00/makefile.mk
+++ b/helpcontent2/source/text/shared/00/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -93,4 +89,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/01/01010000.xhp b/helpcontent2/source/text/shared/01/01010000.xhp
index ac8adfc30d..9ba92afe8c 100644
--- a/helpcontent2/source/text/shared/01/01010000.xhp
+++ b/helpcontent2/source/text/shared/01/01010000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010001.xhp b/helpcontent2/source/text/shared/01/01010001.xhp
index 739fd843fc..c55928fe8e 100755
--- a/helpcontent2/source/text/shared/01/01010001.xhp
+++ b/helpcontent2/source/text/shared/01/01010001.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010001.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010100.xhp b/helpcontent2/source/text/shared/01/01010100.xhp
index ea9b5c99c3..dfaa60e9ec 100644
--- a/helpcontent2/source/text/shared/01/01010100.xhp
+++ b/helpcontent2/source/text/shared/01/01010100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010100.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -143,15 +140,15 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_MANAGE" id="bm_id3153188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE" id="bm_id3153188" localize="false"/>
<paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="2" l10n="U" oldref="111">Organize</paragraph>
<paragraph role="paragraph" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_MANAGE">Adds, removes, or rearranges templates or sample documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT" id="bm_id3145364" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT" id="bm_id3145364" localize="false"/>
<paragraph role="heading" id="hd_id3149483" xml-lang="en-US" level="2" l10n="U" oldref="113">Edit</paragraph>
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected template for editing.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="115">Open</paragraph>
<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected document or creates a document based on the selected template.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>, and then enter the path.</paragraph>
+<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths"><emph>$[officename] - Paths</emph></link>, and then enter the path.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/aaa_start.xhp#aaa_start"/>
<paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="C"><link href="text/shared/01/01100000.xhp" name="File properties">File properties</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010200.xhp b/helpcontent2/source/text/shared/01/01010200.xhp
index bb8e2c622b..0e45204130 100644
--- a/helpcontent2/source/text/shared/01/01010200.xhp
+++ b/helpcontent2/source/text/shared/01/01010200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010200.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
<embed href="text/shared/01/01010203.xhp#drucker"/>
<bookmark xml-lang="en-US" branch="hid/HID_LABEL_INSERT" id="bm_id3166460" localize="false"/>
<paragraph role="heading" id="hd_id3145383" xml-lang="en-US" level="2" l10n="U" oldref="7">New Document</paragraph>
-<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_LABEL_INSERT">Creates a new document entitled "Label1" for editing.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_LABEL_INSERT">Creates a new document for editing.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="C"><link href="text/shared/guide/labels.xhp" name="Creating labels">Creating labels</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010201.xhp b/helpcontent2/source/text/shared/01/01010201.xhp
index 301ab4365a..e8e99c44c7 100644
--- a/helpcontent2/source/text/shared/01/01010201.xhp
+++ b/helpcontent2/source/text/shared/01/01010201.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010201.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,40 +49,36 @@
</section>
<paragraph role="heading" id="hd_id3158397" xml-lang="en-US" level="2" l10n="U" oldref="3">Inscription</paragraph>
<paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="4">Enter or insert the text that you want to appear on the label(s).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_MULTILINEEDIT_TP_LAB_LAB_EDT_WRITING" id="bm_id3155271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING" id="bm_id3155271" localize="false"/>
<paragraph role="heading" id="hd_id3147294" xml-lang="en-US" level="3" l10n="U" oldref="5">Label text</paragraph>
<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_MULTILINEEDIT_TP_LAB_LAB_EDT_WRITING">Enter the text that you want to appear on the label. You can also insert a database field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR" id="bm_id3154682" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_LAB_LAB:BOX_ADDR" id="bm_id3154682" localize="false"/>
<paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="3" l10n="U" oldref="7">Address</paragraph>
<paragraph role="paragraph" id="par_id3153089" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR">Creates a label with your return address. Text that is currently in the <emph>Label text</emph> box is overwritten.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - %PRODUCTNAME"><emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph></link>, and then click on the <emph>User Data</emph> tab.</paragraph>
-
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_DATABASE" id="bm_id3153748" localize="false"/>
+<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="%PRODUCTNAME">%PRODUCTNAME</link></emph>, and then click on the <emph>User Data</emph> tab.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:LB_DATABASE" id="bm_id3153748" localize="false"/>
<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="10">Database</paragraph>
<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_LB_DATABASE">Select the database that you want to use as the data source for your label. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_TABLE" id="bm_id3157863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:LB_TABLE" id="bm_id3157863" localize="false"/>
<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="3" l10n="U" oldref="12">Table</paragraph>
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_LB_TABLE">Select the database table containing the field(s) that you want to use in your label.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_DBFIELD" id="bm_id3151265" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_TP_LAB_LAB_BTN_INSERT" id="bm_id3153577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:LB_DBFIELD" id="bm_id3151265" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_LAB_LAB:BTN_INSERT" id="bm_id3153577" localize="false"/>
<paragraph role="heading" id="hd_id3155391" xml-lang="en-US" level="3" l10n="U" oldref="14">Database field</paragraph>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SW_IMAGEBUTTON_TP_LAB_LAB_BTN_INSERT">Select the database field that you want, and then click the arrow to the left of this box to insert the field into the <emph>Label text</emph> box.</ahelp>.</paragraph>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="16">The name of the database field is bounded by brackets in the <emph>Label text</emph> box. If you want, you can separate database fields with spaces. Press Enter to insert a database field on a new line.</paragraph>
<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="17">Format</paragraph>
<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="18">You can select a pre-defined size format for your label or a size format that you specify on the <emph>Format </emph>tab..</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_LAB_LAB_BTN_CONT" id="bm_id3147618" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_LAB_LAB:BTN_CONT" id="bm_id3147618" localize="false"/>
<paragraph role="heading" id="hd_id3154143" xml-lang="en-US" level="3" l10n="U" oldref="19">Continuous</paragraph>
<paragraph role="paragraph" id="par_id3151339" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_RADIOBUTTON_TP_LAB_LAB_BTN_CONT">Prints labels on continuous paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_LAB_LAB_BTN_SHEET" id="bm_id3155419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_LAB_LAB:BTN_SHEET" id="bm_id3155419" localize="false"/>
<paragraph role="heading" id="hd_id3150131" xml-lang="en-US" level="3" l10n="U" oldref="21">Sheet</paragraph>
<paragraph role="paragraph" id="par_id3159167" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW_RADIOBUTTON_TP_LAB_LAB_BTN_SHEET">Prints labels on individual sheets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_BOX_MAKE" id="bm_id3150669" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:BOX_MAKE" id="bm_id3150669" localize="false"/>
<paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="3" l10n="U" oldref="23">Brand</paragraph>
<paragraph role="paragraph" id="par_id3150466" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_BOX_MAKE">Select the brand of paper that you want to use.</ahelp> Each brand has its own size formats.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_BOX_TYPE" id="bm_id3145416" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_LAB_LAB:BOX_TYPE" id="bm_id3145416" localize="false"/>
<paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="3" l10n="U" oldref="25">Type</paragraph>
<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_BOX_TYPE">Select the size format that you want to use. The available formats depend on the brand on what you selected in the <emph>Brand</emph> list. If you want to use a custom label format, select <emph>[User]</emph>, and then click the <link href="text/shared/01/01010202.xhp" name="Format"><emph>Format</emph></link> tab to define the format.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153828" xml-lang="en-US" level="3" l10n="U" oldref="27">Info</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010202.xhp b/helpcontent2/source/text/shared/01/01010202.xhp
index 8accb3bded..8f2a68782a 100755
--- a/helpcontent2/source/text/shared/01/01010202.xhp
+++ b/helpcontent2/source/text/shared/01/01010202.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010202.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,38 +48,38 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#formateti"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_HDIST" id="bm_id3149180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_HDIST" id="bm_id3149180" localize="false"/>
<paragraph role="heading" id="hd_id3159194" xml-lang="en-US" level="2" l10n="U" oldref="3">Horizontal pitch</paragraph>
<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_HDIST">Displays the distance between the left edges of adjacent labels or business cards. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_VDIST" id="bm_id3145669" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_VDIST" id="bm_id3145669" localize="false"/>
<paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="5">Vertical pitch</paragraph>
<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_VDIST">Displays the distance between the upper edge of a label or a business card and the upper edge of the label or the business card directly below. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_WIDTH" id="bm_id3156411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_WIDTH" id="bm_id3156411" localize="false"/>
<paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="U" oldref="7">Width</paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_WIDTH">Displays the width for the label or the business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_HEIGHT" id="bm_id3150507" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_HEIGHT" id="bm_id3150507" localize="false"/>
<paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="2" l10n="U" oldref="9">Height</paragraph>
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_HEIGHT">Displays the height for the label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_LEFT" id="bm_id3143267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_LEFT" id="bm_id3143267" localize="false"/>
<paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="2" l10n="U" oldref="11">Left margin</paragraph>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_LEFT">Displays the distance from the left edge of the page to the left edge of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_LAB_FMT:FLD_UPPER" id="bm_id3163802" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_UPPER" id="bm_id3163802" localize="false"/>
<paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="13">Upper margin</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_UPPER">Displays distance from the top edge of the page to the top of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LAB_FMT:FLD_COLUMNS" id="bm_id3155830" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LAB_FMT:FLD_COLUMNS" id="bm_id3155830" localize="false"/>
<paragraph role="heading" id="hd_id3147573" xml-lang="en-US" level="2" l10n="U" oldref="15">Columns</paragraph>
<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:NUMERICFIELD:TP_LAB_FMT:FLD_COLUMNS">Enter the number of labels or business cards that you want to span the width of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_LAB_FMT:FLD_ROWS" id="bm_id3153146" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LAB_FMT:FLD_ROWS" id="bm_id3153146" localize="false"/>
<paragraph role="heading" id="hd_id3154143" xml-lang="en-US" level="2" l10n="U" oldref="17">Rows</paragraph>
<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:NUMERICFIELD:TP_LAB_FMT:FLD_ROWS">Enter the number of labels or business cards that you want to span the height of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_LAB_FMT_PB_SAVE" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_LAB_FMT:PB_SAVE" id="bm_id3153716" localize="false"/>
<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_PUSHBUTTON_TP_LAB_FMT_PB_SAVE">Saves the current label or business card format.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146773" xml-lang="en-US" level="2" l10n="U" oldref="21">Save Label Format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_DLG_SAVE_LABEL_CB_MAKE" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_SAVE_LABEL:CB_MAKE" id="bm_id3158430" localize="false"/>
<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="3" l10n="U" oldref="23">Brand</paragraph>
<paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_COMBOBOX_DLG_SAVE_LABEL_CB_MAKE">Enter or select the desired brand.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_DLG_SAVE_LABEL_ED_TYPE" id="bm_id3144438" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_SAVE_LABEL:ED_TYPE" id="bm_id3144438" localize="false"/>
<paragraph role="heading" id="hd_id3155180" xml-lang="en-US" level="3" l10n="U" oldref="25">Type</paragraph>
<paragraph role="paragraph" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_EDIT_DLG_SAVE_LABEL_ED_TYPE">Enter or select a label type.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/01010203.xhp b/helpcontent2/source/text/shared/01/01010203.xhp
index baecc54b28..7772060a88 100755
--- a/helpcontent2/source/text/shared/01/01010203.xhp
+++ b/helpcontent2/source/text/shared/01/01010203.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010203.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,22 +47,22 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#druckereti"/>
</section>
- <bookmark branch="hid/SW:RADIOBUTTON:TP_LAB_PRT:BTN_PAGE" xml-lang="en-US" id="bm_id3159233"/><paragraph role="heading" level="2" id="hd_id3150713" l10n="U" xml-lang="en-US" oldref="3">Entire Page</paragraph>
+ <bookmark branch="hid/sw:RadioButton:TP_LAB_PRT:BTN_PAGE" xml-lang="en-US" id="bm_id3159233"/><paragraph role="heading" level="2" id="hd_id3150713" l10n="U" xml-lang="en-US" oldref="3">Entire Page</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155355" xml-lang="en-US" oldref="4"><ahelp hid="SW:RADIOBUTTON:TP_LAB_PRT:BTN_PAGE" visibility="visible">Creates a full page of labels or business cards.</ahelp></paragraph>
- <bookmark branch="hid/SW:RADIOBUTTON:TP_LAB_PRT:BTN_SINGLE" xml-lang="en-US" id="bm_id3147089"/><paragraph role="heading" level="2" id="hd_id3146958" l10n="U" xml-lang="en-US" oldref="5">Single Label</paragraph>
+ <bookmark branch="hid/sw:RadioButton:TP_LAB_PRT:BTN_SINGLE" xml-lang="en-US" id="bm_id3147089"/><paragraph role="heading" level="2" id="hd_id3146958" l10n="U" xml-lang="en-US" oldref="5">Single Label</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155535" xml-lang="en-US" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_LAB_PRT:BTN_SINGLE" visibility="visible">Prints a single label or business card on a page.</ahelp></paragraph>
- <bookmark branch="hid/SW:NUMERICFIELD:TP_LAB_PRT:FLD_COL" xml-lang="en-US" id="bm_id3155338"/><paragraph role="heading" level="2" id="hd_id3148621" l10n="U" xml-lang="en-US" oldref="7">Column</paragraph>
+ <bookmark branch="hid/sw:NumericField:TP_LAB_PRT:FLD_COL" xml-lang="en-US" id="bm_id3155338"/><paragraph role="heading" level="2" id="hd_id3148621" l10n="U" xml-lang="en-US" oldref="7">Column</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3145345" xml-lang="en-US" oldref="8"><ahelp hid="SW:NUMERICFIELD:TP_LAB_PRT:FLD_COL" visibility="visible">Enter the number of labels or business cards that you want to have in a row on your page.</ahelp></paragraph>
- <bookmark branch="hid/SW:NUMERICFIELD:TP_LAB_PRT:FLD_ROW" xml-lang="en-US" id="bm_id3150443"/><paragraph role="heading" level="2" id="hd_id3149398" l10n="U" xml-lang="en-US" oldref="9">Row</paragraph>
+ <bookmark branch="hid/sw:NumericField:TP_LAB_PRT:FLD_ROW" xml-lang="en-US" id="bm_id3150443"/><paragraph role="heading" level="2" id="hd_id3149398" l10n="U" xml-lang="en-US" oldref="9">Row</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3166410" xml-lang="en-US" oldref="10"><ahelp hid="SW:NUMERICFIELD:TP_LAB_PRT:FLD_ROW" visibility="visible">Enter the number of rows of labels or business cards that you want to have on your page.</ahelp></paragraph>
- <bookmark branch="hid/SW:CHECKBOX:TP_LAB_PRT:CB_SYNCHRON" xml-lang="en-US" id="bm_id3159166"/><paragraph role="heading" level="2" id="hd_id3149237" l10n="U" xml-lang="en-US" oldref="15">Synchronize contents</paragraph>
+ <bookmark branch="hid/sw:CheckBox:TP_LAB_PRT:CB_SYNCHRON" xml-lang="en-US" id="bm_id3159166"/><paragraph role="heading" level="2" id="hd_id3149237" l10n="U" xml-lang="en-US" oldref="15">Synchronize contents</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155342" xml-lang="en-US" oldref="16"><ahelp visibility="visible" hid="SW:CHECKBOX:TP_LAB_PRT:CB_SYNCHRON">Allows you to edit a single label or business card and updates the contents of the remaining labels or business cards on the page when you click the <emph>Synchronize Labels </emph>button.</ahelp></paragraph>
- <bookmark branch="hid/SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC" xml-lang="en-US" id="bm_id3145119"/><paragraph role="heading" level="2" id="hd_id3149164" l10n="U" xml-lang="en-US" oldref="18">Synchronize Labels</paragraph>
+ <bookmark branch="hid/sw:PushButton:DLG_SYNC_BTN:BTN_SYNC" xml-lang="en-US" id="bm_id3145119"/><paragraph role="heading" level="2" id="hd_id3149164" l10n="U" xml-lang="en-US" oldref="18">Synchronize Labels</paragraph>
<paragraph xml-lang="en-US" oldref="17" l10n="U" role="paragraph" id="par_id3148474">The <emph>Synchronize labels </emph>button only appears in your document if you selected the <emph>Synchronize contents </emph>on the<emph> Options tab </emph>when you created the labels or business cards.</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149762" xml-lang="en-US" oldref="19"><ahelp hid="SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC" visibility="visible">Copies the contents of the top left label or business card to the remaining labels or business cards on the page.</ahelp></paragraph>
<paragraph role="heading" level="2" id="hd_id3150504" l10n="U" xml-lang="en-US" oldref="11">Printer</paragraph>
<paragraph role="paragraph" id="par_id3148990" l10n="U" xml-lang="en-US" oldref="12">Displays the name of the currently selected printer.</paragraph>
- <bookmark branch="hid/SW:PUSHBUTTON:TP_LAB_PRT:BTN_PRTSETUP" xml-lang="en-US" id="bm_id3155180"/><paragraph role="heading" level="2" id="hd_id3153127" l10n="U" xml-lang="en-US" oldref="13">Setup</paragraph>
+ <bookmark branch="hid/sw:PushButton:TP_LAB_PRT:BTN_PRTSETUP" xml-lang="en-US" id="bm_id3155180"/><paragraph role="heading" level="2" id="hd_id3153127" l10n="U" xml-lang="en-US" oldref="13">Setup</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3144438" xml-lang="en-US" oldref="14"><ahelp visibility="visible" hid="SW:PUSHBUTTON:TP_LAB_PRT:BTN_PRTSETUP">Opens the <link href="text/shared/01/01140000.xhp" name="Printer Setup">Printer Setup</link> dialog.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01010300.xhp b/helpcontent2/source/text/shared/01/01010300.xhp
index 49aa01ad91..ac1ae61003 100644
--- a/helpcontent2/source/text/shared/01/01010300.xhp
+++ b/helpcontent2/source/text/shared/01/01010300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010301.xhp b/helpcontent2/source/text/shared/01/01010301.xhp
index 7920cfefb8..403d2b070c 100755
--- a/helpcontent2/source/text/shared/01/01010301.xhp
+++ b/helpcontent2/source/text/shared/01/01010301.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010301.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01010302.xhp b/helpcontent2/source/text/shared/01/01010302.xhp
index 6266a53540..39fc520987 100755
--- a/helpcontent2/source/text/shared/01/01010302.xhp
+++ b/helpcontent2/source/text/shared/01/01010302.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010302.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
<bookmark branch="hid/HID_BUSINESS_CARD_CONTENT" xml-lang="en-US" id="bm_id3153070"/><paragraph role="heading" level="2" id="hd_id3146873" l10n="U" xml-lang="en-US" oldref="3">Content</paragraph>
<paragraph role="paragraph" id="par_id3147527" l10n="U" xml-lang="en-US" oldref="4">Select a design layout for your business card.</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3158442" xml-lang="en-US" oldref="5"><ahelp visibility="visible" hid="HID_BUSINESS_CARD_CONTENT">Select a business card category in <emph>AutoText - Section</emph> box, and then click a layout in the <emph>Content </emph>list.</ahelp></paragraph>
- <bookmark branch="hid/SW_LISTBOX_TP_VISITING_CARDS_LB_AUTO_TEXT_GROUP" xml-lang="en-US" id="bm_id3150603"/><paragraph role="heading" level="3" id="hd_id3148668" l10n="U" xml-lang="en-US" oldref="6">AutoText - Section</paragraph>
+ <bookmark branch="hid/sw:ListBox:TP_VISITING_CARDS:LB_AUTO_TEXT_GROUP" xml-lang="en-US" id="bm_id3150603"/><paragraph role="heading" level="3" id="hd_id3148668" l10n="U" xml-lang="en-US" oldref="6">AutoText - Section</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154894" xml-lang="en-US" oldref="7"><ahelp visibility="visible" hid="SW_LISTBOX_TP_VISITING_CARDS_LB_AUTO_TEXT_GROUP">Select a business card category, and then click a layout in the <emph>Content </emph>list.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/01010303.xhp b/helpcontent2/source/text/shared/01/01010303.xhp
index 683a0af779..65ea8b50b7 100755
--- a/helpcontent2/source/text/shared/01/01010303.xhp
+++ b/helpcontent2/source/text/shared/01/01010303.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010303.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,26 +47,26 @@
<embed href="text/shared/00/00000401.xhp#viskartpriv"/>
</section>
<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="3">Private data</paragraph>
-<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</paragraph>
<embed href="text/shared/optionen/01010100.xhp#datena"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2" id="bm_id3145314" localize="false"/><paragraph role="heading" id="hd_id3156427" xml-lang="en-US" level="3" l10n="U" oldref="15">First name 2</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME_2" id="bm_id3145314" localize="false"/><paragraph role="heading" id="hd_id3156427" xml-lang="en-US" level="3" l10n="U" oldref="15">First name 2</paragraph>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2">Enter the first name of the person, whom you want to use as a second contact.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_NAME_2" id="bm_id3155941" localize="false"/><paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="3" l10n="U" oldref="17">Last name 2</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_NAME_2" id="bm_id3155941" localize="false"/><paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="3" l10n="U" oldref="17">Last name 2</paragraph>
<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_NAME_2">Enter the last name of the person, whom you want to use as a second contact.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_SHORTCUT_2" id="bm_id3153663" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="19">Initials 2</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT_2" id="bm_id3153663" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="19">Initials 2</paragraph>
<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_SHORTCUT_2">Enter the initials of the person, whom you want to use as a second contact.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#strplzort"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_STATE" id="bm_id3149955" localize="false"/><paragraph role="heading" id="hd_id3153543" xml-lang="en-US" level="3" l10n="U" oldref="5">Country</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_STATE" id="bm_id3149955" localize="false"/><paragraph role="heading" id="hd_id3153543" xml-lang="en-US" level="3" l10n="U" oldref="5">Country</paragraph>
<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_STATE">Enter the name of the country in which you live.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#datenb"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_PROFESSION" id="bm_id3155504" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="U" oldref="7">Profession</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION" id="bm_id3155504" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="U" oldref="7">Profession</paragraph>
<paragraph role="paragraph" id="par_id3156192" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_PROFESSION">Enter the title of your profession.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_PHONE" id="bm_id3148491" localize="false"/><paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="3" l10n="U" oldref="9">Phone</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_PHONE" id="bm_id3148491" localize="false"/><paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="3" l10n="U" oldref="9">Phone</paragraph>
<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_PHONE">Enter your home telephone number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_MOBILE" id="bm_id3152349" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Mobile</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_MOBILE" id="bm_id3152349" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Mobile</paragraph>
<paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_MOBILE">Enter your mobile telephone number.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#datend"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_WWW" id="bm_id3155261" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="13">Homepage</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_WWW" id="bm_id3155261" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="13">Homepage</paragraph>
<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_WWW">Enter the address of your internet homepage.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#datene"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/01010304.xhp b/helpcontent2/source/text/shared/01/01010304.xhp
index d6bbb26e26..be12052eff 100644
--- a/helpcontent2/source/text/shared/01/01010304.xhp
+++ b/helpcontent2/source/text/shared/01/01010304.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010304.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,25 +53,25 @@
<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card.</paragraph>
<paragraph role="note" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="17">If you want to include your name on a business card, enter your name on the <emph>Private </emph>tab. Then choose a layout on the <emph>Business Cards </emph>tab that includes a name placeholder.</paragraph>
<embed href="text/shared/optionen/01010100.xhp#datenf"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_COMP_EXT" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT" id="bm_id3147653" localize="false"/>
<paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="3" l10n="U" oldref="5">Company 2nd line</paragraph>
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_COMP_EXT">Enter additional company details.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_SLOGAN" id="bm_id3149955" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN" id="bm_id3149955" localize="false"/>
<paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="7">Slogan</paragraph>
<paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_SLOGAN">Enter the slogan of your company.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#strplzort"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_STATE" id="bm_id3145416" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_STATE" id="bm_id3145416" localize="false"/>
<paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="3" l10n="U" oldref="9">Country</paragraph>
<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_STATE">Enter the name of the country where your business is located.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#dateng"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_PHONE" id="bm_id3156152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_PHONE" id="bm_id3156152" localize="false"/>
<paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="11">Phone</paragraph>
<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_PHONE">Enter your business telephone number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_MOBILE" id="bm_id3148990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_MOBILE" id="bm_id3148990" localize="false"/>
<paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="13">Mobile</paragraph>
<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_MOBILE">Enter your mobile telephone number.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#datend"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_WWW" id="bm_id3153665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_WWW" id="bm_id3153665" localize="false"/>
<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="15">Homepage</paragraph>
<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_BUSINESS_DATA:ED_WWW">Enter the address of your company's internet homepage.</ahelp></paragraph>
<embed href="text/shared/optionen/01010100.xhp#datene"/>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index ecaa6f6d49..d07c510010 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.18.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,114 +31,137 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Open</title>
-<filename>/text/shared/01/01020000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Open</title>
+ <filename>/text/shared/01/01020000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145211"><bookmark_value>directories; creating new</bookmark_value>
-<bookmark_value>folder creation</bookmark_value>
-<bookmark_value>My Documents folder; opening</bookmark_value>
-<bookmark_value>default directories</bookmark_value>
-<bookmark_value>multiple documents; opening</bookmark_value>
-<bookmark_value>opening; several files</bookmark_value>
-<bookmark_value>selecting; several files</bookmark_value>
-<bookmark_value>opening; files, with placeholders</bookmark_value>
-<bookmark_value>regular expressions; opening files</bookmark_value>
-<bookmark_value>files; opening with placeholders</bookmark_value>
-<bookmark_value>placeholders;on opening files</bookmark_value>
-<bookmark_value>documents; opening with templates</bookmark_value>
-<bookmark_value>templates; opening documents with</bookmark_value>
-<bookmark_value>documents; styles changed</bookmark_value>
-<bookmark_value>styles; 'changed' message</bookmark_value>
-</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment>
+ <bookmark_value>folder creation</bookmark_value>
+ <bookmark_value>My Documents folder; opening</bookmark_value>
+ <bookmark_value>default directories</bookmark_value>
+ <bookmark_value>multiple documents; opening</bookmark_value>
+ <bookmark_value>opening; several files</bookmark_value>
+ <bookmark_value>selecting; several files</bookmark_value>
+ <bookmark_value>opening; files, with placeholders</bookmark_value>
+ <bookmark_value>placeholders;on opening files</bookmark_value>
+ <bookmark_value>documents; opening with templates</bookmark_value>
+ <bookmark_value>templates; opening documents with</bookmark_value>
+ <bookmark_value>documents; styles changed</bookmark_value>
+ <bookmark_value>styles; 'changed' message</bookmark_value>
+</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment><comment>mw deleted "regular expressions;" and "files;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_OPENDOC" id="bm_id3908743" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Open" id="bm_id3146765" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/><paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
-<paragraph role="paragraph" id="par_id3151191" xml-lang="en-US" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146936" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151191" role="paragraph" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#oeffnen"/>
</section>
-<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Open </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item><emph>Open</emph> dialog box. To activate the <item type="productname">%PRODUCTNAME</item><emph>Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="note" id="par_id3150713" xml-lang="en-US" l10n="U" oldref="52">If the file that you want to open contains Styles, <link href="text/shared/01/01020000.xhp#vorlagen" name="special rules">special rules</link> apply.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id3153394" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="11">Up One Level</paragraph>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
-<embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id3153748" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="2" l10n="U" oldref="13">Create New Directory</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id3147008" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id5397808" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="2" l10n="U" oldref="38">Default Directory</paragraph>
-<paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
-<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>
-<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>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/><paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/><paragraph role="listitem" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" id="bm_id3151245" localize="false"/><paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" id="bm_id3150822" localize="false"/><paragraph role="paragraph" id="par_id3161458" xml-lang="en-US" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" id="bm_id3154346" localize="false"/><paragraph role="paragraph" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
+<!-- removed HID SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147250" role="heading" level="2" l10n="U"
+ oldref="11">Up One Level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147226" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
+ <embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
+<!-- removed HID SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145211" role="heading" level="2" l10n="U"
+ oldref="13">Create New Directory</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
+ <embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
+<!-- removed HID SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD -->
+<!-- removed HID svtools_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147010" role="heading" level="2" l10n="U"
+ oldref="38">Default Directory</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3109847" role="paragraph" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
+ <embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U"
+ oldref="19">Display area</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" 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 xml-lang="en-US" id="par_id3159256" role="tip" 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 xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
+ </listitem>
+ <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
+ </listitem>
+ <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147618" role="listitem" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES" id="bm_id3151245" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153331" role="paragraph" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO" id="bm_id3150822" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3161458" role="paragraph" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL" id="bm_id3154346" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147531" role="paragraph" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_FOLDER_FILENAME" id="bm_id3149656" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/><paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="2" l10n="U" oldref="21">File name</paragraph>
-<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3153779" xml-lang="en-US" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154280" role="heading" level="2" l10n="U"
+ oldref="21">File name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3161656" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150541" role="paragraph" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153779" role="paragraph" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>For example, to list all of the text files in a directory, enter the asterisk wildcard with the text file extension (*.txt), and then click<emph> Open</emph>. Use the question mark (?) wildcard to represent any character, as in (??3*.txt), which only displays text files with a '3' as the third character in the file name.</defaultinline></switchinline></paragraph>
-<embed href="text/shared/04/01010000.xhp#autocompurl"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3145117" xml-lang="en-US" level="2" l10n="U" oldref="81">Version</paragraph>
-<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id3151176" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="25">File type</paragraph>
-<paragraph role="paragraph" id="par_id3153969" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN" id="bm_id3149810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL" id="bm_id5172582" localize="false"/><paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="2" l10n="U" oldref="27">Open</paragraph>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="2" l10n="U" oldref="88">Insert</paragraph>
-<paragraph role="paragraph" id="par_id3156293" xml-lang="en-US" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3144762" xml-lang="en-US" level="2" l10n="U" oldref="35">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
+ <embed href="text/shared/04/01010000.xhp#autocompurl"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145117" role="heading" level="2" l10n="U"
+ oldref="81">Version</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149291" role="paragraph" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
+<!-- removed HID SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE -->
+<bookmark xml-lang="en-US" branch="hid/fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="2" l10n="U"
+ oldref="25">File type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153969" role="paragraph" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
+<!-- removed HID SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN -->
+<!-- removed HID svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL -->
+<paragraph xml-lang="en-US" id="hd_id3154125" role="heading" level="2" l10n="U"
+ oldref="27">Open</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152933" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147085" role="heading" level="2" l10n="U"
+ oldref="88">Insert</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156293" role="paragraph" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144762" role="heading" level="2" l10n="U"
+ oldref="35">Read-only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
<switch select="appl">
<case select="IMPRESS">
-<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/><paragraph role="heading" id="hd_id3149984" xml-lang="en-US" level="2" l10n="U" oldref="113">Play</paragraph>
-<paragraph role="paragraph" id="par_id3147289" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149984" role="heading" level="2" l10n="U"
+ oldref="113">Play</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147289" role="paragraph" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
</case>
</switch>
<section id="vorlagen">
-<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/><paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="3" l10n="U" oldref="53">Opening Documents With Templates</paragraph>
-<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="CHG" oldref="40">
-<item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151292" xml-lang="en-US" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3144442" xml-lang="en-US" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
+<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149260" role="heading" level="3" l10n="U"
+ oldref="53">Opening Documents With Templates</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="CHG" oldref="40">
+ <item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151292" role="listitem" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3144442" role="listitem" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
</caseinline><defaultinline>in the Documents and Settings directory</defaultinline></switchinline></paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - %PRODUCTNAME - Paths"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph></link></paragraph>
+<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="%PRODUCTNAME - Paths">%PRODUCTNAME - Paths</link></emph></paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id7375713" xml-lang="en-US" l10n="NEW">When you use <item type="menuitem">File - Template - Save</item> to save a template, the template will be stored in your user template directory. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template".</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01020101.xhp b/helpcontent2/source/text/shared/01/01020101.xhp
index f62da6c19d..5d6f565e8e 100755
--- a/helpcontent2/source/text/shared/01/01020101.xhp
+++ b/helpcontent2/source/text/shared/01/01020101.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020101.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01020103.xhp b/helpcontent2/source/text/shared/01/01020103.xhp
index 9fc9d123a4..cfa54f4586 100755
--- a/helpcontent2/source/text/shared/01/01020103.xhp
+++ b/helpcontent2/source/text/shared/01/01020103.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020103.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,8 +47,8 @@
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#filterauswahl"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX" id="bm_id3155351" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/uui_ListBox_DLG_FILTER_SELECT_LB_FILTERS" id="bm_id1646778" localize="false"/>
+<!-- removed HID SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX -->
+<bookmark xml-lang="en-US" branch="hid/uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS" id="bm_id1646778" localize="false"/>
<paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="2" l10n="U" oldref="4">Filter list</paragraph>
<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX">Select the import filter for the file that you want to open.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="U" oldref="6">If $[officename] does not recognize the file type of the document that your want to open, try any of the following:</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01050000.xhp b/helpcontent2/source/text/shared/01/01050000.xhp
index c29b1ba121..4aa6d00947 100644
--- a/helpcontent2/source/text/shared/01/01050000.xhp
+++ b/helpcontent2/source/text/shared/01/01050000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,7 @@
<section id="schliessen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154545"><bookmark_value>documents; closing</bookmark_value>
<bookmark_value>closing;documents</bookmark_value>
-<bookmark_value>backing window</bookmark_value>
-</bookmark><comment>mw made "closing..." a two level entry</comment>
+</bookmark><comment>mw deleted "backing window"</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>
diff --git a/helpcontent2/source/text/shared/01/01060000.xhp b/helpcontent2/source/text/shared/01/01060000.xhp
index 04e779717f..86086eed28 100644
--- a/helpcontent2/source/text/shared/01/01060000.xhp
+++ b/helpcontent2/source/text/shared/01/01060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01070000.xhp b/helpcontent2/source/text/shared/01/01070000.xhp
index c71ee41858..a07eae10bf 100644
--- a/helpcontent2/source/text/shared/01/01070000.xhp
+++ b/helpcontent2/source/text/shared/01/01070000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01070000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,11 +50,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#saveas"/>
</section>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Save as </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.<comment>UFI: using system dialogs works in Windows and Gnome 2.6</comment></paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <emph><item type="productname">%PRODUCTNAME</item>Save as</emph> dialog. To activate the <emph><item type="productname">%PRODUCTNAME</item>Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="note" id="par_id3147654" xml-lang="en-US" l10n="U" oldref="59">To save a document as a template, use the command <emph>File - Templates - Save</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_LEVELUP" id="bm_id3154380" localize="false"/><paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="19">Up One Level</paragraph>
<section id="levelup">
diff --git a/helpcontent2/source/text/shared/01/01070001.xhp b/helpcontent2/source/text/shared/01/01070001.xhp
index f07a693f74..74e295051e 100644
--- a/helpcontent2/source/text/shared/01/01070001.xhp
+++ b/helpcontent2/source/text/shared/01/01070001.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01070001.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#export"/>
</section>
-<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export </emph>dialog. To activate the <emph>$[officename] Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - $[officename] - General"><emph>Tools - Options - $[officename] - General</emph></link>, and then select the <emph>Use $[officename] dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export</emph> dialog box. To activate the <emph>$[officename] Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="$[officename] - General">$[officename] - General</link></emph>, and then select the <emph>Use $[officename] dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="2" l10n="U" oldref="4">Up One Level</paragraph>
<embed href="text/shared/01/01070000.xhp#levelup"/>
<paragraph role="heading" id="hd_id3153312" xml-lang="en-US" level="2" l10n="U" oldref="5">Create New Directory</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100000.xhp b/helpcontent2/source/text/shared/01/01100000.xhp
index f9a091d8fe..35d288e31a 100644
--- a/helpcontent2/source/text/shared/01/01100000.xhp
+++ b/helpcontent2/source/text/shared/01/01100000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01100000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +29,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0101100000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Properties of</title>
<filename>/text/shared/01/01100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-07T10:43:45">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SID_DOCINFO" id="bm_id1332604" localize="false"/>
@@ -56,32 +49,16 @@
</section>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="CHG" oldref="4">The <emph>Properties</emph> dialog contains the following tab pages:</paragraph>
<embed href="text/shared/01/01100200.xhp#dokument"/>
+<embed href="text/shared/01/01100100.xhp#beschreibung"/>
+<embed href="text/shared/01/01100300.xhp#benutzer"/>
+<embed href="text/shared/01/01100500.xhp#internet"/>
+<embed href="text/shared/01/01100600.xhp#security"/>
<switch select="appl">
-<case select="IMAGE">
-</case>
-<default><embed href="text/shared/01/01100100.xhp#beschreibung"/>
-</default>
-</switch>
-<switch select="appl">
-<case select="IMAGE">
-</case>
-<default><embed href="text/shared/01/01100300.xhp#benutzer"/>
-</default>
-</switch>
-<switch select="appl">
-<case select="IMAGE">
+<case select="WRITER">
+<embed href="text/shared/01/01100400.xhp#statistik"/>
</case>
-<default><embed href="text/shared/01/01100500.xhp#internet"/>
-</default>
</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/shared/01/01100400.xhp#statistik"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="CALC">
-</case>
-</switch><embed href="text/shared/00/00000001.xhp#zurueck"/>
-<paragraph role="note" id="par_id3148643" xml-lang="en-US" l10n="U" oldref="5">Depending on your access rights to the file, you might not see all of tabs in the <emph>Properties </emph>dialog.</paragraph>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<paragraph role="note" id="par_id3148643" xml-lang="en-US" l10n="CHG" oldref="5">Depending on your access rights to the file, you might not see all of the tabs in the <emph>Properties</emph> dialog.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01100100.xhp b/helpcontent2/source/text/shared/01/01100100.xhp
index e3bd6b1985..1aed9aa23b 100755
--- a/helpcontent2/source/text/shared/01/01100100.xhp
+++ b/helpcontent2/source/text/shared/01/01100100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100100.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,16 +46,16 @@
<section id="howtoget">
<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"/>
+<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>
<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_TITLE">Enter a title for the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_THEMA" id="bm_id3145136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFODESC:ED_THEMA" id="bm_id3145136" localize="false"/>
<paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="5">Subject</paragraph>
<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"/>
+<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. 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"/>
+<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>
</body>
diff --git a/helpcontent2/source/text/shared/01/01100200.xhp b/helpcontent2/source/text/shared/01/01100200.xhp
index c4729f3d81..12460aa771 100755
--- a/helpcontent2/source/text/shared/01/01100200.xhp
+++ b/helpcontent2/source/text/shared/01/01100200.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,65 +27,69 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0101100200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/01/01100200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-06T09:12:13">UFI: added spec "Electronic Signatures and Encryption GUI"
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="dokument">
+ <topic id="textshared0101100200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">General</title>
+ <filename>/text/shared/01/01100200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="dokument">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149955"><bookmark_value>version numbers of documents</bookmark_value>
-<bookmark_value>documents; version numbers</bookmark_value>
-<bookmark_value>files; version numbers</bookmark_value>
-<bookmark_value>editing time of documents</bookmark_value>
-<bookmark_value>documents; editing time</bookmark_value>
+ <bookmark_value>documents; version numbers</bookmark_value>
+ <bookmark_value>files; version numbers</bookmark_value>
+ <bookmark_value>editing time of documents</bookmark_value>
+ <bookmark_value>documents; editing time</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_DOCINFODOC" id="bm_id3154926" localize="false"/>
-<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01100200.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_DOCINFODOC">Contains basic information about the current file.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#info2"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODOC:ED_FILE_NAME" id="bm_id3149283" localize="false"/>
-<paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">File</paragraph>
-<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_DOCINFODOC:ED_FILE_NAME">Displays the file name.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="17">Type:</paragraph>
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="20">Displays the file type for the current document.</paragraph>
-<paragraph role="heading" id="hd_id3145314" xml-lang="en-US" level="2" l10n="U" oldref="18">Location:</paragraph>
-<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="21">Displays the path and the name of the directory where the file is stored.</paragraph>
-<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="19">Size:</paragraph>
-<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="22">Displays the size of the current document in bytes.</paragraph>
-<paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="2" l10n="U" oldref="7">Created:</paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="8">Displays the date and time and author when the file was first saved.</paragraph>
-<paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="2" l10n="U" oldref="9">Modified:</paragraph>
-<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="10">Displays the date and time and author when the file was last saved in a $[officename] file format.</paragraph>
-<paragraph role="heading" id="par_idN106C5" xml-lang="en-US" level="2" l10n="NEW">Digitally signed:</paragraph>
-<paragraph role="paragraph" id="par_idN106C9" xml-lang="en-US" l10n="NEW">Displays the date and the time when the file was last signed as well as the name of the author who signed the document.</paragraph>
-<paragraph role="heading" id="par_idN106CC" xml-lang="en-US" level="2" l10n="NEW">Digital Signature</paragraph>
-<paragraph role="paragraph" id="par_idN106D0" xml-lang="en-US" l10n="NEW">Opens the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog where you can manage digital signatures for the current document.</paragraph>
-<paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="11">Last printed:</paragraph>
-<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="12">Displays the date and time and user name when the file was last printed.</paragraph>
-<paragraph role="heading" id="hd_id3153252" xml-lang="en-US" level="2" l10n="U" oldref="15">Document number:</paragraph>
-<paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="16">Displays the number of times that the file has been saved.</paragraph>
-<paragraph role="heading" id="hd_id3155342" xml-lang="en-US" level="2" l10n="U" oldref="13"> Editing time:</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="14">Displays the amount of time that the file has been open for editing since the file was created. The editing time is updated when you save the file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA" id="bm_id3159270" localize="false"/>
-<paragraph role="heading" id="hd_id3154810" xml-lang="en-US" level="2" l10n="U" oldref="33">Apply User Data</paragraph>
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE" id="bm_id3148686" localize="false"/>
-<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="35">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE">Resets the editing time to zero, the creation date to the current date and time, and the version number to 1. The modification and printing dates are also deleted.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149576" xml-lang="en-US" level="2" l10n="U" oldref="5">Template:</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="6">Displays the template that was used to create the file.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3148668" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/01100200.xhp" name="General">General</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154863" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_DOCINFODOC">Contains basic information about the current file.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#info2"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME" id="bm_id3149283" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149999" role="heading" level="2" l10n="U" oldref="3">File</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153114" role="paragraph" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_DOCINFODOC:ED_FILE_NAME">Displays the file name.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156136" role="heading" level="2" l10n="U"
+ oldref="17">Type:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="U" oldref="20">Displays the file type for the current document.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145314" role="heading" level="2" l10n="U"
+ oldref="18">Location:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150506" role="paragraph" l10n="U" oldref="21">Displays the path and the name of the directory where the file is stored.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155892" role="heading" level="2" l10n="U"
+ oldref="19">Size:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" l10n="U" oldref="22">Displays the size of the current document in bytes.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149178" role="heading" level="2" l10n="U" oldref="7">Created:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="8">Displays the date and time and author when the file was first saved.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149182" role="heading" level="2" l10n="U" oldref="9">Modified:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150355" role="paragraph" l10n="U" oldref="10">Displays the date and time and author when the file was last saved in a $[officename] file format.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="heading" level="2" l10n="NEW">Digitally signed:</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Displays the date and the time when the file was last signed as well as the name of the author who signed the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106CC" role="heading" level="2" l10n="NEW">Digital Signature</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106D0" role="paragraph" l10n="NEW">Opens the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog where you can manage digital signatures for the current document.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156346" role="heading" level="2" l10n="U"
+ oldref="11">Last printed:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152780" role="paragraph" l10n="U" oldref="12">Displays the date and time and user name when the file was last printed.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153252" role="heading" level="2" l10n="CHG"
+ oldref="15">Revision number:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149955" role="paragraph" l10n="U" oldref="16">Displays the number of times that the file has been saved.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155342" role="heading" level="2" l10n="U"
+ oldref="13"> Editing time:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="14">Displays the amount of time that the file has been open for editing since the file was created. The editing time is updated when you save the file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_DOCINFODOC:CB_USE_USERDATA" id="bm_id3159270" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154810" role="heading" level="2" l10n="U"
+ oldref="33">Apply User Data</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE" id="bm_id3148686" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
+ oldref="35">Delete</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="36"><ahelp hid="SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE">Resets the editing time to zero, the creation date to the current date and time, and the version number to 1. The modification and printing dates are also deleted.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149576" role="heading" level="2" l10n="U" oldref="5">Template:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6">Displays the template that was used to create the file.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/01100300.xhp b/helpcontent2/source/text/shared/01/01100300.xhp
index 8a8994df9c..d4736c1ae3 100755
--- a/helpcontent2/source/text/shared/01/01100300.xhp
+++ b/helpcontent2/source/text/shared/01/01100300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100300.xhp,v $
- * $Revision: 1.5.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,14 +46,14 @@
<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/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"/>
+<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>
diff --git a/helpcontent2/source/text/shared/01/01100400.xhp b/helpcontent2/source/text/shared/01/01100400.xhp
index 4b68514389..5f9594ebcc 100755
--- a/helpcontent2/source/text/shared/01/01100400.xhp
+++ b/helpcontent2/source/text/shared/01/01100400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100400.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
<bookmark_value>OLE objects;number of</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_DOC_STAT" id="bm_id3147294" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_TABPAGE_RID_SCPAGE_STAT" id="bm_id3145356" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:TabPage:RID_SCPAGE_STAT" id="bm_id3145356" localize="false"/>
<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01100400.xhp" name="Statistics">Statistics</link></paragraph>
<paragraph role="paragraph" id="par_id3156045" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC_TABPAGE_RID_SCPAGE_STAT">Displays statistics for the current file.</ahelp></paragraph>
</section>
@@ -100,7 +97,7 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3149650" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="WRITER">Number of lines in the file.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_TP_DOC_STAT_PB_PDATE" id="bm_id3154940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_DOC_STAT:PB_PDATE" id="bm_id3154940" localize="false"/>
<paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="2" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Update
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SW_PUSHBUTTON_TP_DOC_STAT_PB_PDATE">Updates the statistics.</ahelp>
diff --git a/helpcontent2/source/text/shared/01/01100500.xhp b/helpcontent2/source/text/shared/01/01100500.xhp
index d45203ab44..f4ebaa3362 100755
--- a/helpcontent2/source/text/shared/01/01100500.xhp
+++ b/helpcontent2/source/text/shared/01/01100500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100500.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,29 +55,29 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#info6"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_NOAUTOUPDATE" id="bm_id3149798" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE" id="bm_id3149798" localize="false"/>
<paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="2" l10n="U" oldref="26">Do not refresh automatically</paragraph>
<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_NOAUTOUPDATE">User must refresh the page manually.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_RELOADUPDATE" id="bm_id3153577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_DOCINFORELOAD:RB_RELOADUPDATE" id="bm_id3153577" localize="false"/>
<paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="5">Refresh this document</paragraph>
<paragraph role="paragraph" id="par_id3153528" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_RELOADUPDATE">Reloads the HTML page after the number of seconds that you enter in the <emph>seconds</emph> box. To observe the result, open the page in a browser.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_NumericField_TP_DOCINFORELOAD_ED_RELOAD" id="bm_id6386608" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:TP_DOCINFORELOAD:ED_RELOAD" id="bm_id6386608" localize="false"/>
<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="U" oldref="7">Seconds</paragraph>
<paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:NUMERICFIELD:TP_DOCINFORELOAD:ED_SECONDS">Enter the number of seconds to wait before the page is reloaded.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_FORWARDUPDATE" id="bm_id3147210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_DOCINFORELOAD:RB_FORWARDUPDATE" id="bm_id3147210" localize="false"/>
<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="28">Redirect from this document</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_FORWARDUPDATE">Loads a page that you specify after the number of seconds that you enter in the <emph>seconds </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_NumericField_TP_DOCINFORELOAD_ED_FORWARD" id="bm_id7947935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:TP_DOCINFORELOAD:ED_FORWARD" id="bm_id7947935" localize="false"/>
<paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="3" l10n="U" oldref="30">after ... seconds</paragraph>
<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SFX2_RADIOBUTTON_TP_DOCINFORELOAD_RB_FORWARDUPDATE">Enter the number of seconds to wait before redirecting the browser to a different file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_Edit_TP_DOCINFORELOAD_ED_URL" id="bm_id5280617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_DOCINFORELOAD:ED_URL" id="bm_id5280617" localize="false"/>
<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="9">to URL</paragraph>
<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:EDIT:TP_DOCINFORELOAD:ED_URL">Enter the URL address of the file that you want to open.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_DOCINFORELOAD_PB_BROWSEURL" id="bm_id4792931" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL" id="bm_id4792931" localize="false"/>
<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="32">...</paragraph>
<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SFX2:EDIT:TP_DOCINFORELOAD:ED_URL">Locate the file that you want to open, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:COMBOBOX:TP_DOCINFORELOAD:LB_DEFAULT" id="bm_id3155434" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ComboBox_TP_DOCINFORELOAD_CB_FRAME" id="bm_id1734366" localize="false"/>
+<!-- removed HID SFX2:COMBOBOX:TP_DOCINFORELOAD:LB_DEFAULT -->
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME" id="bm_id1734366" localize="false"/>
<paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="11">to frame</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:COMBOBOX:TP_DOCINFORELOAD:LB_DEFAULT">If the current HTML page uses frames, select the name of the <link href="text/shared/00/00000002.xhp#frame" name="target frame">target frame</link> where you want the file to be loaded.</ahelp></paragraph>
<section id="targets">
diff --git a/helpcontent2/source/text/shared/01/01100600.xhp b/helpcontent2/source/text/shared/01/01100600.xhp
new file mode 100644
index 0000000000..e801d63d11
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/01100600.xhp
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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="textshared0101100600xml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Security</title>
+<filename>/text/shared/01/01100600.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="security">
+<bookmark xml-lang="en-US" branch="index" id="bm_id1472519"><bookmark_value>password as document property</bookmark_value>
+<bookmark_value>file sharing options for current document</bookmark_value>
+<bookmark_value>read-only documents;opening documents as</bookmark_value>
+<bookmark_value>saving;with password by default</bookmark_value>
+<bookmark_value>user data;removing when saving</bookmark_value>
+</bookmark>
+
+<paragraph role="heading" id="hd_id3149969" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/01100600.xhp" name="Security">Security</link></paragraph>
+<paragraph role="paragraph" id="par_id3156049" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sets password options for the current document.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#infosec"/>
+</section>
+
+<comment>
+<paragraph role="heading" id="hd_id31499" xml-lang="en-US" level="2" l10n="NEW">File encryption</paragraph>
+<paragraph role="paragraph" id="hd_id31499A" xml-lang="en-US" l10n="NEW">The password to open the current document can be set in the Properties dialog on the Security tab page. You can also set a password to open the document when you save the document. Check the Save with password option on the Save As dialog, and enter the password.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<paragraph role="heading" id="par_idN106AA1" xml-lang="en-US" level="3" l10n="NEW">Enter password to open</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150502B" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<paragraph role="heading" id="par_idN106AA2" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151100E" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+
+
+<paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options</paragraph>
+<paragraph role="paragraph" id="hd_id31499F" xml-lang="en-US" l10n="NEW">The password to edit the current document can be set in the Properties dialog on the Security tab page. Currently this option is evaluated for documents in some Microsoft file formats.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<paragraph role="heading" id="par_idN106AA3" xml-lang="en-US" level="3" l10n="NEW">Enter password to allow editing</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150502H" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<paragraph role="heading" id="par_idN106AA4" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
+<paragraph xml-lang="en-US" id="par_id3151100J" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+</comment>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_OPEN_FILE_READONLY" id="bm_id8295846" localize="false"/>
+<paragraph role="heading" id="par_idN106AA" xml-lang="en-US" level="3" l10n="NEW">Open file read-only</paragraph>
+<paragraph role="paragraph" id="par_idN106AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to allow this document to be opened in read-only mode only.</ahelp></paragraph>
+<paragraph role="note" id="par_idN106B1" xml-lang="en-US" l10n="NEW">This file sharing option protects the document against accidental changes. It is still possible to edit a copy of the document and save that copy with the same name as the original.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_RECORD_CHANGES" id="bm_id868861" localize="false"/>
+<paragraph role="heading" id="par_idN106B4" xml-lang="en-US" level="3" l10n="NEW">Record changes</paragraph>
+<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable recording changes. This is the same as <emph>Edit - Changes - Record</emph>.</ahelp></paragraph>
+<paragraph role="tip" id="par_idN106C9" xml-lang="en-US" l10n="NEW">To protect the recording state with a password, click <emph>Protect</emph> and enter a password. Other users of this document can apply their changes, but they cannot disable change recording without knowing the password.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PROTECTION" id="bm_id2517166" localize="false"/>
+<paragraph role="heading" id="par_idN106D0" xml-lang="en-US" level="3" l10n="NEW">Protect / Unprotect</paragraph>
+<paragraph role="paragraph" id="par_idN106D4" xml-lang="en-US" l10n="NEW"><ahelp hid="703992336">Protects the change recording state with a password. If change recording is protected for the current document, the button is named <emph>Unprotect</emph>. Click <emph>Unprotect</emph> and type the correct password to disable the protection.</ahelp></paragraph>
+
+
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01110000.xhp b/helpcontent2/source/text/shared/01/01110000.xhp
index 438455b751..f247164cae 100755
--- a/helpcontent2/source/text/shared/01/01110000.xhp
+++ b/helpcontent2/source/text/shared/01/01110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01110100.xhp b/helpcontent2/source/text/shared/01/01110100.xhp
index 4dd423bc76..e4cb1efbf3 100644
--- a/helpcontent2/source/text/shared/01/01110100.xhp
+++ b/helpcontent2/source/text/shared/01/01110100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110100.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,14 +66,14 @@
<bookmark xml-lang="en-US" branch="hid/HID_CTL_ORGANIZER_RIGHT" id="bm_id3149346" localize="false"/>
<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">Left and Right Selection List (Templates / Documents)</paragraph>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="C"><ahelp hid="HID_CTL_ORGANIZER_RIGHT">Displays the available template categories or opened $[officename] files. To change the contents of the list, select <emph>Templates</emph> or <emph>Documents</emph> in the box below.</ahelp></paragraph>
-<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_LEFT_TYP" id="bm_id3145120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP" id="bm_id3154307" localize="false"/>
+<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths">$[officename] - Paths</link></emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP" id="bm_id3145120" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP" id="bm_id3154307" localize="false"/>
<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 <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"/>
+<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>
<paragraph role="paragraph" id="par_id3149575" xml-lang="en-US" l10n="U" oldref="37">Depending on the type of file you select in the list, the following commands are available:</paragraph>
@@ -110,10 +107,10 @@
<bookmark xml-lang="en-US" branch="hid/HID_ORGANIZE_STDTEMPLATE_DEL" id="bm_id3155131" localize="false"/>
<paragraph role="heading" id="hd_id3153768" xml-lang="en-US" level="3" l10n="U" oldref="43">Reset Default Template</paragraph>
<paragraph role="paragraph" id="par_id3155432" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_ORGANIZE_STDTEMPLATE_DEL">Select a $[officename] document type to reset the default template to the original template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_DLG_ORGANIZE_BTN_ADDRESSTEMPLATE" id="bm_id3151351" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE" id="bm_id3151351" localize="false"/>
<paragraph role="heading" id="hd_id3159196" xml-lang="en-US" level="2" l10n="U" oldref="38">Address Book</paragraph>
<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">Edit the field assignments and the data source for the address book.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_ORGANIZE:BTN_FILES" id="bm_id3155366" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_ORGANIZE:BTN_FILES" id="bm_id3155366" localize="false"/>
<paragraph role="heading" id="hd_id3154151" xml-lang="en-US" level="2" l10n="U" oldref="32">File</paragraph>
<paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SFX2:PUSHBUTTON:DLG_ORGANIZE:BTN_FILES">Locate a file that you want to add to the document list, and then click<emph> Open</emph>.</ahelp></paragraph>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/01/01110101.xhp b/helpcontent2/source/text/shared/01/01110101.xhp
index 37372115b8..8afe137ac9 100644
--- a/helpcontent2/source/text/shared/01/01110101.xhp
+++ b/helpcontent2/source/text/shared/01/01110101.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110101.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,13 +54,13 @@
</section>
<paragraph role="heading" id="hd_id3149399" xml-lang="en-US" level="2" l10n="U" oldref="3">Address Book Source</paragraph>
<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="4">Set the data source and data table for your address book.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_DATASOURCE" id="bm_id3155390" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE" id="bm_id3155390" localize="false"/>
<paragraph role="heading" id="hd_id3147654" xml-lang="en-US" level="3" l10n="U" oldref="5">Data Source</paragraph>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_DATASOURCE">Select the data source for your address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_TABLE" id="bm_id3143271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE" id="bm_id3143271" localize="false"/>
<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"/>
+<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">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>
diff --git a/helpcontent2/source/text/shared/01/01110300.xhp b/helpcontent2/source/text/shared/01/01110300.xhp
index 58d13a1e23..d6038feb84 100644
--- a/helpcontent2/source/text/shared/01/01110300.xhp
+++ b/helpcontent2/source/text/shared/01/01110300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,21 +49,21 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dokuspei"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:DLG_DOC_TEMPLATE:ED_NAME" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME" id="bm_id3152425" localize="false"/>
<paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="2" l10n="U" oldref="4">New Template</paragraph>
<paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2:EDIT:DLG_DOC_TEMPLATE:ED_NAME">Enter a name for the template.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="6">Templates</paragraph>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="7">Lists templates and template categories.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION" id="bm_id3156427" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION" id="bm_id3156427" localize="false"/>
<paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="3" l10n="U" oldref="8">Categories</paragraph>
<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION">Select a category in which to save the new template.</ahelp> To add a new template category, click the <link href="text/shared/01/01110100.xhp" name="Organize">Organize</link> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_STYLESHEETS" id="bm_id3155942" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS" id="bm_id3155942" localize="false"/>
<paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="3" l10n="U" oldref="10">Templates</paragraph>
<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_STYLESHEETS">Lists the available template categories.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_EDIT" id="bm_id3154749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT" id="bm_id3154749" localize="false"/>
<paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="2" l10n="U" oldref="12">Edit</paragraph>
<paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_EDIT">Opens the selected template for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_ORGANIZE" id="bm_id3144439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE" id="bm_id3144439" localize="false"/>
<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="14">Organize</paragraph>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_ORGANIZE">Opens the <emph>Template Management</emph> dialog where you can organize or create new templates.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/01110400.xhp b/helpcontent2/source/text/shared/01/01110400.xhp
index 3e0282d67f..53c3d37672 100644
--- a/helpcontent2/source/text/shared/01/01110400.xhp
+++ b/helpcontent2/source/text/shared/01/01110400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110400.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index d5913556c9..254e60bbbb 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01130000.xhp,v $
- * $Revision: 1.11.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,15 +29,15 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared0101130000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Print</title>
-<filename>/text/shared/01/01130000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0101130000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Print</title>
+ <filename>/text/shared/01/01130000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154621"><bookmark_value>printing; documents</bookmark_value>
<bookmark_value>documents; printing</bookmark_value>
<bookmark_value>text documents; printing</bookmark_value>
@@ -56,111 +53,108 @@
<bookmark_value>printing; copies</bookmark_value>
<bookmark_value>copies; printing</bookmark_value>
<bookmark_value>spoolfiles with Xprinter</bookmark_value>
-</bookmark><comment>MW deleted "selections;"</comment>
+</bookmark>
<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>
-<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>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:OK" id="bm_id0818200912034231" localize="false"/>
+
+<bookmark xml-lang="en-US" branch="hid/HID_PRINTDLG" id="bm_id081820090410118" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154621" role="heading" level="1" l10n="U" oldref="1">Print</paragraph>
+<paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" 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>
+
+
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#drucken"/>
+ </section>
+<paragraph xml-lang="en-US" id="par_id0818200912284853" role="paragraph" l10n="NEW">The Print dialog consists of three main parts: A preview with navigation buttons, several tab pages with control elements specific to the current document type, and the Print, Cancel, and Help buttons. </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200901193992" role="paragraph" l10n="NEW">If you just want to know how to print your document, click any of the following links.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531416" role="paragraph" l10n="NEW"><emph>Printing text documents:</emph></paragraph>
+ <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+ <embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
+ <embed href="text/swriter/guide/print_small.xhp#print_small"/>
+ <embed href="text/swriter/guide/printing_order.xhp#printing_order"/>
+ <embed href="text/swriter/guide/printer_tray.xhp#printer_tray"/>
+<paragraph xml-lang="en-US" id="par_id0818200912531487" role="paragraph" l10n="NEW"><emph>Printing spreadsheets:</emph></paragraph>
+ <embed href="text/scalc/guide/printranges.xhp#printranges"/>
+ <embed href="text/scalc/guide/print_details.xhp#print_details"/>
+ <embed href="text/scalc/guide/print_exact.xhp#print_exact"/>
+ <embed href="text/scalc/guide/print_landscape.xhp#print_landscape"/>
+ <embed href="text/scalc/guide/print_title_row.xhp#print_title_row"/>
+<paragraph xml-lang="en-US" id="par_id0818200912531410" role="paragraph" l10n="NEW"><emph>Printing presentations:</emph></paragraph>
+ <embed href="text/simpress/guide/printing.xhp#printing"/>
+ <embed href="text/simpress/guide/print_tofit.xhp#print_tofit"/>
+<paragraph xml-lang="en-US" id="par_id0818200912531449" role="paragraph" l10n="NEW"><emph>General printing:</emph></paragraph>
+ <embed href="text/shared/guide/print_faster.xhp#print_faster"/>
+ <embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
+ <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
+<paragraph xml-lang="en-US" id="par_id0818200912284952" role="note" l10n="NEW">The settings that you define in the Print dialog are valid only for the current print job that you start by clicking the Print button. <comment>is this true for Printer Settings, too?</comment>If you want to change some options permanently, open Tools - Options - %PRODUCTNAME (application name) - Print.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156080" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_idN1099E" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>.
+</caseinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_idN109CD" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item>printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>.
+</caseinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200901194137" role="note" l10n="NEW">Press Shift+F1 or choose <item type="menuitem">Help - What's This?</item> and point to any control element in the Print dialog to see an extended help text.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912284914" role="heading" level="2" l10n="NEW">Preview</paragraph>
+<paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph" l10n="NEW">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</paragraph><comment>insert controls with hidden help here</comment>
+<paragraph xml-lang="en-US" id="hd_id0818200912285056" role="heading" level="2" l10n="NEW">General</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285064" role="paragraph" l10n="NEW">On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the printer settings dialog.</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>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="7">Status</paragraph>
-<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="8">Describes the current status of the selected printer.</paragraph>
-<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="9">Type</paragraph>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="10">Displays the type of printer that you selected. </paragraph>
-<paragraph role="heading" id="hd_id3153682" xml-lang="en-US" level="3" l10n="U" oldref="11">Location</paragraph>
-<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>
-<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><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/.HelpId:vcl:PrintDialog:JobPage:PrinterList" id="bm_id3147144" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid=".">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Properties" id="bm_id3150693" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Opens the printer properties dialog. The printer properties vary according to the printer that you select.</ahelp></paragraph>
<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>
+<paragraph xml-lang="en-US" id="par_id0909200810043691" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_id0909200810043626" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_id0909200810043615" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_id0909200810043658" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_id0909200810043717" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_id0909200810043777" role="paragraph" 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>
-<paragraph role="paragraph" id="par_id1228064" xml-lang="en-US" l10n="NEW">Choose the spreadsheet contents to be printed.</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>
-<paragraph role="paragraph" id="par_id864284" xml-lang="en-US" l10n="NEW">For Impress, you can select the content to be printed.</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>
+<paragraph xml-lang="en-US" id="par_id0909200810043750" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></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>
-<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/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:0" id="bm_id3149957" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Prints the entire document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:1" id="bm_id3148924" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">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>
-<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>
-<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>
-<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>
-<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>
-<paragraph role="paragraph" id="par_idN1099E" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_idN109CD" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item> printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3157320" xml-lang="en-US" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example:
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PageRange:Edit" id="bm_id0818200903284799" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid=".">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:2" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Copies" id="bm_id3154347" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="U" oldref="34"><ahelp hid="." visibility="hidden">Enter the number of copies that you want to print.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Collate" id="bm_id3148663" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150865" role="paragraph" l10n="U" oldref="36"><ahelp hid="." visibility="hidden">Preserves the page order of the original document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285074" role="heading" level="2" l10n="NEW">%PRODUCTNAME Writer / Calc / Impress / Draw / Math</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285019" role="paragraph" l10n="NEW">The tab page with the same name as the current application can be used to define the contents, color, size, and pages to be printed. You define settings that are specific to the current document type.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285112" role="heading" level="2" l10n="NEW">Page Layout</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285150" role="paragraph" l10n="NEW">The Page Layout tab page can be used to save some sheets of paper by printing several pages onto each sheet of paper. You define the arrangement and size of output pages on the physical paper.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904164735" role="paragraph" l10n="NEW">Change the arrangement of pages to be printed on every sheet of paper. The preview shows how every final sheet of paper will look.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904102987" role="paragraph" l10n="NEW">For some document types, you can choose to print a brochure.</paragraph>
+ <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox" id="bm_id0818200903241442" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0818200904102910" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For brochure printing, you can select a left-to-right order of pages or a right-to-left order.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285138" role="heading" level="2" l10n="NEW">Options</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285146" role="paragraph" l10n="NEW">On the Options tab page you can set some additional options for the current print job. Here you can specify to print to a file instead of printing on a printer.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="CHG" oldref="18"><ahelp hid="." visibility="hidden">Prints to a file instead of to a printer. When this option is enabled, the Print button is renamed to Print to file...</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0819200910481678" role="heading" level="2" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">Unix hints
+</caseinline></switchinline><comment>are these still needed?</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example:
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154330" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or
+<paragraph xml-lang="en-US" id="par_id3154330" role="paragraph" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash)
+<paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash)
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options.
+<paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options.
</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01140000.xhp b/helpcontent2/source/text/shared/01/01140000.xhp
index 77d8dc9307..3062aa8c5c 100644
--- a/helpcontent2/source/text/shared/01/01140000.xhp
+++ b/helpcontent2/source/text/shared/01/01140000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01140000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_SETUPPRINTER" id="bm_id1751760" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:PrinterSetup" id="bm_id3150620" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:MODALDIALOG:DLG_SVT_PRNDLG_PRNSETUPDLG" id="bm_id3147000" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG" id="bm_id3147000" localize="false"/>
<paragraph role="heading" id="hd_id3147294" xml-lang="en-US" level="1" l10n="U" oldref="1">Printer Setup</paragraph>
<paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="U" oldref="2"><variable id="druckereinstellungtext"><ahelp hid="SVTOOLS:MODALDIALOG:DLG_SVT_PRNDLG_PRNSETUPDLG">Select the default printer for the current document.</ahelp>
</variable></paragraph>
@@ -65,7 +62,7 @@
<paragraph role="paragraph" id="par_id3145211" xml-lang="en-US" l10n="U" oldref="5"><switchinline select="sys"><caseinline select="WIN">Lists the information that applies to the selected printer.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="19">If the list is empty, you need to install a default printer for your operating system. Refer to the online help for your operating system for instructions on how to install and setup a default printer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:LISTBOX:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES" id="bm_id3147574" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES" id="bm_id3147574" localize="false"/>
<paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="6">Name</paragraph>
<paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS:LISTBOX:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES">Lists the installed printers on your operating system. To change the default printer, select a printer name from the list.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="WIN">Status
@@ -84,7 +81,7 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="sys"><caseinline select="WIN">Displays additional information for the printer.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:PUSHBUTTON:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES" id="bm_id3159413" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES" id="bm_id3159413" localize="false"/>
<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="16">Properties</paragraph>
<paragraph role="paragraph" id="par_id3149045" xml-lang="en-US" l10n="U" oldref="17"><switchinline select="sys"><caseinline select="WIN"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES">Changes the printer settings of your operating system for the current document.</ahelp>
</caseinline></switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01160000.xhp b/helpcontent2/source/text/shared/01/01160000.xhp
index 9ac1ba2e61..516386985a 100644
--- a/helpcontent2/source/text/shared/01/01160000.xhp
+++ b/helpcontent2/source/text/shared/01/01160000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01160000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01160200.xhp b/helpcontent2/source/text/shared/01/01160200.xhp
index a6cb2f44b9..b6a1ac024f 100644
--- a/helpcontent2/source/text/shared/01/01160200.xhp
+++ b/helpcontent2/source/text/shared/01/01160200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01160200.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,8 +42,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_MAIL_SENDDOC" id="bm_id1274021" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SendMail" id="bm_id3155619" localize="false"/>
<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/01160200.xhp">Document as E-mail</link></paragraph>
-<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used. If the document is new and unsaved, the format specified in Tools - Options - Load/Save - General is used.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used.</ahelp></variable> If the document is new and unsaved, the format specified in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General is used.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dokument"/>
diff --git a/helpcontent2/source/text/shared/01/01160300.xhp b/helpcontent2/source/text/shared/01/01160300.xhp
index 42a12eaaf2..0f83fe92e6 100755
--- a/helpcontent2/source/text/shared/01/01160300.xhp
+++ b/helpcontent2/source/text/shared/01/01160300.xhp
@@ -4,36 +4,28 @@
<!--
***********************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
*
- * last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * 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.
*
- * The Contents of this file are made available subject to
- * the terms of GNU Lesser General Public License Version 2.1.
+ * 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).
*
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2005 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * 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.
*
************************************************************************
-->
diff --git a/helpcontent2/source/text/shared/01/01170000.xhp b/helpcontent2/source/text/shared/01/01170000.xhp
index 4353978a0f..5d4d0567fa 100644
--- a/helpcontent2/source/text/shared/01/01170000.xhp
+++ b/helpcontent2/source/text/shared/01/01170000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/01180000.xhp b/helpcontent2/source/text/shared/01/01180000.xhp
index a0b4ecd983..072252766a 100644
--- a/helpcontent2/source/text/shared/01/01180000.xhp
+++ b/helpcontent2/source/text/shared/01/01180000.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01180000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,28 +27,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textshared0101180000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Save All</title>
-<filename>/text/shared/01/01180000.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="allesspeichern">
- <bookmark xml-lang="en-US" branch="hid/SID_SAVEDOCS" id="bm_id8186141" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:SaveAll" xml-lang="en-US" id="bm_id3149988"/><paragraph id="hd_id3150347" role="heading" level="1" oldref="4" l10n="U" xml-lang="en-US"><link href="text/shared/01/01180000.xhp" name="Save All">Save All</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3151299" xml-lang="en-US" oldref="1"><ahelp hid=".uno:SaveAll" visibility="visible">Saves all open $[officename] documents.</ahelp> This command is only available if two or more files have been modified.</paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#saveall"/>
-</section>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3148440" l10n="U" oldref="3">If you are saving a new file or a copy of a read-only file, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog appears.</paragraph>
- </body>
-</helpdocument>
+ <topic id="textshared0101180000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Save All</title>
+ <filename>/text/shared/01/01180000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="allesspeichern">
+<bookmark xml-lang="en-US" branch="hid/SID_SAVEDOCS" id="bm_id8186141" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SaveAll" id="bm_id3149988" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150347" role="heading" level="1" l10n="U" oldref="4"><link href="text/shared/01/01180000.xhp" name="Save All">Save All</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151299" role="paragraph" l10n="CHG" oldref="1"><ahelp hid=".uno:SaveAll">Saves all modified $[officename] documents.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#saveall"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3148440" role="paragraph" l10n="U" oldref="3">If you are saving a new file or a copy of a read-only file, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog appears.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/01190000.xhp b/helpcontent2/source/text/shared/01/01190000.xhp
index 9fa195bfb6..2759dbe1f0 100644
--- a/helpcontent2/source/text/shared/01/01190000.xhp
+++ b/helpcontent2/source/text/shared/01/01190000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01190000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,29 +55,29 @@
<paragraph role="warning" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="22">If you save a copy of a file that contains version information (by choosing <emph>File - Save As)</emph>, the version information is not saved with the file.</paragraph>
<paragraph role="heading" id="hd_id3149750" xml-lang="en-US" level="2" l10n="U" oldref="4">New versions</paragraph>
<paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="5">Set the options for saving a new version of the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_SAVE" id="bm_id3151110" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_SAVE" id="bm_id3151110" localize="false"/>
<paragraph role="heading" id="hd_id3147243" xml-lang="en-US" level="3" l10n="U" oldref="6">Save New Version</paragraph>
<paragraph role="paragraph" id="par_id3149149" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_SAVE">Saves the current state of the document as a new version. If you want, you can also enter comments in the <emph>Insert Version Comment </emph>dialog before you save the new version.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS" id="bm_id3154898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MultiLineEdit:DLG_COMMENTS:ME_VERSIONS" id="bm_id3154898" localize="false"/>
<paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="4" l10n="U" oldref="8">Insert Version Comment</paragraph>
<paragraph role="paragraph" id="par_id3150466" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS">Enter a comment here when you are saving a new version. If you clicked <emph>Show </emph>to open this dialog, you cannot edit the comment.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE" id="bm_id3145316" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE" id="bm_id3145316" localize="false"/>
<paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="3" l10n="U" oldref="10">Always save version when closing</paragraph>
<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE">If you have made changes to your document, $[officename] automatically saves a new version when you close the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MODALDIALOG:DLG_VERSIONS" id="bm_id3148642" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ModalDialog:DLG_VERSIONS" id="bm_id3148642" localize="false"/>
<paragraph role="heading" id="hd_id3159167" xml-lang="en-US" level="2" l10n="U" oldref="12">Existing versions</paragraph>
<paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SFX2:MODALDIALOG:DLG_VERSIONS">Lists the existing versions of the current document, the date and the time they were created, the author and the associated comments.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_OPEN" id="bm_id3158431" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_OPEN" id="bm_id3158431" localize="false"/>
<paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="14">Open</paragraph>
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_OPEN">Opens the selected version in a read-only window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_VIEW" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_VIEW" id="bm_id3148943" localize="false"/>
<paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2" l10n="U" oldref="16">Show</paragraph>
<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_VIEW">Displays the entire comment for the selected version.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_DELETE" id="bm_id3149655" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_DELETE" id="bm_id3149655" localize="false"/>
<paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="2" l10n="U" oldref="18">Delete</paragraph>
<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_DELETE">Deletes the selected version.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:DLG_VERSIONS:PB_COMPARE" id="bm_id3154389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_VERSIONS:PB_COMPARE" id="bm_id3154389" localize="false"/>
<paragraph role="heading" id="hd_id3148739" xml-lang="en-US" level="2" l10n="U" oldref="21">Compare</paragraph>
<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SFX2:PUSHBUTTON:DLG_VERSIONS:PB_COMPARE">Compare the changes that were made in each version.</ahelp>If you want, you can <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/01990000.xhp b/helpcontent2/source/text/shared/01/01990000.xhp
index 8e70e34d1a..5ed05c67de 100755
--- a/helpcontent2/source/text/shared/01/01990000.xhp
+++ b/helpcontent2/source/text/shared/01/01990000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01990000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02010000.xhp b/helpcontent2/source/text/shared/01/02010000.xhp
index 5375df1012..16d202a2ff 100644
--- a/helpcontent2/source/text/shared/01/02010000.xhp
+++ b/helpcontent2/source/text/shared/01/02010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02010000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,13 +53,13 @@
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#do"/>
</section>
-<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose Tools - Options - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
+<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
<paragraph role="note" id="par_id3163803" xml-lang="en-US" l10n="U" oldref="8">Some commands (for example, editing Styles) cannot be undone.</paragraph>
<paragraph role="tip" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="11">You can cancel the Undo command by choosing Edit - Redo.</paragraph>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="7">About the Undo command in database tables</paragraph>
<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="3">When you are working with database tables, you can only undo the last command.</paragraph>
<paragraph role="warning" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="4">If you change the content of a record in a database table that has not been saved, and then use the<emph> Undo</emph> command, the record is erased.</paragraph>
<paragraph role="heading" id="hd_id3149415" xml-lang="en-US" level="2" l10n="U" oldref="9">About the Undo command in presentations</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo </emph>list is cleared when you apply a new layout to a slide.</paragraph>
+<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo</emph> list is cleared when you apply a new layout to a slide.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02020000.xhp b/helpcontent2/source/text/shared/01/02020000.xhp
index d22517e110..1f1316bc75 100644
--- a/helpcontent2/source/text/shared/01/02020000.xhp
+++ b/helpcontent2/source/text/shared/01/02020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02020000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,10 +35,6 @@
<title id="tit" xml-lang="en-US">Redo</title>
<filename>/text/shared/01/02020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T11:24:18">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="wiederholen">
@@ -52,7 +45,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Redo" id="bm_id3154840" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_IMAPDLG_REDO" id="bm_id3155069" localize="false"/>
<paragraph role="heading" id="hd_id3149991" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02020000.xhp" name="Redo">Redo</link></paragraph>
-<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo </emph>command. To select the <emph>Undo </emph>step that you want to reverse, click the arrow next to the <emph>Redo </emph>icon on the Standard bar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo</emph> command. To select the <emph>Undo</emph> step that you want to reverse, click the arrow next to the <emph>Redo</emph> icon on the Standard bar.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#redo"/>
diff --git a/helpcontent2/source/text/shared/01/02030000.xhp b/helpcontent2/source/text/shared/01/02030000.xhp
index dd10dbee84..d98062dc21 100644
--- a/helpcontent2/source/text/shared/01/02030000.xhp
+++ b/helpcontent2/source/text/shared/01/02030000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02030000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02040000.xhp b/helpcontent2/source/text/shared/01/02040000.xhp
index cceb5b43c9..491613ca43 100644
--- a/helpcontent2/source/text/shared/01/02040000.xhp
+++ b/helpcontent2/source/text/shared/01/02040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02040000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02050000.xhp b/helpcontent2/source/text/shared/01/02050000.xhp
index 287092bc85..219a8ce434 100644
--- a/helpcontent2/source/text/shared/01/02050000.xhp
+++ b/helpcontent2/source/text/shared/01/02050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02050000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02060000.xhp b/helpcontent2/source/text/shared/01/02060000.xhp
index 47aec3b646..16ffaec7cc 100644
--- a/helpcontent2/source/text/shared/01/02060000.xhp
+++ b/helpcontent2/source/text/shared/01/02060000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02060000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_PASTE" id="bm_id1292341" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Paste" id="bm_id3149119" localize="false"/>
<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02060000.xhp" name="Paste">Paste</link></paragraph>
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Paste">Inserts the contents of the clipboard at the location of the cursor, and replaces any selected text or objects. Click the arrow next to the icon to select the format.</ahelp><comment>UFI: text used for icon and menu</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Paste">Inserts the contents of the clipboard at the location of the cursor, and replaces any selected text or objects.</ahelp><comment>UFI: text used for icon and menu</comment></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#insert"/>
diff --git a/helpcontent2/source/text/shared/01/02070000.xhp b/helpcontent2/source/text/shared/01/02070000.xhp
index a26bcab3bd..9f3eefb33e 100644
--- a/helpcontent2/source/text/shared/01/02070000.xhp
+++ b/helpcontent2/source/text/shared/01/02070000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02070000.xhp,v $
- * $Revision: 1.11.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,12 +38,12 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_PASTE_OBJECT" id="bm_id3145138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_PASTE2" id="bm_id1247062" localize="false"/>
+<!-- removed HID SO3:MODALDIALOG:MD_PASTE_OBJECT -->
+<!-- removed HID SID_PASTE2 -->
<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"/>
+<!-- removed HID FN_PASTESPECIAL -->
<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"/>
+<!-- removed HID FID_PASTE_CONTENTS -->
<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>
@@ -81,8 +78,8 @@
<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"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_MD_PASTE_OBJECT_LB_INSERT_LIST" id="bm_id080420080314218" localize="false"/>
+<!-- removed HID SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST -->
+<bookmark xml-lang="en-US" branch="hid/cui: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.
@@ -97,42 +94,42 @@
</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"/>
+<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>
+<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, comments, 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"/>
+<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"/>
+<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"/>
+<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"/>
+<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">Comments
</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.
+<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 comments that are attached to cells. If you want to add the comments 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"/>
+<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"/>
+<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.
@@ -141,27 +138,27 @@
</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"/>
+<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"/>
+<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.
+<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 comments, adds the comments 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"/>
+<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"/>
+<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"/>
+<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.
@@ -170,7 +167,7 @@
</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"/>
+<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>
@@ -180,12 +177,12 @@
<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"/>
+<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"/>
+<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>
@@ -196,17 +193,17 @@
</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"/>
+<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"/>
+<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"/>
+<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.
diff --git a/helpcontent2/source/text/shared/01/02090000.xhp b/helpcontent2/source/text/shared/01/02090000.xhp
index 17b5d0f670..dfd0d8e309 100644
--- a/helpcontent2/source/text/shared/01/02090000.xhp
+++ b/helpcontent2/source/text/shared/01/02090000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02090000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index 5f612cf3dd..6bdf31007c 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 02100000.xhp,v $
- * $Revision: 1.15.4.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,61 +29,75 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<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">le<comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
+ <topic id="textshared0102100000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">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>
<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>
+<paragraph xml-lang="en-US" id="hd_id3154044" role="heading" 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>
+ <paragraph xml-lang="en-US" id="par_id3149893" role="paragraph" 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"/>
-</section>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000402.xhp#suchen"/>
+ </section>
+
+<comment>Find Toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:FindText" id="bm_id001" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00001" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Type the text to search in the current document. Press Enter to search the text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:DownSearch" id="bm_id002" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00002" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to search the next occurrence in downward direction.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:UpSearch" id="bm_id003" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00003" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to search the next occurrence in upward direction.</ahelp></paragraph>
+
<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>
-<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: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>
-<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>
-<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
+<paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="2" l10n="U" oldref="3">Search For</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155805" role="paragraph" 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>
+<!-- removed HID SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS -->
+<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" 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 xml-lang="en-US" id="hd_id3152551" role="heading" level="2" l10n="U" oldref="5">Replace With</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156426" role="paragraph" 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>
+<!-- removed HID SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS -->
+<paragraph xml-lang="en-US" id="par_id3150506" role="paragraph" 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 xml-lang="en-US" id="hd_id3166410" role="heading" level="2" l10n="U" oldref="8">Options</paragraph>
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" 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>
+ <paragraph xml-lang="en-US" id="par_id3149579" role="paragraph" 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>
-<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">
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS" id="bm_id7027802" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="2" l10n="U"
+ oldref="14">Backwards</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" 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>
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_REGEXP -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP" id="bm_id5147862" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144439" role="heading" level="2" 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">
+ <paragraph xml-lang="en-US" id="par_id3155342" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_id3727225" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
<switch select="appl">
<case select="DRAW">
</case>
@@ -95,147 +106,178 @@ 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 xml-lang="en-US" id="hd_id3154924" role="heading" level="2" 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>
+<paragraph xml-lang="en-US" id="par_id3154760" role="paragraph" 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>
-<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>
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_SELECTIONS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS" id="bm_id7007354" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="2" l10n="U"
+ oldref="47">Current selection only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150866" role="paragraph" 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>
+<!-- removed HID svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8876918" role="paragraph" 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>
<case select="IMPRESS">
</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>
-<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>
-<embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
+<!-- removed HID svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="2" l10n="CHG"
+ oldref="49">Search for Styles / Including Styles</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155103" role="paragraph" 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 xml-lang="en-US" id="par_idN109CC" role="note" 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 xml-lang="en-US" id="par_idN109DF" role="note" 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>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES" id="bm_id0302200901445934" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0302200901464169" role="heading" level="3" l10n="NEW">Comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200901464150" role="paragraph" l10n="NEW"><ahelp hid=".">In Writer, you can select to include the comment texts in your searches.</ahelp></paragraph>
+ <embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
</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"/>
-<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)
+</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"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149167" role="heading" level="2" 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>
+ <paragraph xml-lang="en-US" id="par_id3145744" role="paragraph" 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"/>
-<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)
+<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/cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153178" role="heading" level="2" 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>
+ <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" 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"/>
-<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>
+<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/cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149765" role="paragraph" 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>
-<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>
-<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>
-<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>
-<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>
+ <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="U" oldref="212"><link href="text/shared/optionen/01150200.xhp" name="Searching in Japanese">Searching in Japanese</link></paragraph>
+<switch select="appl">
+<case select="DRAW">
+</case>
+<case select="IMPRESS">
+</case>
+<default>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154299" role="heading" level="2" l10n="U" oldref="66">Find All</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" 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>
+</default>
+</switch>
+ <bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163821" role="heading" level="2" l10n="U"
+ oldref="68">Find</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph" 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 xml-lang="en-US" id="hd_id3153742" role="heading" level="2" l10n="U"
+ oldref="70">Replace All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145660" role="paragraph" 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 xml-lang="en-US" id="hd_id3149065" role="heading" level="2" l10n="U"
+ oldref="72">Replace</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151170" role="paragraph" 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 xml-lang="en-US" id="hd_id3147348" role="heading" 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>
<switch select="appl">
<case select="WRITER"><embed href="text/shared/01/02100200.xhp#attributetext"/>
</case>
</switch>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3155854" role="heading" 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>
+<paragraph xml-lang="en-US" id="par_id8641315" role="paragraph" 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 xml-lang="en-US" id="hd_id3154188" role="heading" 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.
+ <paragraph xml-lang="en-US" id="par_id3159155" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="par_id1334269" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="par_id3150337" role="note" 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"/><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
+<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 xml-lang="en-US" id="par_id3150113" role="paragraph" 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 xml-lang="en-US" id="hd_id3154944" role="heading" level="2" 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
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_FORMULAS -->
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146925" role="heading" level="2" 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
+ <paragraph xml-lang="en-US" id="par_id6719870" role="paragraph" 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>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES -->
+<paragraph xml-lang="en-US" id="hd_id3149400" role="heading" level="2" 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.
+ <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" 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
+ <paragraph xml-lang="en-US" id="par_id6064943" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES -->
+<paragraph xml-lang="en-US" id="hd_id3145650" role="heading" level="2" l10n="U"
+ oldref="146"><switchinline select="appl"><caseinline select="CALC">Comments
</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.
+ <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the comments that are attached to the cells.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id9799798" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the notes that are attached to the cells.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153004" xml-lang="en-US" level="3" l10n="U" oldref="148"><switchinline select="appl"><caseinline select="CALC">Search direction
+ <paragraph xml-lang="en-US" id="par_id9799798" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the comments that are attached to the cells.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153004" role="heading" level="2" l10n="U"
+ oldref="148"><switchinline select="appl"><caseinline select="CALC">Search direction
</caseinline></switchinline></paragraph>
-<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.
+ <paragraph xml-lang="en-US" id="par_id3156332" role="paragraph" 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
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_ROWS -->
+<bookmark xml-lang="en-US" branch="hid/svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS" id="bm_id4603106" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155064" role="heading" level="2" 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
+ <paragraph xml-lang="en-US" id="par_id743430" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from left to right across the rows.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_COLUMNS -->
+<bookmark xml-lang="en-US" branch="hid/svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156277" role="heading" level="2" 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.
+ <paragraph xml-lang="en-US" id="par_id3145207" role="paragraph" l10n="CHG" oldref="153"><switchinline select="appl"><caseinline select="CALC">Searches from top to bottom through the columns.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3470564" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from top to bottom through the columns.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="194"><switchinline select="appl"><caseinline select="CALC">Extras
+ <paragraph xml-lang="en-US" id="par_id3470564" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from top to bottom through the columns.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153764" role="heading" level="2" l10n="U"
+ oldref="194"><switchinline select="appl"><caseinline select="CALC">Extras
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152960"><bookmark_value>searching; all sheets</bookmark_value>
-<bookmark_value>finding; in all sheets</bookmark_value>
-<bookmark_value>sheets; searching all</bookmark_value>
+ <bookmark_value>finding; in all sheets</bookmark_value>
+ <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
+<!-- removed HID SVX:CHECKBOX:RID_SVXDLG_SEARCH:CB_ALLTABLES -->
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS" id="bm_id4897915" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152960" role="heading" level="2" 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.
+ <paragraph xml-lang="en-US" id="par_id3145619" role="paragraph" 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 xml-lang="en-US" id="par_id4089175" role="paragraph" 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 xml-lang="en-US" id="par_id3151101" role="tip" 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"/>
-<embed href="text/swriter/guide/finding.xhp#finding"/>
-</section>
-</body>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+ <embed href="text/shared/01/02100001.xhp#02100001"/>
+ <embed href="text/swriter/guide/finding.xhp#finding"/>
+ </section>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 6e83808296..71dadfdd8b 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02100001.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,320 +29,330 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0102100001xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">List of Regular Expressions</title>
-<filename>/text/shared/01/02100001.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0102100001xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">List of Regular Expressions</title>
+ <filename>/text/shared/01/02100001.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3146765"><bookmark_value>regular expressions; list of</bookmark_value>
-<bookmark_value>lists;regular expressions</bookmark_value>
-<bookmark_value>concatenation, see ampersand symbol</bookmark_value>
-<bookmark_value>ampersand symbol, see also operators</bookmark_value>
-</bookmark><comment>mw added two cross-references</comment><paragraph role="heading" id="hd_id3146765" xml-lang="en-US" level="1" l10n="U" oldref="203"><variable id="02100001"><link href="text/shared/01/02100001.xhp">List of Regular Expressions</link>
+ <bookmark_value>lists;regular expressions</bookmark_value>
+ <bookmark_value>replacing;tab stops (regular expressions)</bookmark_value>
+ <bookmark_value>tab stops;regular expressions</bookmark_value>
+ <bookmark_value>concatenation, see ampersand symbol</bookmark_value>
+ <bookmark_value>ampersand symbol, see also operators</bookmark_value>
+</bookmark><comment>mw added "replacing;" and "tab stops;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3146765" role="heading" level="1" l10n="U"
+ oldref="203"><variable id="02100001"><link href="text/shared/01/02100001.xhp">List of Regular Expressions</link>
</variable></paragraph>
-<table id="tbl_id3149517">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149741" xml-lang="en-US" l10n="U" oldref="17">Character</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="18">Result/Use</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6600543" xml-lang="en-US" l10n="NEW">Any character</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9824518.00000001" xml-lang="en-US" l10n="CHG">Represents the given character unless otherwise specified.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152427" xml-lang="en-US" l10n="U" oldref="19">.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149031" xml-lang="en-US" l10n="CHG" oldref="20">Represents any single character except for a line break or paragraph break. For example, the search term "sh.rt" returns both "shirt" and "short".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154682" xml-lang="en-US" l10n="CHG" oldref="21">^</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155351" xml-lang="en-US" l10n="CHG" oldref="22">Only finds the search term if the term is at the beginning of a paragraph. Special objects such as empty fields or character-anchored frames, at the beginning of a paragraph are ignored. Example: "^Peter".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159194" xml-lang="en-US" l10n="CHG" oldref="23">$</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152542" xml-lang="en-US" l10n="CHG" oldref="24">Only finds the search term if the term appears at the end of a paragraph. Special objects such as empty fields or character-anchored frames at the end of a paragraph are ignored. Example: "Peter$".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156414" xml-lang="en-US" l10n="U" oldref="25">*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155555" xml-lang="en-US" l10n="CHG" oldref="26">Finds zero or more of the characters in front of the "*". For example, "Ab*c" finds "Ac", "Abc", "Abbc", "Abbbc", and so on.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="27">+</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="28">Finds one or more of the characters in front of the "+". For example, "AX.+4" finds "AXx4", but not "AX4".</paragraph>
-<paragraph role="tablecontent" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="207">The longest possible string that matches this search pattern in a paragraph is always found. If the paragraph contains the string "AX 4 AX4", the entire passage is highlighted.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="199">?</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153684" xml-lang="en-US" l10n="CHG" oldref="200">Finds zero or one of the characters in front of the "?". For example, "Texts?" finds "Text" and "Texts" and "x(ab|c)?y" finds "xy", "xaby", or "xcy".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="158">\</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="159">Search interprets the special character that follows the "\" as a normal character and not as a regular expression (except for the combinations \n, \t, \&gt;, and \&lt;). For example, "tree\." finds "tree.", not "treed" or "trees".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152945" xml-lang="en-US" l10n="U" oldref="166">\n</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153700" xml-lang="en-US" l10n="CHG" oldref="167">Represents a line break that was inserted with the Shift+Enter key combination. To change a line break into a paragraph break, enter <emph>\n</emph> in the <emph>Search for</emph> and <emph>Replace with</emph> boxes, and then perform a search and replace.</paragraph>
-<paragraph role="tablecontent" id="par_id9262672" xml-lang="en-US" l10n="NEW">\n in the <emph>Search for</emph> text box stands for a line break that was inserted with the Shift+Enter key combination.</paragraph>
-<paragraph role="tablecontent" id="par_id2366100" xml-lang="en-US" l10n="NEW">\n in the <emph>Replace with</emph> text box stands for a paragraph break that can be entered with the Enter or Return key.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153258" xml-lang="en-US" l10n="U" oldref="29">\t</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3157809" xml-lang="en-US" l10n="CHG" oldref="30">Represents a tab. You can also use this expression in the <emph>Replace with</emph> box.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3146775" xml-lang="en-US" l10n="U" oldref="33">\&gt;</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148644" xml-lang="en-US" l10n="U" oldref="34">Only finds the search term if it appears at the end of a word. For example, "book\&gt;" finds "checkbook", but not "bookmark".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150670" xml-lang="en-US" l10n="U" oldref="35">\&lt;</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153666" xml-lang="en-US" l10n="CHG" oldref="36">Only finds the search term if it appears at the beginning of a word. For example, "\&lt;book" finds "bookmark", but not "checkbook".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149576" xml-lang="en-US" l10n="U" oldref="37">^$</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151245" xml-lang="en-US" l10n="CHG" oldref="38">Finds an empty paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="41">^.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159413" xml-lang="en-US" l10n="CHG" oldref="42">Finds the first character of a paragraph.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147282" xml-lang="en-US" l10n="CHG" oldref="43">&amp; or $0</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153961" xml-lang="en-US" l10n="CHG" oldref="44">Adds the string that was found by the search criteria in the <emph>Search for</emph> box to the term in the <emph>Replace with</emph> box when you make a replacement.</paragraph>
-<paragraph role="tablecontent" id="par_id3149650" xml-lang="en-US" l10n="CHG" oldref="201">For example, if you enter "window" in the <emph>Search for</emph> box and "&amp;frame" in the <emph>Replace with</emph> box, the word "window" is replaced with "windowframe".</paragraph>
-<paragraph role="tablecontent" id="par_id3150543" xml-lang="en-US" l10n="CHG" oldref="206">You can also enter an "&amp;" in the <emph>Replace with</emph> box to modify the <emph>Attributes</emph> or the <emph>Format</emph> of the string found by the search criteria.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="172">[abc123]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154630" xml-lang="en-US" l10n="CHG" oldref="173">Represents one of the characters that are between the brackets.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156293" xml-lang="en-US" l10n="U" oldref="174">[a-e]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149167" xml-lang="en-US" l10n="CHG" oldref="175">Represents any of the characters that are between a and e.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="176">[a-eh-x]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148676" xml-lang="en-US" l10n="CHG" oldref="177">Represents any of the characters that are between a-e and h-x.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145318" xml-lang="en-US" l10n="U" oldref="178">[^a-s]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153351" xml-lang="en-US" l10n="CHG" oldref="179">Represents any character that is not between a and s.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156543" xml-lang="en-US" l10n="U" oldref="180">\xXXXX</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="181">Represents a special character based on its four-digit hexadecimal code (XXXX).</paragraph>
-<paragraph role="tablecontent" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="208">The code for the special character depends on the font used. You can view the codes by choosing <emph>Insert - Special Character</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="186">|</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154985" xml-lang="en-US" l10n="CHG" oldref="187">Finds the terms that occur before or after the "|". For example, "this|that" finds "this" and "that".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147376" xml-lang="en-US" l10n="U" oldref="209">{2}</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds "tree".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151289" xml-lang="en-US" l10n="U" oldref="211">{1,2}</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="212">Defines the number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds both "tree" and "treated".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4870754" xml-lang="en-US" l10n="NEW">{1,}</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id843836" xml-lang="en-US" l10n="NEW">Defines the minimum number of times that the character in front of the opening bracket can occur. For example, "tre{2,}" finds "tree", "treee", and "treeeee".</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="213">( )</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2701803" xml-lang="en-US" l10n="NEW">In the <emph>Search for</emph> box:</paragraph>
-<paragraph role="tablecontent" id="par_id3153573" xml-lang="en-US" l10n="CHG" oldref="214">Defines the characters inside the parentheses as a reference. You can then refer to the first reference in the current expression with "\1", to the second reference with "\2", and so on.</paragraph>
-<paragraph role="tablecontent" id="par_id3156061" xml-lang="en-US" l10n="U" oldref="215">For example, if your text contains the number 13487889 and you search using the regular expression (8)7\1\1, "8788" is found.</paragraph>
-<paragraph role="tablecontent" id="par_id2367931" xml-lang="en-US" l10n="NEW">You can also use () to group terms, for example, "a(bc)?d" finds "ad" or "abcd".</paragraph>
-<paragraph role="tablecontent" id="par_id9200109" xml-lang="en-US" l10n="NEW">In the <emph>Replace with</emph> box:<comment>i83322</comment></paragraph>
-<paragraph role="tablecontent" id="par_id5766472" xml-lang="en-US" l10n="NEW">Use $ (dollar) instead of \ (backslash) to replace references. Use $0 to replace the whole found string.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154790" xml-lang="en-US" l10n="U" oldref="226">[:alpha:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147397" xml-lang="en-US" l10n="CHG" oldref="227">Represents an alphabetic character. Use [:alpha:]+ to find one of them.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="216">[:digit:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150010" xml-lang="en-US" l10n="CHG" oldref="217">Represents a decimal digit. Use [:digit:]+ to find one of them.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153743" xml-lang="en-US" l10n="U" oldref="224">[:alnum:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153281" xml-lang="en-US" l10n="CHG" oldref="225">Represents an alphanumeric character ([:alpha:] and [:digit:]).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="218">[:space:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150961" xml-lang="en-US" l10n="CHG" oldref="219">Represents a space character (but not other whitespace characters).<comment>UFI: see #i41706#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="220">[:print:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150872" xml-lang="en-US" l10n="CHG" oldref="221">Represents a printable character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="222">[:cntrl:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152576" xml-lang="en-US" l10n="CHG" oldref="223">Represents a nonprinting character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="228">[:lower:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145730" xml-lang="en-US" l10n="CHG" oldref="229">Represents a lowercase character if <emph>Match case</emph> is selected in <emph>Options</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="230">[:upper:]</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150092" xml-lang="en-US" l10n="CHG" oldref="231">Represents an uppercase character if <emph>Match case</emph> is selected in <emph>Options.</emph>
-</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="heading" id="hd_id5311441" xml-lang="en-US" level="2" l10n="NEW">Examples</paragraph>
-<paragraph role="paragraph" id="par_id9568773" xml-lang="en-US" l10n="NEW">You can combine the search terms to form complex searches.</paragraph>
-<paragraph role="head3" id="hd_id71413" xml-lang="en-US" l10n="NEW">To find three-digit numbers alone in a paragraph</paragraph>
-<paragraph role="code" id="par_id2924283" xml-lang="en-US" l10n="NEW">^[:digit:]{3}$</paragraph>
-<paragraph role="paragraph" id="par_id5781731" xml-lang="en-US" l10n="NEW">^ means the match has to be at the start of a paragraph, </paragraph>
-<paragraph role="paragraph" id="par_id6942045" xml-lang="en-US" l10n="NEW">[:digit:] matches any decimal digit, </paragraph>
-<paragraph role="paragraph" id="par_id4721823" xml-lang="en-US" l10n="NEW">{3} means there must be exactly 3 copies of "digit", </paragraph>
-<paragraph role="paragraph" id="par_id5806756" xml-lang="en-US" l10n="NEW">$ means the match must end a paragraph. </paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/02100000.xhp#02100000"/>
-<paragraph role="paragraph" id="par_id1751457" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
-<paragraph role="paragraph" id="par_id5483870" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <table id="tbl_id3149517">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149741" role="tablehead" l10n="U" oldref="17">Character</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155577" role="tablehead" l10n="U" oldref="18">Result/Use</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id6600543" role="tablecontent" l10n="NEW">Any character</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id9824518.00000001" role="tablecontent" l10n="CHG">Represents the given character unless otherwise specified.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152427" role="tablecontent" l10n="U" oldref="19">.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149031" role="tablecontent" l10n="CHG" oldref="20">Represents any single character except for a line break or paragraph break. For example, the search term "sh.rt" returns both "shirt" and "short".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154682" role="tablecontent" l10n="CHG" oldref="21">^</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155351" role="tablecontent" l10n="CHG" oldref="22">Only finds the search term if the term is at the beginning of a paragraph. Special objects such as empty fields or character-anchored frames, at the beginning of a paragraph are ignored. Example: "^Peter".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159194" role="tablecontent" l10n="CHG" oldref="23">$</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152542" role="tablecontent" l10n="CHG" oldref="24">Only finds the search term if the term appears at the end of a paragraph. Special objects such as empty fields or character-anchored frames at the end of a paragraph are ignored. Example: "Peter$".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156414" role="tablecontent" l10n="U" oldref="25">*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155555" role="tablecontent" l10n="CHG" oldref="26">Finds zero or more of the characters in front of the "*". For example, "Ab*c" finds "Ac", "Abc", "Abbc", "Abbbc", and so on.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147399" role="tablecontent" l10n="U" oldref="27">+</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157958" role="tablecontent" l10n="CHG" oldref="28">Finds one or more of the characters in front of the "+". For example, "AX.+4" finds "AXx4", but not "AX4".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145313" role="tablecontent" l10n="U" oldref="207">The longest possible string that matches this search pattern in a paragraph is always found. If the paragraph contains the string "AX 4 AX4", the entire passage is highlighted.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143267" role="tablecontent" l10n="U" oldref="199">?</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153684" role="tablecontent" l10n="CHG" oldref="200">Finds zero or one of the characters in front of the "?". For example, "Texts?" finds "Text" and "Texts" and "x(ab|c)?y" finds "xy", "xaby", or "xcy".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166410" role="tablecontent" l10n="U" oldref="158">\</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="tablecontent" l10n="CHG" oldref="159">Search interprets the special character that follows the "\" as a normal character and not as a regular expression (except for the combinations \n, \t, \&gt;, and \&lt;). For example, "tree\." finds "tree.", not "treed" or "trees".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152945" role="tablecontent" l10n="U" oldref="166">\n</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153700" role="tablecontent" l10n="CHG" oldref="167">Represents a line break that was inserted with the Shift+Enter key combination. To change a line break into a paragraph break, enter <emph>\n</emph> in the <emph>Search for</emph> and <emph>Replace with</emph> boxes, and then perform a search and replace.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9262672" role="tablecontent" l10n="NEW">\n in the <emph>Search for</emph> text box stands for a line break that was inserted with the Shift+Enter key combination.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2366100" role="tablecontent" l10n="NEW">\n in the <emph>Replace with</emph> text box stands for a paragraph break that can be entered with the Enter or Return key.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153258" role="tablecontent" l10n="U" oldref="29">\t</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157809" role="tablecontent" l10n="CHG" oldref="30">Represents a tab. You can also use this expression in the <emph>Replace with</emph> box.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146775" role="tablecontent" l10n="U" oldref="33">\&gt;</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148644" role="tablecontent" l10n="U" oldref="34">Only finds the search term if it appears at the end of a word. For example, "book\&gt;" finds "checkbook", but not "bookmark".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150670" role="tablecontent" l10n="U" oldref="35">\&lt;</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153666" role="tablecontent" l10n="CHG" oldref="36">Only finds the search term if it appears at the beginning of a word. For example, "\&lt;book" finds "bookmark", but not "checkbook".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149576" role="tablecontent" l10n="U" oldref="37">^$</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151245" role="tablecontent" l10n="CHG" oldref="38">Finds an empty paragraph.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148550" role="tablecontent" l10n="U" oldref="41">^.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159413" role="tablecontent" l10n="CHG" oldref="42">Finds the first character of a paragraph.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147282" role="tablecontent" l10n="CHG" oldref="43">&amp; or $0</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153961" role="tablecontent" l10n="CHG" oldref="44">Adds the string that was found by the search criteria in the <emph>Search for</emph> box to the term in the <emph>Replace with</emph> box when you make a replacement.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149650" role="tablecontent" l10n="CHG" oldref="201">For example, if you enter "window" in the <emph>Search for</emph> box and "&amp;frame" in the <emph>Replace with</emph> box, the word "window" is replaced with "windowframe".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150543" role="tablecontent" l10n="CHG" oldref="206">You can also enter an "&amp;" in the <emph>Replace with</emph> box to modify the <emph>Attributes</emph> or the <emph>Format</emph> of the string found by the search criteria.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145419" role="tablecontent" l10n="U" oldref="172">[abc123]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154630" role="tablecontent" l10n="CHG" oldref="173">Represents one of the characters that are between the brackets.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156293" role="tablecontent" l10n="U" oldref="174">[a-e]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e, including both start and end characters</paragraph>
+ <paragraph xml-lang="en-US" id="par_id100520090232005" role="tablecontent" l10n="NEW">The characters are ordered by their code numbers.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155994" role="tablecontent" l10n="U" oldref="176">[a-eh-x]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148676" role="tablecontent" l10n="CHG" oldref="177">Represents any of the characters that are between a-e and h-x.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145318" role="tablecontent" l10n="U" oldref="178">[^a-s]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents everything that is not between a and s.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156543" role="tablecontent" l10n="U" oldref="180">\xXXXX</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153768" role="tablecontent" l10n="U" oldref="181">Represents a special character based on its four-digit hexadecimal code (XXXX).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159252" role="tablecontent" l10n="U" oldref="208">The code for the special character depends on the font used. You can view the codes by choosing <emph>Insert - Special Character</emph>.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153951" role="tablecontent" l10n="U" oldref="186">|</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before the "|" and also finds the terms that occur after the "|". For example, "this|that" finds "this" and "that".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147376" role="tablecontent" l10n="U" oldref="209">{2}</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds and selects "tree".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151289" role="tablecontent" l10n="U" oldref="211">{1,2}</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="CHG" oldref="212">Defines the minimum and maximum number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds and selects "tre" and "tree".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id4870754" role="tablecontent" l10n="NEW">{1,}</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id843836" role="tablecontent" l10n="NEW">Defines the minimum number of times that the character in front of the opening bracket can occur. For example, "tre{2,}" finds "tree", "treee", and "treeeee".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148616" role="tablecontent" l10n="U" oldref="213">( )</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2701803" role="tablecontent" l10n="NEW">In the <emph>Search for</emph> box:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153573" role="tablecontent" l10n="CHG" oldref="214">Defines the characters inside the parentheses as a reference. You can then refer to the first reference in the current expression with "\1", to the second reference with "\2", and so on.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156061" role="tablecontent" l10n="U" oldref="215">For example, if your text contains the number 13487889 and you search using the regular expression (8)7\1\1, "8788" is found.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2367931" role="tablecontent" l10n="NEW">You can also use () to group terms, for example, "a(bc)?d" finds "ad" or "abcd".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9200109" role="tablecontent" l10n="NEW">In the <emph>Replace with</emph> box:<comment>i83322</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id5766472" role="tablecontent" l10n="NEW">Use $ (dollar) instead of \ (backslash) to replace references. Use $0 to replace the whole found string.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154790" role="tablecontent" l10n="U" oldref="226">[:alpha:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147397" role="tablecontent" l10n="CHG" oldref="227">Represents an alphabetic character. Use [:alpha:]+ to find one of them.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152885" role="tablecontent" l10n="U" oldref="216">[:digit:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150010" role="tablecontent" l10n="CHG" oldref="217">Represents a decimal digit. Use [:digit:]+ to find one of them.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153743" role="tablecontent" l10n="U" oldref="224">[:alnum:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153281" role="tablecontent" l10n="CHG" oldref="225">Represents an alphanumeric character ([:alpha:] and [:digit:]).</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153726" role="tablecontent" l10n="U" oldref="218">[:space:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150961" role="tablecontent" l10n="CHG" oldref="219">Represents a space character (but not other whitespace characters).<comment>UFI: see #i41706#</comment></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150486" role="tablecontent" l10n="U" oldref="220">[:print:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150872" role="tablecontent" l10n="CHG" oldref="221">Represents a printable character.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155854" role="tablecontent" l10n="U" oldref="222">[:cntrl:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="tablecontent" l10n="CHG" oldref="223">Represents a nonprinting character.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149958" role="tablecontent" l10n="U" oldref="228">[:lower:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145730" role="tablecontent" l10n="CHG" oldref="229">Represents a lowercase character if <emph>Match case</emph> is selected in <emph>Options</emph>.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148455" role="tablecontent" l10n="U" oldref="230">[:upper:]</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150092" role="tablecontent" l10n="CHG" oldref="231">Represents an uppercase character if <emph>Match case</emph> is selected in <emph>Options.</emph>
+ </paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="hd_id5311441" role="heading" level="2" l10n="NEW">Examples</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9568773" role="paragraph" l10n="NEW">You can combine the search terms to form complex searches.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id71413" role="heading" level="3" l10n="NEW">To find three-digit numbers alone in a paragraph</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2924283" role="code" l10n="NEW">^[:digit:]{3}$</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5781731" role="paragraph" l10n="NEW">^ means the match has to be at the start of a paragraph, </paragraph>
+ <paragraph xml-lang="en-US" id="par_id6942045" role="paragraph" l10n="NEW">[:digit:] matches any decimal digit, </paragraph>
+ <paragraph xml-lang="en-US" id="par_id4721823" role="paragraph" l10n="NEW">{3} means there must be exactly 3 copies of "digit", </paragraph>
+ <paragraph xml-lang="en-US" id="par_id5806756" role="paragraph" l10n="NEW">$ means the match must end a paragraph. </paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/01/02100000.xhp#02100000"/>
+<switch select="appl">
+<case select="WRITER"><embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+ <embed href="text/swriter/guide/finding.xhp#finding"/>
+</case>
+</switch>
+<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02100100.xhp b/helpcontent2/source/text/shared/01/02100100.xhp
index 1ebcb43de9..ddcebbf243 100755
--- a/helpcontent2/source/text/shared/01/02100100.xhp
+++ b/helpcontent2/source/text/shared/01/02100100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02100100.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3156045"><bookmark_value>similarity search</bookmark_value>
<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/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>
@@ -55,21 +52,21 @@
<section id="howtoget">
<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"/>
+<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>
<paragraph role="paragraph" id="par_id3145629" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_SIMILARITY">Set the options for the similarity search.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="2" l10n="U" oldref="56">Settings</paragraph>
<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="U" oldref="57">Define the criteria for determining if a word is similar to the search term.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_OTHER" id="bm_id3155338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER" id="bm_id3155338" localize="false"/>
<paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="3" l10n="U" oldref="58">Exchange characters</paragraph>
<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_OTHER">Enter the number of characters in the search term that can be exchanged.</ahelp> For example, if you specify 2 exchanged characters, "black" and "crack" are considered similar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_LONGER" id="bm_id3150443" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER" id="bm_id3150443" localize="false"/>
<paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="60">Add characters</paragraph>
<paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_LONGER">Enter the maximum number of characters by which a word can exceed the number of characters in the search term.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_SHORTER" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER" id="bm_id3158430" localize="false"/>
<paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="3" l10n="U" oldref="62">Remove characters</paragraph>
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_SHORTER">Enter the number of characters by which a word can be shorter than the search term.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHSIMILARITY_CB_RELAX" id="bm_id3159400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX" id="bm_id3159400" localize="false"/>
<paragraph role="heading" id="hd_id3153700" xml-lang="en-US" level="3" l10n="U" oldref="64">Combine</paragraph>
<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCHSIMILARITY_CB_RELAX">Searches for a term that matches any combination of the similarity search settings.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/02100200.xhp b/helpcontent2/source/text/shared/01/02100200.xhp
index 16d3a5a27c..6748512c56 100755
--- a/helpcontent2/source/text/shared/01/02100200.xhp
+++ b/helpcontent2/source/text/shared/01/02100200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02100200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="1" l10n="U" oldref="1">Attributes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="1" l10n="U" oldref="1">Attributes</paragraph>
<paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="2"><variable id="attributetext"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE">Choose the text attributes that you want to search for. For example, if you search for the <emph>Font</emph> attribute, all instances of text that do not use the default font are found. All text that has a directly coded font attribute, and all text where a style switches the font attribute, are found. </ahelp>
</variable></paragraph>
<embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
diff --git a/helpcontent2/source/text/shared/01/02100300.xhp b/helpcontent2/source/text/shared/01/02100300.xhp
index 46cc12b471..e75e1f7a5e 100644
--- a/helpcontent2/source/text/shared/01/02100300.xhp
+++ b/helpcontent2/source/text/shared/01/02100300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02100300.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,8 +63,8 @@
<embed href="text/shared/01/05020700.xhp#asitypo"/>
</case>
</switch><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_FORMAT" id="bm_id3151100" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_FORMAT" id="bm_id6877651" localize="false"/><paragraph role="paragraph" id="par_id3062837" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT" id="bm_id3151100" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT" id="bm_id6877651" localize="false"/><paragraph role="paragraph" id="par_id3062837" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="C"><link href="text/shared/01/02100200.xhp" name="Attributes">Attributes</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/01/02110000.xhp b/helpcontent2/source/text/shared/01/02110000.xhp
index ad1acee33f..7adc74931f 100644
--- a/helpcontent2/source/text/shared/01/02110000.xhp
+++ b/helpcontent2/source/text/shared/01/02110000.xhp
@@ -4,36 +4,28 @@
<!--
***********************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
*
- * last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * 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.
*
- * The Contents of this file are made available subject to
- * the terms of GNU Lesser General Public License Version 2.1.
+ * 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).
*
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2005 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * 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.
*
************************************************************************
-->
@@ -58,7 +50,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3145313" role="paragraph" l10n="E">
-<image id="img_id3155535" src="sw/imglst/sc20244.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155535">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155535" src="sw/imglst/sc20244.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155535">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -75,7 +67,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="E">
-<image id="img_id3145416" src="sw/imglst/sc20245.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145416">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3145416" src="sw/imglst/sc20245.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145416">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -93,7 +85,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3159166" role="paragraph" l10n="E">
-<image id="img_id3153146" src="sw/imglst/sc20246.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153146">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3153146" src="sw/imglst/sc20246.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153146">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -132,7 +124,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153951" role="paragraph" l10n="E">
-<image id="img_id3146984" src="sw/imglst/sc20247.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3146984">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3146984" src="sw/imglst/sc20247.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3146984">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -165,7 +157,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3151351" role="paragraph" l10n="E">
-<image id="img_id3152885" src="sw/imglst/sc20248.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152885">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3152885" src="sw/imglst/sc20248.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152885">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -182,7 +174,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154790" role="paragraph" l10n="E">
-<image id="img_id3166413" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3166413">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3166413" src="sw/imglst/sc20171.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3166413">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -199,7 +191,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3156178" role="paragraph" l10n="E">
-<image id="img_id3155083" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155083">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3155083" src="sw/imglst/sc20174.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155083">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/01/02180000.xhp b/helpcontent2/source/text/shared/01/02180000.xhp
index ad65cf89cb..f85b77a879 100644
--- a/helpcontent2/source/text/shared/01/02180000.xhp
+++ b/helpcontent2/source/text/shared/01/02180000.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 02180000.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,53 +31,64 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0102180000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Edit Links</title>
-<filename>/text/shared/01/02180000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_UPDATE_BASELINKS" id="bm_id3151299" localize="false"/>
+ <topic id="textshared0102180000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Edit Links</title>
+ <filename>/text/shared/01/02180000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<!-- removed HID SO3:MODALDIALOG:MD_UPDATE_BASELINKS -->
<bookmark xml-lang="en-US" branch="hid/FN_EDIT_LINK_DLG" id="bm_id199976" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:LinkDialog" id="bm_id3150008" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_LINKS" id="bm_id5458456" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EditLinks" id="bm_id3154926" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_MANAGE_LINKS" id="bm_id4013242" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ManageLinks" id="bm_id3147588" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>opening; files with links</bookmark_value>
-<bookmark_value>links; updating specific links</bookmark_value>
-<bookmark_value>updating; links, on opening</bookmark_value>
-<bookmark_value>links; opening files with</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150279" xml-lang="en-US" level="1" l10n="U" oldref="1">Edit Links</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="2"><variable id="verknuepfungentext"><ahelp hid=".uno:ManageLinks">Lets you edit the properties of each link in the current document, including the path to the source file. This command is not available if the current document does not contain links to other files.</ahelp>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>opening;documents with links</bookmark_value>
+ <bookmark_value>links; updating specific links</bookmark_value>
+ <bookmark_value>updating; links, on opening</bookmark_value>
+ <bookmark_value>links; opening files with</bookmark_value>
+</bookmark><comment>MW changed "opening;..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3150279" role="heading" level="1" l10n="U" oldref="1">Edit Links</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="2"><variable id="verknuepfungentext"><ahelp hid=".uno:ManageLinks">Lets you edit the properties of each link in the current document, including the path to the source file. This command is not available if the current document does not contain links to other files.</ahelp>
</variable></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#link"/>
-</section>
-<paragraph role="note" id="par_id3156156" xml-lang="en-US" l10n="U" oldref="27">When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete.</paragraph>
-<paragraph role="note" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="28">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LINKDLG_TABLB" id="bm_id4889980" localize="false"/><paragraph role="paragraph" id="par_idN10646" xml-lang="en-US" l10n="NEW"><ahelp hid="34869">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155503" xml-lang="en-US" level="2" l10n="U" oldref="3">Source file</paragraph>
-<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="4">Lists the path to the source file.</paragraph>
-<paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="2" l10n="U" oldref="11">Element</paragraph>
-<paragraph role="paragraph" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="12">Lists the application (if known) that last saved the source file.</paragraph>
-<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="7">Type</paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="8">Lists the file type, such as graphic, of the source file.</paragraph>
-<paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="9">Status</paragraph>
-<paragraph role="paragraph" id="par_id3149046" xml-lang="en-US" l10n="U" oldref="10">Lists additional information about the source file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_AUTOMATIC" id="bm_id3148550" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="2" l10n="U" oldref="15">Automatic</paragraph>
-<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_AUTOMATIC">Automatically updates the contents of the link when you open the file. Any changes made in the source file are then displayed in the file containing the link. Linked graphic files can only be updated manually.</ahelp> This option is not available for a linked graphic file.</paragraph>
-<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="CHG" oldref="30">The <emph>Automatic</emph> option is only available for DDE links. You can insert a DDE link by copying the contents from one file and pasting by choosing <emph>Edit - Paste Special</emph>, and then selecting the <emph>Link</emph> box. As DDE is a text based linking system, only the displayed decimals are copied into the target sheet.<comment>removed Calc switch: this feature can be used wherever a cell area can be pasted: everywhere</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_MANUAL" id="bm_id3154365" localize="false"/><paragraph role="heading" id="hd_id3154938" xml-lang="en-US" level="2" l10n="U" oldref="17">Manual</paragraph>
-<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_MANUAL">Only updates the link when you click the <emph>Update </emph>button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_UPDATE_NOW" id="bm_id3155994" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U" oldref="19">Update</paragraph>
-<paragraph role="paragraph" id="par_id3157320" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_UPDATE_NOW">Updates the selected link so that the most recently saved version of the linked file is displayed in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE" id="bm_id3148920" localize="false"/><paragraph role="heading" id="hd_id3151381" xml-lang="en-US" level="2" l10n="U" oldref="21">Modify</paragraph>
-<paragraph role="paragraph" id="par_id3154125" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE">Change the source file for the selected link.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_BREAK_LINK" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="2" l10n="U" oldref="23">Break Link</paragraph>
-<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_BREAK_LINK">Breaks the link between the source file and the current document. The most recently updated contents of the source file are kept in the current document.</ahelp></paragraph>
-</body>
-</helpdocument>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000402.xhp#link"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156156" role="note" l10n="U" oldref="27">When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143270" role="note" l10n="U" oldref="28">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LINKDLG_TABLB" id="bm_id4889980" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10646" role="paragraph" l10n="NEW"><ahelp hid="34869">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155503" role="heading" level="2" l10n="U" oldref="3">Source file</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156152" role="paragraph" l10n="U" oldref="4">Lists the path to the source file.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155449" role="heading" level="2" l10n="U"
+ oldref="11">Element</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153348" role="paragraph" l10n="U" oldref="12">Lists the application (if known) that last saved the source file.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153061" role="heading" level="2" l10n="U" oldref="7">Type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="8">Lists the file type, such as graphic, of the source file.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156343" role="heading" level="2" l10n="U" oldref="9">Status</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149046" role="paragraph" l10n="U" oldref="10">Lists additional information about the source file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC" id="bm_id0720200903092114" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="2" l10n="U"
+ oldref="15">Automatic</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147304" role="paragraph" l10n="U" oldref="16"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_AUTOMATIC">Automatically updates the contents of the link when you open the file. Any changes made in the source file are then displayed in the file containing the link. Linked graphic files can only be updated manually.</ahelp> This option is not available for a linked graphic file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="CHG" oldref="30">The <emph>Automatic</emph> option is only available for DDE links. You can insert a DDE link by copying the contents from one file and pasting by choosing <emph>Edit - Paste Special</emph>, and then selecting the <emph>Link</emph> box. As DDE is a text based linking system, only the displayed decimals are copied into the target sheet.<comment>removed Calc switch: this feature can be used wherever a cell area can be pasted: everywhere</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL" id="bm_id0720200903100119" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154938" role="heading" level="2" l10n="U"
+ oldref="17">Manual</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151210" role="paragraph" l10n="U" oldref="18"><ahelp hid="SO3:RADIOBUTTON:MD_UPDATE_BASELINKS:RB_MANUAL">Only updates the link when you click the <emph>Update </emph>button.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW" id="bm_id0720200903105198" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156280" role="heading" level="2" l10n="U"
+ oldref="19">Update</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="20"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_UPDATE_NOW">Updates the selected link so that the most recently saved version of the linked file is displayed in the current document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE" id="bm_id0720200903111714" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151381" role="heading" level="2" l10n="U"
+ oldref="21">Modify</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph" l10n="U" oldref="22"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE">Change the source file for the selected link.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK" id="bm_id0720200903114311" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147084" role="heading" level="2" l10n="U"
+ oldref="23">Break Link</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="U" oldref="24"><ahelp hid="SO3:PUSHBUTTON:MD_UPDATE_BASELINKS:PB_BREAK_LINK">Breaks the link between the source file and the current document. The most recently updated contents of the source file are kept in the current document.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02180100.xhp b/helpcontent2/source/text/shared/01/02180100.xhp
index 90d2d9154e..c5604a98e9 100755
--- a/helpcontent2/source/text/shared/01/02180100.xhp
+++ b/helpcontent2/source/text/shared/01/02180100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02180100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,13 +52,13 @@
</section>
<paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="2" l10n="U" oldref="3">Edit Links</paragraph>
<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="4">Lets you set the properties for the selected link.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP" id="bm_id3155552" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP -->
<paragraph role="heading" id="hd_id3148548" xml-lang="en-US" level="3" l10n="U" oldref="5">Application:</paragraph>
<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP">Lists the application that last saved the source file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC" id="bm_id3149389" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC -->
<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="7">File:</paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC">Lists the path to the source file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM" id="bm_id3155536" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM -->
<paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="3" l10n="U" oldref="9">Section</paragraph>
<paragraph role="paragraph" id="par_id3146958" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM">Lists the section that the link refers to in the source file. If you want, you can enter a new section here.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/02190000.xhp b/helpcontent2/source/text/shared/01/02190000.xhp
index fb06182f78..571fa002d2 100644
--- a/helpcontent2/source/text/shared/01/02190000.xhp
+++ b/helpcontent2/source/text/shared/01/02190000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02190000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02200000.xhp b/helpcontent2/source/text/shared/01/02200000.xhp
index 7eb1095213..191acad6af 100644
--- a/helpcontent2/source/text/shared/01/02200000.xhp
+++ b/helpcontent2/source/text/shared/01/02200000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02200000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02200100.xhp b/helpcontent2/source/text/shared/01/02200100.xhp
index 6a5ea25e34..50ee2e808b 100755
--- a/helpcontent2/source/text/shared/01/02200100.xhp
+++ b/helpcontent2/source/text/shared/01/02200100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02200100.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02200200.xhp b/helpcontent2/source/text/shared/01/02200200.xhp
index 47965a9cae..f29c803241 100755
--- a/helpcontent2/source/text/shared/01/02200200.xhp
+++ b/helpcontent2/source/text/shared/01/02200200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02200200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02210101.xhp b/helpcontent2/source/text/shared/01/02210101.xhp
index 7f16dc243f..f62b17fa76 100755
--- a/helpcontent2/source/text/shared/01/02210101.xhp
+++ b/helpcontent2/source/text/shared/01/02210101.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02210101.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,58 +40,58 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SFX2:TABPAGE:TP_FRAMEPROPERTIES" id="bm_id3153383" localize="false"/><paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02210101.xhp" name="Floating Frame Properties">Floating Frame Properties</link></paragraph>
+<!-- removed HID SFX2:TABPAGE:TP_FRAMEPROPERTIES --><paragraph role="heading" id="hd_id3150347" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02210101.xhp" name="Floating Frame Properties">Floating Frame Properties</link></paragraph>
<paragraph role="paragraph" id="par_id3149031" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SFX2:TABPAGE:TP_FRAMEPROPERTIES">Changes the properties of the selected floating frame. Floating frames work best when they contain an html document, and when they are inserted in another html document.</ahelp></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#rahmeneigenschaften"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_FRAMEPROPERTIES:ED_FRAMENAME" id="bm_id3149549" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_FRAMENAME" id="bm_id8971221.00000001" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
+<!-- removed HID SFX2:EDIT:TP_FRAMEPROPERTIES:ED_FRAMENAME -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME" id="bm_id8971221.00000001" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_FRAMEPROPERTIES:ED_FRAMENAME">Enter a name for the floating frame. The name cannot contain spaces, special characters, or begin with an underscore ( _ ).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_FRAMEPROPERTIES:ED_URL" id="bm_id3149798" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_URL" id="bm_id3061311" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="2" l10n="U" oldref="5">Contents</paragraph>
+<!-- removed HID SFX2:EDIT:TP_FRAMEPROPERTIES:ED_URL -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL" id="bm_id3061311" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="2" l10n="U" oldref="5">Contents</paragraph>
<paragraph role="paragraph" id="par_id3156414" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SFX2:EDIT:TP_FRAMEPROPERTIES:ED_URL">Enter the path and the name of the file that you want to display in the floating frame. You can also click the <emph>...</emph> button and locate the file that you want to display.</ahelp> For example, you can enter:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="7">http://www.sun.com</paragraph>
+<paragraph role="listitem" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="7">http://www.example.com</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="8">file:///c|/Readme.txt </paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_FRAMEPROPERTIES:BT_FILEOPEN" id="bm_id3153346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN" id="bm_id1442609" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="2" l10n="U" oldref="10">...</paragraph>
+<!-- removed HID SFX2:PUSHBUTTON:TP_FRAMEPROPERTIES:BT_FILEOPEN -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN" id="bm_id1442609" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="2" l10n="U" oldref="10">...</paragraph>
<paragraph role="paragraph" id="par_id3155355" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:PUSHBUTTON:TP_FRAMEPROPERTIES:BT_FILEOPEN">Locate the file that you want to display in the selected floating frame, and then click <emph>Open</emph>.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="12">Scrollbar</paragraph>
<paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="13">Add or remove a scrollbar from the selected floating frame.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGON" id="bm_id3152781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGON" id="bm_id6702475" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="14">On</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGON -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON" id="bm_id6702475" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="14">On</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGON">Displays the scrollbar for the floating frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGOFF" id="bm_id3147574" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGOFF" id="bm_id7322916" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="16">Off</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGOFF -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF" id="bm_id7322916" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="16">Off</paragraph>
<paragraph role="paragraph" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGOFF">Hides the scrollbar for the floating frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGAUTO" id="bm_id3153254" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGAUTO" id="bm_id6200140" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="18">Automatic</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGAUTO -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO" id="bm_id6200140" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="18">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_SCROLLINGAUTO">Mark this option if the currently active floating frame can have a scrollbar when needed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="20">Border</paragraph>
<paragraph role="paragraph" id="par_id3150943" xml-lang="en-US" l10n="U" oldref="21">Displays or hides the border of the floating frame.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_ON" id="bm_id3155504" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_ON" id="bm_id6881923" localize="false"/><paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="3" l10n="U" oldref="22">On</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_ON -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON" id="bm_id6881923" localize="false"/><paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="3" l10n="U" oldref="22">On</paragraph>
<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_ON">Displays the border of the floating frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_OFF" id="bm_id3159157" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_OFF" id="bm_id8719138" localize="false"/><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="3" l10n="U" oldref="24">Off</paragraph>
+<!-- removed HID SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_OFF -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF" id="bm_id8719138" localize="false"/><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="3" l10n="U" oldref="24">Off</paragraph>
<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SFX2:RADIOBUTTON:TP_FRAMEPROPERTIES:RB_FRMBORDER_OFF">Hides the border of the floating frame.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="28">Spacing to contents</paragraph>
<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Define the amount of space that is left between the border of the floating frame and the contents of the floating frame provided that both documents inside and outside the floating frame are HTML documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINWIDTH" id="bm_id3148550" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH" id="bm_id1487472" localize="false"/><paragraph role="heading" id="hd_id3152473" xml-lang="en-US" level="3" l10n="U" oldref="30">Width</paragraph>
+<!-- removed HID SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINWIDTH -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH" id="bm_id1487472" localize="false"/><paragraph role="heading" id="hd_id3152473" xml-lang="en-US" level="3" l10n="U" oldref="30">Width</paragraph>
<paragraph role="paragraph" id="par_id3149656" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINWIDTH">Enter the amount of horizontal space that you want to leave between the right and the left edges of the floating frame and the contents of the frame. Both documents inside and outside the floating frame must be HTML documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINHEIGHT" id="bm_id3145069" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT" id="bm_id869777" localize="false"/><paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="32">Height</paragraph>
+<!-- removed HID SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINHEIGHT -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT" id="bm_id869777" localize="false"/><paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="32">Height</paragraph>
<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SFX2:NUMERICFIELD:TP_FRAMEPROPERTIES:NM_MARGINHEIGHT">Enter the amount of vertical space that you want to leave between the top and bottom edges of the floating frame and the contents of the frame. Both documents inside and outside the floating frame must be HTML documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINWIDTHDEFAULT" id="bm_id3148739" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINHEIGHTDEFAULT" id="bm_id3154936" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINHEIGHTDEFAULT" id="bm_id1459089" localize="false"/><paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="34">Default</paragraph>
+<!-- removed HID SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINWIDTHDEFAULT -->
+<!-- removed HID SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINHEIGHTDEFAULT -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT" id="bm_id1459089" localize="false"/><paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="34">Default</paragraph>
<paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SFX2:CHECKBOX:TP_FRAMEPROPERTIES:CB_MARGINHEIGHTDEFAULT">Applies the default spacing.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02220000.xhp b/helpcontent2/source/text/shared/01/02220000.xhp
index 5b6a994072..4bc8de6903 100644
--- a/helpcontent2/source/text/shared/01/02220000.xhp
+++ b/helpcontent2/source/text/shared/01/02220000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02220000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/SID_IMAP" id="bm_id7843932" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ImageMapDialog" id="bm_id3085157" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:FLOATINGWINDOW:RID_SVXDLG_IMAP" id="bm_id3150756" localize="false"/><paragraph role="heading" id="hd_id3150502" xml-lang="en-US" level="1" l10n="U" oldref="1">ImageMap Editor</paragraph>
+<!-- removed HID SVX:FLOATINGWINDOW:RID_SVXDLG_IMAP --><paragraph role="heading" id="hd_id3150502" xml-lang="en-US" level="1" l10n="U" oldref="1">ImageMap Editor</paragraph>
<paragraph role="paragraph" id="par_id3159194" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="imagemaptext"><ahelp hid="SVX:FLOATINGWINDOW:RID_SVXDLG_IMAP">Allows you to attach URLs to specific areas, called hotspots, on a graphic or a group of graphics. An image map is a group of one or more hotspots.</ahelp>
</variable></paragraph>
<section id="howtoget">
@@ -263,9 +260,9 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_IMAP:CBB_URL" id="bm_id3150662" localize="false"/><paragraph role="heading" id="hd_id3144418" xml-lang="en-US" level="2" l10n="U" oldref="29">Address:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL" id="bm_id3150662" localize="false"/><paragraph role="heading" id="hd_id3144418" xml-lang="en-US" level="2" l10n="U" oldref="29">Address:</paragraph>
<paragraph role="paragraph" id="par_id3157969" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:COMBOBOX:RID_SVXDLG_IMAP:CBB_URL">Enter the URL for the file that you want to open when you click the selected hotspot.</ahelp> If you want to jump to an anchor within the document, the address should be of the form "file:///C/document_name#anchor_name".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAP:EDT_TEXT" id="bm_id3154199" localize="false"/><paragraph role="heading" id="hd_id3146132" xml-lang="en-US" level="2" l10n="U" oldref="31">Text:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT" id="bm_id3154199" localize="false"/><paragraph role="heading" id="hd_id3146132" xml-lang="en-US" level="2" l10n="U" oldref="31">Text:</paragraph>
<paragraph role="paragraph" id="par_id3159090" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAP:EDT_TEXT">Enter the text that you want to display when the mouse rests on the hotspot in a browser.</ahelp> If you do not enter any text, the <emph>Address </emph>is displayed.</paragraph>
<paragraph role="heading" id="hd_id3158445" xml-lang="en-US" level="2" l10n="U" oldref="33">Frame:</paragraph>
<paragraph role="paragraph" id="par_id3150208" xml-lang="en-US" l10n="U" oldref="34">Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name from the list.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02220100.xhp b/helpcontent2/source/text/shared/01/02220100.xhp
index 41414cb091..547236c9e9 100755..100644
--- a/helpcontent2/source/text/shared/01/02220100.xhp
+++ b/helpcontent2/source/text/shared/01/02220100.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 02220100.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,33 +31,43 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0102220100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Description</title>
-<filename>/text/shared/01/02220100.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/SVX:MODALDIALOG:RID_SVXDLG_IMAPURL" id="bm_id3145416" localize="false"/><paragraph role="heading" id="hd_id3154810" xml-lang="en-US" level="1" l10n="U" oldref="1">Description</paragraph>
-<paragraph role="paragraph" id="par_id3152910" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:MODALDIALOG:RID_SVXDLG_IMAPURL">Lists the properties for the selected hotspot.</ahelp></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#imapeigbea"/>
-</section>
-<paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="2" l10n="U" oldref="3">Hyperlink</paragraph>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="4">Lists the properties of the URL that is attached to the hotspot.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL" id="bm_id3149955" localize="false"/><paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="3" l10n="U" oldref="5">URL:</paragraph>
-<paragraph role="paragraph" id="par_id3155831" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL">Enter the URL for the file that you want to open when you click the selected hotspot.</ahelp> If you want to jump to a named anchor within the current document, the address should be of the form “file:///C/[current_document_name]#anchor_name”.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION" id="bm_id3154307" localize="false"/><paragraph role="heading" id="hd_id3153827" xml-lang="en-US" level="3" l10n="U" oldref="7">Alternative text:</paragraph>
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION">Enter the text that you want to display when the mouse rests on the hotspot in a browser.</ahelp>If you do not enter any text, the <emph>Address </emph>is displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS" id="bm_id3144510" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="9">Frame:</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS">Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name that is recognized by all browsers from the list.</ahelp>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="3" l10n="U" oldref="11">Name:</paragraph>
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME">Enter a name for the image.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1244989956" id="bm_id3190710" localize="false"/><paragraph role="heading" id="hd_id7557298" xml-lang="en-US" level="3" l10n="NEW">Description</paragraph>
-<paragraph role="paragraph" id="par_id5057222" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a description for the hotspot.</ahelp><comment>see http://specs.openoffice.org/appwide/drawing_layer/imagemapdialog.odt</comment></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="C"><link href="text/shared/01/01100500.xhp" name="Priority Table">Priority Table</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <topic id="textshared0102220100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Description</title>
+ <filename>/text/shared/01/02220100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id1202200909085990"><bookmark_value>hotspots;properties</bookmark_value>
+ <bookmark_value>properties;hotspots</bookmark_value>
+ <bookmark_value>ImageMap;hotspot properties</bookmark_value>
+</bookmark><comment>MW inserted index entries</comment>
+<bookmark xml-lang="en-US" branch="hid/SVX:MODALDIALOG:RID_SVXDLG_IMAPURL" id="bm_id3145416" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154810" role="heading" level="1" l10n="U" oldref="1">Description</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152910" role="paragraph" l10n="U" oldref="2"><ahelp hid="SVX:MODALDIALOG:RID_SVXDLG_IMAPURL">Lists the properties for the selected hotspot.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000402.xhp#imapeigbea"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3150976" role="heading" level="2" l10n="U" oldref="3">Hyperlink</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="4">Lists the properties of the URL that is attached to the hotspot.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL" id="bm_id3149955" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156327" role="heading" level="2" l10n="U" oldref="5">URL:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155831" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URL">Enter the URL for the file that you want to open when you click the selected hotspot.</ahelp> If you want to jump to a named anchor within the current document, the address should be of the form "file:///C/[current_document_name]#anchor_name".</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION" id="bm_id3154307" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153827" role="heading" level="2" l10n="U" oldref="7">Alternative text:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION">Enter the text that you want to display when the mouse rests on the hotspot in a browser.</ahelp>If you do not enter any text, the <emph>Address </emph>is displayed.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS" id="bm_id3144510" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149166" role="heading" level="2" l10n="U" oldref="9">Frame:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:COMBOBOX:RID_SVXDLG_IMAPURL:CBB_TARGETS">Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name that is recognized by all browsers from the list.</ahelp>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME" id="bm_id3149294" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147530" role="heading" level="2" l10n="U"
+ oldref="11">Name:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME">Enter a name for the image.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_MULTILINEEDIT_RID_SVXDLG_IMAPURL_EDT_DESCRIPTION" id="bm_id3190710" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7557298" role="heading" level="2" l10n="NEW">Description</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5057222" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a description for the hotspot.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="C"><link href="text/shared/01/01100500.xhp" name="Priority Table">Priority Table</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02230000.xhp b/helpcontent2/source/text/shared/01/02230000.xhp
index f9d42dac18..506c4a233f 100755
--- a/helpcontent2/source/text/shared/01/02230000.xhp
+++ b/helpcontent2/source/text/shared/01/02230000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230100.xhp b/helpcontent2/source/text/shared/01/02230100.xhp
index 7018963477..51e2f3ae23 100644
--- a/helpcontent2/source/text/shared/01/02230100.xhp
+++ b/helpcontent2/source/text/shared/01/02230100.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 02230100.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -54,11 +51,9 @@
<embed href="text/shared/00/00000402.xhp#aufzeichnen"/>
</section>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl">
-<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href="text/shared/optionen/01040700.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <emph><link href="text/shared/optionen/01040700.xhp" name="Writer - Changes">%PRODUCTNAME Writer - Changes</link></emph> in the Options dialog box.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="appl">
-<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="7">The following changes are tracked when the record changes command is active:</paragraph>
<switch select="appl">
<case select="WRITER"><list type="unordered">
@@ -118,11 +113,6 @@
</case>
</switch>
-<switch select="appl">
-<case select="WRITER">
-<paragraph role="note" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="18">Changes made to formulas or numbers in tables are not recorded.</paragraph>
-
-</case>
-</switch>
+<comment>removed the note about no-tables-comparing in Writer</comment>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02230150.xhp b/helpcontent2/source/text/shared/01/02230150.xhp
index a30d013636..0396bdf89b 100644
--- a/helpcontent2/source/text/shared/01/02230150.xhp
+++ b/helpcontent2/source/text/shared/01/02230150.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230150.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230200.xhp b/helpcontent2/source/text/shared/01/02230200.xhp
index 4af15f460a..933eab75be 100644
--- a/helpcontent2/source/text/shared/01/02230200.xhp
+++ b/helpcontent2/source/text/shared/01/02230200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,26 +54,20 @@
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#anzeigen"/>
</section>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing<switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>.
-</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed.
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT" id="bm_id3152551" localize="false"/>
-<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp>
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Writer - Changes"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed.</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT" id="bm_id3152551" localize="false"/>
+<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp></caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC"><embed href="text/shared/01/02230402.xhp#calc"/>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT" id="bm_id3154810" localize="false"/>
-<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes
-</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT" id="bm_id3154810" localize="false"/>
+<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT">Shows or hides the changes that were accepted.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT" id="bm_id3155829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT" id="bm_id3155829" localize="false"/>
<paragraph role="heading" id="hd_id3149956" xml-lang="en-US" level="2" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="CALC">Show rejected changes
</caseinline></switchinline></paragraph>
<paragraph role="relatedtopics" id="par_id3159166" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT">Shows or hides the changes that were rejected.</ahelp>
diff --git a/helpcontent2/source/text/shared/01/02230300.xhp b/helpcontent2/source/text/shared/01/02230300.xhp
index 6d313daaee..99a41e51a2 100644
--- a/helpcontent2/source/text/shared/01/02230300.xhp
+++ b/helpcontent2/source/text/shared/01/02230300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230400.xhp b/helpcontent2/source/text/shared/01/02230400.xhp
index 369d4e8fcf..2fe124cb04 100644
--- a/helpcontent2/source/text/shared/01/02230400.xhp
+++ b/helpcontent2/source/text/shared/01/02230400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230400.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02230401.xhp b/helpcontent2/source/text/shared/01/02230401.xhp
index deed07c0a1..afdcfc72de 100644
--- a/helpcontent2/source/text/shared/01/02230401.xhp
+++ b/helpcontent2/source/text/shared/01/02230401.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230401.xhp,v $
- * $Revision: 1.5.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -101,7 +98,6 @@
</tablecell>
</tablerow>
</table>
-
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_DG_VIEW" id="bm_id3151384" localize="false"/>
@@ -117,26 +113,35 @@
<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC">Lists the cells with contents that were changed.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_AUTHOR" id="bm_id3149765" localize="false"/>
-<paragraph role="heading" id="hd_id3148452" xml-lang="en-US" level="3" l10n="U" oldref="12">Author</paragraph>
-<paragraph role="paragraph" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_SC_SORT_AUTHOR">Lists the user who made the change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148452" role="heading" level="3" l10n="U"
+ oldref="12">Author</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153178" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_SC_SORT_AUTHOR">Lists the user who made the change.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_DATE" id="bm_id3145171" localize="false"/>
-<paragraph role="heading" id="hd_id3144762" xml-lang="en-US" level="3" l10n="U" oldref="14">Date</paragraph>
-<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="HID_SC_SORT_DATE">Lists the date and time that the change was made.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3144762" role="heading" level="3" l10n="U"
+ oldref="14">Date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156422" role="paragraph" l10n="U" oldref="15"><ahelp hid="HID_SC_SORT_DATE">Lists the date and time that the change was made.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_SORT_COMMENT" id="bm_id3145744" localize="false"/>
-<paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="16">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_SC_SORT_COMMENT">Lists the comments that are attached to the change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157962" role="heading" level="3" l10n="U"
+ oldref="16">Comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150868" role="paragraph" l10n="U" oldref="17"><ahelp hid="HID_SC_SORT_COMMENT">Lists the comments that are attached to the change.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_ACCEPT" id="bm_id3153106" localize="false"/>
-<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="2" l10n="U" oldref="18">Accept</paragraph>
-<paragraph role="paragraph" id="par_id3152935" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPT">Accepts the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REDLINE_ACCEPT_DIRECT" id="bm_id0122200903133817" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154218" role="heading" level="2" l10n="U"
+ oldref="18">Accept</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPT">Accepts the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_REJECT" id="bm_id3157892" localize="false"/>
-<paragraph role="heading" id="hd_id3156543" xml-lang="en-US" level="2" l10n="U" oldref="22">Reject</paragraph>
-<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_REDLINING_VIEW_PB_REJECT">Rejects the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REDLINE_REJECT_DIRECT" id="bm_id0122200903140685" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156543" role="heading" level="2" l10n="U"
+ oldref="22">Reject</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150441" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_REDLINING_VIEW_PB_REJECT">Rejects the selected change and removes the highlighting from the change in the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_ACCEPTALL" id="bm_id3149985" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="2" l10n="U" oldref="20">Accept All</paragraph>
-<paragraph role="paragraph" id="par_id3150012" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPTALL">Accepts all of the changes and removes the highlighting from the document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155429" role="heading" level="2" l10n="U"
+ oldref="20">Accept All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150012" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_REDLINING_VIEW_PB_ACCEPTALL">Accepts all of the changes and removes the highlighting from the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_PB_REJECTALL" id="bm_id3153093" localize="false"/>
-<paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="24">Reject All</paragraph>
-<paragraph role="paragraph" id="par_id3151353" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_REDLINING_VIEW_PB_REJECTALL">Rejects all of the changes and removes the highlighting from the document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153742" role="heading" level="2" l10n="U"
+ oldref="24">Reject All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151353" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_REDLINING_VIEW_PB_REJECTALL">Rejects all of the changes and removes the highlighting from the document.</ahelp></paragraph>
<switch select="appl">
<case select="WRITER">
<paragraph role="note" id="par_id3147442" xml-lang="en-US" l10n="U" oldref="28">To reverse the acceptance or rejection of a change, choose <emph>Undo </emph>on the <emph>Edit </emph>menu.</paragraph>
@@ -147,27 +152,34 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="WRITER">If you made changes by choosing <emph>Format - AutoCorrect - Apply and Edit Changes</emph>, the <emph>Undo </emph>button appears in the dialog.<ahelp hid="HID_REDLINING_VIEW_PB_UNDO"> Reverse the last Accept or Reject command.</ahelp>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="43">There are additional commands in the <emph>context menu</emph> of the list:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="43">There are additional commands in the <emph>context menu</emph> of the list:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_EDIT_COMMENT" id="bm_id3152416" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_CHANGES_COMMENT" id="bm_id3155307" localize="false"/>
-<paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="2" l10n="U" oldref="44">Edit comment</paragraph>
-<paragraph role="paragraph" id="par_id3153210" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_SC_CHANGES_COMMENT">Edit the comment for the selected change.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153281" xml-lang="en-US" level="2" l10n="U" oldref="46">Sort</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="47">Sorts the list according to the column headings.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146975" role="heading" level="2" l10n="U"
+ oldref="44">Edit comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153210" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_SC_CHANGES_COMMENT">Edit the comment for the selected change.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153281" role="heading" level="2" l10n="U"
+ oldref="46">Sort</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149486" role="paragraph" l10n="U" oldref="47">Sorts the list according to the column headings.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_ACTION" id="bm_id3148387" localize="false"/>
-<paragraph role="heading" id="hd_id3155316" xml-lang="en-US" level="3" l10n="U" oldref="48">Action</paragraph>
-<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_SORT_ACTION">Sorts the list according to the type of change.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155316" role="heading" level="3" l10n="U"
+ oldref="48">Action</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151280" role="paragraph" l10n="U" oldref="49"><ahelp hid="HID_SORT_ACTION">Sorts the list according to the type of change.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_AUTHOR" id="bm_id3150094" localize="false"/>
-<paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="50">Author</paragraph>
-<paragraph role="paragraph" id="par_id3149960" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="HID_SORT_AUTHOR">Sorts the list according to the Author.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150116" role="heading" level="3" l10n="U"
+ oldref="50">Author</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149960" role="paragraph" l10n="U" oldref="51"><ahelp hid="HID_SORT_AUTHOR">Sorts the list according to the Author.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_DATE" id="bm_id3150420" localize="false"/>
-<paragraph role="heading" id="hd_id3148775" xml-lang="en-US" level="3" l10n="U" oldref="52">Date</paragraph>
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_SORT_DATE">Sorts the list according to the date and time.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148775" role="heading" level="3" l10n="U"
+ oldref="52">Date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="53"><ahelp hid="HID_SORT_DATE">Sorts the list according to the date and time.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_COMMENT" id="bm_id3156286" localize="false"/>
-<paragraph role="heading" id="hd_id3150594" xml-lang="en-US" level="3" l10n="U" oldref="54">Comment</paragraph>
-<paragraph role="paragraph" id="par_id3145595" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_SORT_COMMENT">Sorts the list according to the comments that are attached to the changes.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150594" role="heading" level="3" l10n="U"
+ oldref="54">Comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145595" role="paragraph" l10n="U" oldref="55"><ahelp hid="HID_SORT_COMMENT">Sorts the list according to the comments that are attached to the changes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SORT_POSITION" id="bm_id3150338" localize="false"/>
-<paragraph role="heading" id="hd_id3153157" xml-lang="en-US" level="3" l10n="U" oldref="56">Document Position</paragraph>
-<paragraph role="paragraph" id="par_id3157976" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_SORT_POSITION">Sorts the list in a descending order according to the position of the changes in the document. This is the default sorting method.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153157" role="heading" level="3" l10n="U"
+ oldref="56">Document Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157976" role="paragraph" l10n="U" oldref="57"><ahelp hid="HID_SORT_POSITION">Sorts the list in a descending order according to the position of the changes in the document. This is the default sorting method.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/02230402.xhp b/helpcontent2/source/text/shared/01/02230402.xhp
index 09c62ee20a..e2b111c652 100644
--- a/helpcontent2/source/text/shared/01/02230402.xhp
+++ b/helpcontent2/source/text/shared/01/02230402.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230402.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -98,15 +95,15 @@
</table>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN" id="bm_id3147230" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SIMPLEREF:RB_ASSIGN" id="bm_id3151044" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">Shrink/Max
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN" id="bm_id3147230" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_SIMPLEREF:RB_ASSIGN" id="bm_id3151044" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">Shrink/Max
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC"><table id="tbl_id3158407">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3149809" xml-lang="en-US" l10n="E">
-<image id="img_id3154153" src="sc/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3154153" xml-lang="en-US">Icon</alt>
+<image id="img_id3154153" src="formula/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3154153" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/02230500.xhp b/helpcontent2/source/text/shared/01/02230500.xhp
index e6483e268c..f9044d2f90 100644
--- a/helpcontent2/source/text/shared/01/02230500.xhp
+++ b/helpcontent2/source/text/shared/01/02230500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02230500.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02240000.xhp b/helpcontent2/source/text/shared/01/02240000.xhp
index 76bb15e50e..6b99bba7be 100644
--- a/helpcontent2/source/text/shared/01/02240000.xhp
+++ b/helpcontent2/source/text/shared/01/02240000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02240000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/02250000.xhp b/helpcontent2/source/text/shared/01/02250000.xhp
index 1785afe06c..ba7fb575a0 100644
--- a/helpcontent2/source/text/shared/01/02250000.xhp
+++ b/helpcontent2/source/text/shared/01/02250000.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02250000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,39 +29,48 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0102250000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Bibliography Database</title>
-<filename>/text/shared/01/02250000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="litdat">
+ <topic id="textshared0102250000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Bibliography Database</title>
+ <filename>/text/shared/01/02250000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="litdat">
<bookmark xml-lang="en-US" branch="hid/SID_COMP_BIBLIOGRAPHY" id="bm_id1785233" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:BibliographyComponent" id="bm_id3150756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_DB_TBX" id="bm_id3155354" localize="false"/><paragraph role="heading" id="hd_id3150999" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02250000.xhp" name="Bibliography Database">Bibliography Database</link></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="2"><variable id="litdattext"><ahelp hid="HID_BIB_DB_TBX">Insert, delete, edit, and organize records in the bibliography database.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_DB_TBX" id="bm_id3155354" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150999" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/02250000.xhp" name="Bibliography Database">Bibliography Database</link></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149119" role="paragraph" l10n="U" oldref="2"><variable id="litdattext"><ahelp hid="HID_BIB_DB_TBX">Insert, delete, edit, and organize records in the bibliography database.</ahelp>
</variable></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#litdat"/>
-</section>
-<paragraph role="note" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="53">If the fields in your database are read-only, ensure that the data source view is closed.</paragraph>
-<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="CHG" oldref="41">The supplied bibliography database contains sample records of books.</paragraph>
-<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="CHG" oldref="4">Use the toolbar to select a table in the bibliography database, to search for records, or to sort the records using filters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/source" id="bm_id3154288" localize="false"/><paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="." visibility="hidden">Lists the available tables in the current database. Click a name in the list to display the records for that table.</ahelp></paragraph><comment>removed icons; converted to hidden help text</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_FIRST" id="bm_id3155831" localize="false"/><paragraph role="paragraph" id="par_id3158432" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="." visibility="hidden">Go to the first record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_PREV" id="bm_id3152909" localize="false"/><paragraph role="paragraph" id="par_id3149192" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Go to the previous record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEXT" id="bm_id3156435" localize="false"/><paragraph role="paragraph" id="par_id3146795" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Go to the next record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_LAST" id="bm_id3150497" localize="false"/><paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Go to the last record in the table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_ABSOLUTE" id="bm_id3154686" localize="false"/><paragraph role="paragraph" id="par_id3157960" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="." visibility="hidden">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEW" id="bm_id3150742" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="2" l10n="U" oldref="5">Inserting a New Record</paragraph>
-<paragraph role="paragraph" id="par_id3149168" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_GRID_TRAVEL_NEW" visibility="hidden">Inserts a new record into the current table.</ahelp>To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_AUTHORITYTYPE_POS" id="bm_id3159151" localize="false"/><paragraph role="paragraph" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="." visibility="hidden">Select the type of record that you want to create. $[officename] inserts a number in the <emph>Type</emph> column of the record that corresponds to the type that you select here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_IDENTIFIER_POS" id="bm_id3154126" localize="false"/><paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="." visibility="hidden">Enter a short name for the record. The short name appears in the <emph>Identifier</emph> column in the list of records.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000402.xhp#litdat"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="note" l10n="U" oldref="53">If the fields in your database are read-only, ensure that the data source view is closed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150506" role="paragraph" l10n="CHG" oldref="41">The supplied bibliography database contains sample records of books.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155356" role="paragraph" l10n="CHG" oldref="4">Use the toolbar to select a table in the bibliography database, to search for records, or to sort the records using filters.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/source" id="bm_id3154288" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3163802" role="paragraph" l10n="U" oldref="21"><ahelp hid="." visibility="hidden">Lists the available tables in the current database. Click a name in the list to display the records for that table.</ahelp></paragraph><comment>removed icons; converted to hidden help text</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_FIRST" id="bm_id3155831" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3158432" role="paragraph" l10n="U" oldref="24"><ahelp hid="." visibility="hidden">Go to the first record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_PREV" id="bm_id3152909" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149192" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Go to the previous record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEXT" id="bm_id3156435" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3146795" role="paragraph" l10n="U" oldref="26"><ahelp hid="." visibility="hidden">Go to the next record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_LAST" id="bm_id3150497" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Go to the last record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_ABSOLUTE" id="bm_id3154686" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3157960" role="paragraph" l10n="U" oldref="31"><ahelp hid="." visibility="hidden">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEW" id="bm_id3150742" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="5">Inserting a New Record</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149168" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_GRID_TRAVEL_NEW" visibility="hidden">Inserts a new record into the current table.</ahelp>To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_AUTHORITYTYPE_POS" id="bm_id3159151" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="7"><ahelp hid="." visibility="hidden">Select the type of record that you want to create. $[officename] inserts a number in the <emph>Type</emph> column of the record that corresponds to the type that you select here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_IDENTIFIER_POS" id="bm_id3154126" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3156423" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="." visibility="hidden">Enter a short name for the record. The short name appears in the <emph>Identifier</emph> column in the list of records.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BIB_TITLE_POS" id="bm_id3150652" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BIB_YEAR_POS" id="bm_id3154218" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BIB_AUTHOR_POS" id="bm_id3150449" localize="false"/>
@@ -89,59 +94,75 @@
<bookmark xml-lang="en-US" branch="hid/HID_BIB_HOWPUBLISHED_POS" id="bm_id3154319" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BIB_SCHOOL_POS" id="bm_id3153943" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BIB_SERIES_POS" id="bm_id3156005" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_URL_POS" id="bm_id3147441" localize="false"/><paragraph role="paragraph" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="." visibility="hidden">Enter additional information for the selected record. If you want, you can also enter the information in the corresponding field in the table.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3163716" xml-lang="en-US" level="2" l10n="U" oldref="9">Finding and Filtering Records</paragraph>
-<paragraph role="paragraph" id="par_id3147478" xml-lang="en-US" l10n="U" oldref="10">You can search for records by matching a keyword to a field entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/query" id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3159181" xml-lang="en-US" level="3" l10n="U" oldref="28">Entering Search key</paragraph>
-<paragraph role="paragraph" id="par_id3159125" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:Bib/query">Type the information that you want to search for, and then press Enter. To change the filter options for the search, long-click the <emph>AutoFilter</emph> icon, and then select a different data field. You can use wildcards such as % or * for any number of characters, and _ or ? for one character in your search. To display all of the records in the table, clear this box, and then press Enter. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/autoFilter" id="bm_id3149263" localize="false"/><paragraph role="heading" id="hd_id3155511" xml-lang="en-US" level="3" l10n="U" oldref="29">AutoFilter</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid=".uno:Bib/autoFilter">Long-click to select the data field that you want to search using the term that you entered in the <emph>Search Key</emph> box. You can only search one data field.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="15">The list of table records is automatically updated to match the new filter settings.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/standardFilter" id="bm_id8315073" localize="false"/><paragraph role="paragraph" id="par_id3145590" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</ahelp></paragraph>
-<embed href="text/shared/02/12090000.xhp#filterdialog"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/removeFilter" id="bm_id8467360" localize="false"/><paragraph role="paragraph" id="par_id3155311" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">To display all of the records in a table, click the <emph>Remove Filter</emph> icon.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_DELETEROWS" id="bm_id3153954" localize="false"/><paragraph role="heading" id="hd_id3147580" xml-lang="en-US" level="2" l10n="U" oldref="17">Deleting a Record</paragraph>
-<paragraph role="paragraph" id="par_id3154471" xml-lang="en-US" l10n="U" oldref="18">To delete a record in the current table, right-click the row header of the record, and then select <emph>Delete</emph>. <ahelp hid="SID_FM_DELETEROWS" visibility="hidden">Deletes the selected record.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="2" l10n="U" oldref="33">Changing the data source</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/sdbsource" id="bm_id3147318" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="38">Data Source</paragraph>
-<paragraph role="paragraph" id="par_id3151118" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid=".uno:Bib/sdbsource">Select the data source for the bibliography database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_ON_OPENDOC" id="bm_id3147485" localize="false"/><paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SID_ON_OPENDOC">Only the data sources that are registered in $[officename] are listed. To add a data source to the list, choose <emph>Tools – Data Sources</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_URL_POS" id="bm_id3147441" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3155994" role="paragraph" l10n="U" oldref="8"><ahelp hid="." visibility="hidden">Enter additional information for the selected record. If you want, you can also enter the information in the corresponding field in the table.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3163716" role="heading" level="2" l10n="U" oldref="9">Finding and Filtering Records</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147478" role="paragraph" l10n="U" oldref="10">You can search for records by matching a keyword to a field entry.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/query" id="bm_id3152578" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159181" role="heading" level="3" l10n="U"
+ oldref="28">Entering Search key</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="U" oldref="11"><ahelp hid=".uno:Bib/query">Type the information that you want to search for, and then press Enter. To change the filter options for the search, long-click the <emph>AutoFilter</emph> icon, and then select a different data field. You can use wildcards such as % or * for any number of characters, and _ or ? for one character in your search. To display all of the records in the table, clear this box, and then press Enter. </ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/autoFilter" id="bm_id3149263" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155511" role="heading" level="3" l10n="U"
+ oldref="29">AutoFilter</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="14"><ahelp hid=".uno:Bib/autoFilter">Long-click to select the data field that you want to search using the term that you entered in the <emph>Search Key</emph> box. You can only search one data field.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="15">The list of table records is automatically updated to match the new filter settings.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/standardFilter" id="bm_id8315073" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3145590" role="paragraph" l10n="U" oldref="30"><ahelp hid=".">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</ahelp></paragraph>
+ <embed href="text/shared/02/12090000.xhp#filterdialog"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/removeFilter" id="bm_id8467360" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3155311" role="paragraph" l10n="U" oldref="16"><ahelp hid=".">To display all of the records in a table, click the <emph>Remove Filter</emph> icon.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_FM_DELETEROWS" id="bm_id3153954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147580" role="heading" level="2" l10n="U"
+ oldref="17">Deleting a Record</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154471" role="paragraph" l10n="U" oldref="18">To delete a record in the current table, right-click the row header of the record, and then select <emph>Delete</emph>. <ahelp hid="SID_FM_DELETEROWS" visibility="hidden">Deletes the selected record.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="2" l10n="U"
+ oldref="33">Changing the data source</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/sdbsource" id="bm_id3147318" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147214" role="heading" level="3" l10n="U"
+ oldref="38">Data Source</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151118" role="paragraph" l10n="U" oldref="39"><ahelp hid=".uno:Bib/sdbsource">Select the data source for the bibliography database.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:Bib/Mapping" id="bm_id3154944" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_BIB_MAPPINGDLG" id="bm_id4552446" localize="false"/><paragraph role="heading" id="hd_id3145645" xml-lang="en-US" level="3" l10n="U" oldref="35">Column Arrangement</paragraph>
-<paragraph role="paragraph" id="par_id3151282" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:Bib/Mapping">Lets you map the column headings to data fields from a different data source. To define a different data source for your bibliography, click the<emph> Data Source</emph> button on the record<emph> Object Bar</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_IDENTIFIER" id="bm_id3154729" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_TITLE" id="bm_id3149411" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ISBN" id="bm_id3156111" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITION" id="bm_id3149379" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_INSTITUTION" id="bm_id3144741" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ANNOTE" id="bm_id3149911" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_PAGES" id="bm_id3150594" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_SCHOOL" id="bm_id3150570" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_VOLUME" id="bm_id3155416" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM2" id="bm_id3150338" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM5" id="bm_id3150658" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHORITYTYPE" id="bm_id3145596" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_MONTH" id="bm_id3145594" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_BOOKTITLE" id="bm_id3152374" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITOR" id="bm_id3147046" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_JOURNAL" id="bm_id3150419" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_NUMBER" id="bm_id3148498" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_PUBLISHER" id="bm_id3153521" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_SERIES" id="bm_id3154503" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_URL" id="bm_id3149270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM3" id="bm_id3150965" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHOR" id="bm_id3159346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_YEAR" id="bm_id3156285" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CHAPTER" id="bm_id3151053" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_HOWPUBLISHED" id="bm_id3166413" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_NOTE" id="bm_id3151059" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ORGANIZATIONS" id="bm_id3149419" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_ADDRESS" id="bm_id3149417" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_REPORTTYPE" id="bm_id3157974" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM1" id="bm_id3153511" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4" id="bm_id3151039" localize="false"/><paragraph role="paragraph" id="par_id3144767" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4">Select the data field that you want to map to the current <emph>Column name</emph>. To change the available data fields, select a different data source for your bibliography.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/DeleteRecord" id="bm_id3157846" localize="false"/><paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="." visibility="hidden">Deletes the current record.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151019" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="." visibility="hidden">Lets you choose a different data source for your bibliography.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bib/InsertRecord" id="bm_id3149122" localize="false"/><paragraph role="paragraph" id="par_id3153730" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="." visibility="hidden">Inserts a new record into the current table.</ahelp></paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_BIB_MAPPINGDLG" id="bm_id4552446" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145645" role="heading" level="3" l10n="U"
+ oldref="35">Column Arrangement</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151282" role="paragraph" l10n="U" oldref="36"><ahelp hid=".uno:Bib/Mapping">Lets you map the column headings to data fields from a different data source. To define a different data source for your bibliography, click the<emph> Data Source</emph> button on the record<emph> Object Bar</emph>.</ahelp></paragraph>
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_IDENTIFIER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_TITLE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ISBN -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITION -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_INSTITUTION -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ANNOTE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_PAGES -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_SCHOOL -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_VOLUME -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM2 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM5 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHORITYTYPE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_MONTH -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_BOOKTITLE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_EDITOR -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_JOURNAL -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_NUMBER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_PUBLISHER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_SERIES -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_URL -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM3 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_AUTHOR -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_YEAR -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CHAPTER -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_HOWPUBLISHED -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_NOTE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ORGANIZATIONS -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_ADDRESS -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_REPORTTYPE -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM1 -->
+<!-- removed HID BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4 -->
+<paragraph xml-lang="en-US" id="par_id3144767" role="paragraph" l10n="U" oldref="37"><ahelp hid="BIB_LISTBOX_RID_DLG_MAPPING_LB_CUSTOM4">Select the data field that you want to map to the current <emph>Column name</emph>. To change the available data fields, select a different data source for your bibliography.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/DeleteRecord" id="bm_id3157846" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="48"><ahelp hid="." visibility="hidden">Deletes the current record.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151019" role="paragraph" l10n="U" oldref="52"><ahelp hid="." visibility="hidden">Lets you choose a different data source for your bibliography.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Bib/InsertRecord" id="bm_id3149122" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153730" role="paragraph" l10n="U" oldref="50"><ahelp hid="." visibility="hidden">Inserts a new record into the current table.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index 8630186bc6..ab69c7b996 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -1,20 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03010000.xhp,v $
- *
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,82 +32,87 @@
<meta>
-<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>
-</meta>
-<body>
-<section id="zoom">
+ <topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Zoom &amp; View Layout</title>
+ <filename>/text/shared/01/03010000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="zoom">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154682"><bookmark_value>zooming;page views</bookmark_value>
-<bookmark_value>views; scaling</bookmark_value>
-<bookmark_value>screen; scaling</bookmark_value>
-<bookmark_value>pages; scaling</bookmark_value>
+ <bookmark_value>views; scaling</bookmark_value>
+ <bookmark_value>screen; scaling</bookmark_value>
+ <bookmark_value>pages; scaling</bookmark_value>
</bookmark><comment>mw deleted "scaling;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_ZOOM" id="bm_id2031101" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id3153321" localize="false"/>
-<paragraph role="head1" id="hd_id3154682" xml-lang="en-US" l10n="U" oldref="1"><link href="text/shared/01/03010000.xhp">Zoom &amp; View Layout</link></paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="2"><variable id="massstabtext"><ahelp hid=".uno:Zoom">Reduces or enlarges the screen display of %PRODUCTNAME.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154682" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/03010000.xhp">Zoom &amp; View Layout</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="U" oldref="2"><variable id="massstabtext"><ahelp hid=".uno:Zoom">Reduces or enlarges the screen display of %PRODUCTNAME.</ahelp>
</variable> The current zoom factor is displayed as a percentage value on the <emph>Status</emph> bar.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000403.xhp#masstab"/>
-</section>
-<paragraph role="note" id="par_id3149655" xml-lang="en-US" l10n="CHG" oldref="26">Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the <emph>Status</emph> bar, and select the zoom factor that you want.</paragraph>
-<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="2" l10n="U" oldref="3">Zoom factor</paragraph>
-<paragraph role="paragraph" id="par_id3154389" xml-lang="en-US" l10n="CHG" oldref="4">Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_OPTIMAL" id="bm_id3145606" localize="false"/>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000403.xhp#masstab"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149655" role="note" l10n="CHG" oldref="26">Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the <emph>Status</emph> bar, and select the zoom factor that you want.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="2" l10n="U" oldref="3">Zoom factor</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154389" role="paragraph" l10n="CHG" oldref="4">Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL" id="bm_id3145606" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
-<paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3" l10n="U" oldref="20">Optimal</paragraph>
-<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cells.
-</caseinline><defaultinline> Resizes the display to fit the width of the text in the document.</defaultinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
+ oldref="20">Optimal</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
+</caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
-<paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="CHG" oldref="22">Fit width and height</paragraph>
-<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE">Displays the entire page on your screen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
+ oldref="22">Fit width and height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
+</caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
-<paragraph role="heading" id="hd_id3152771" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Fit width</paragraph>
-<paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152771" role="heading" level="2" l10n="CHG"
+ oldref="24">Fit width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200" id="bm_id3149766" localize="false"/>
-<paragraph role="paragraph" id="par_id3159151" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
+<paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150" id="bm_id3153193" localize="false"/>
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="." visibility="hidden">Displays the document at one and a half times its actual size.</ahelp></paragraph>
-<section id="hdrt">
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
+<paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="." visibility="hidden">Displays the document at one and a half times its actual size.</ahelp></paragraph>
+ <section id="hdrt">
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_100" id="bm_id3149560" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_VIEW100" id="bm_id3159252" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_ZOOM_BTN_100" id="bm_id051420080349501" localize="false"/>
-<paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="9">100 %</paragraph>
-<paragraph role="paragraph" id="par_id3147353" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_100">Displays the document at its actual size.</ahelp></paragraph>
-</section>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100" id="bm_id051420080349501" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153106" role="heading" level="2" l10n="U" oldref="9">100 %</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147353" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_100">Displays the document at its actual size.</ahelp></paragraph>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_75" id="bm_id3159199" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_75" id="bm_id3163710" localize="false"/>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_75 -->
+<paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50" id="bm_id3154319" localize="false"/>
-<paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1237588500" id="bm_id1551561" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1237582355" id="bm_id2212897" localize="false"/>
-<paragraph role="heading" id="hd_id3153191" xml-lang="en-US" level="3" l10n="U" oldref="15">Variable</paragraph>
-<paragraph role="paragraph" id="par_id3159125" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id7319864" xml-lang="en-US" level="2" l10n="NEW">View layout</paragraph>
-<paragraph role="paragraph" id="par_id3423871" xml-lang="en-US" l10n="NEW">For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.<comment>for this doc or all docs? answer: it's the same as before for the zoom factor.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582358" id="bm_id2504654" localize="false"/>
-<paragraph role="heading" id="hd_id3818475" xml-lang="en-US" level="3" l10n="NEW">Automatic</paragraph>
-<paragraph role="paragraph" id="par_id3187353" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The automatic view layout displays pages side by side, as many as the zoom factor allows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582359" id="bm_id5292519" localize="false"/>
-<paragraph role="heading" id="hd_id8455153" xml-lang="en-US" level="3" l10n="NEW">Single page</paragraph>
-<paragraph role="paragraph" id="par_id9912411" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The single page view layout displays pages beneath each other, but never side by side.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582360" id="bm_id3984496" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1237588505" id="bm_id9693899" localize="false"/>
-<paragraph role="heading" id="hd_id9204992" xml-lang="en-US" level="3" l10n="NEW">Columns</paragraph>
-<paragraph role="paragraph" id="par_id1993774" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In columns view layout you see pages in a given number of columns side by side. Enter the number of columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237582874" id="bm_id8689230" localize="false"/>
-<paragraph role="heading" id="hd_id2949919" xml-lang="en-US" level="3" l10n="NEW">Book mode</paragraph>
-<paragraph role="paragraph" id="par_id2355113" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number.</ahelp></paragraph>
-</body>
-</helpdocument>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
+<paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_USER" id="bm_id1551561" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_USER" id="bm_id2212897" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153191" role="heading" level="2" l10n="U"
+ oldref="15">Variable</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id7319864" role="heading" level="2" l10n="NEW">View layout</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3423871" role="paragraph" l10n="NEW">For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.<comment>for this doc or all docs? answer: it's the same as before for the zoom factor.</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_AUTOMATIC" id="bm_id2504654" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3818475" role="heading" level="2" l10n="NEW">Automatic</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3187353" role="paragraph" l10n="NEW"><ahelp hid=".">The automatic view layout displays pages side by side, as many as the zoom factor allows.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_SINGLE" id="bm_id5292519" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8455153" role="heading" level="2" l10n="NEW">Single page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW"><ahelp hid=".">The single page view layout displays pages beneath each other, but never side by side.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_COLUMNS" id="bm_id3984496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_COLUMNS" id="bm_id9693899" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9204992" role="heading" level="2" l10n="NEW">Columns</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1993774" role="paragraph" l10n="NEW"><ahelp hid=".">In columns view layout you see pages in a given number of columns side by side. Enter the number of columns.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_ZOOM_CHK_BOOK" id="bm_id8689230" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2949919" role="heading" level="2" l10n="NEW">Book mode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2355113" role="paragraph" l10n="NEW"><ahelp hid=".">In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/03020000.xhp b/helpcontent2/source/text/shared/01/03020000.xhp
index a34022e094..2812fef585 100644
--- a/helpcontent2/source/text/shared/01/03020000.xhp
+++ b/helpcontent2/source/text/shared/01/03020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03020000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03040000.xhp b/helpcontent2/source/text/shared/01/03040000.xhp
index be1a40ed0f..9a4e3217dc 100644
--- a/helpcontent2/source/text/shared/01/03040000.xhp
+++ b/helpcontent2/source/text/shared/01/03040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03040000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03050000.xhp b/helpcontent2/source/text/shared/01/03050000.xhp
index 332e668ca7..580eed37c4 100644
--- a/helpcontent2/source/text/shared/01/03050000.xhp
+++ b/helpcontent2/source/text/shared/01/03050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03050000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03060000.xhp b/helpcontent2/source/text/shared/01/03060000.xhp
index e0005ba506..f410ff5bf6 100644
--- a/helpcontent2/source/text/shared/01/03060000.xhp
+++ b/helpcontent2/source/text/shared/01/03060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03060000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03110000.xhp b/helpcontent2/source/text/shared/01/03110000.xhp
index 2bfff092f2..30911c55e6 100644
--- a/helpcontent2/source/text/shared/01/03110000.xhp
+++ b/helpcontent2/source/text/shared/01/03110000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03110000.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03150100.xhp b/helpcontent2/source/text/shared/01/03150100.xhp
index d59e2cabe1..e7ada31524 100755
--- a/helpcontent2/source/text/shared/01/03150100.xhp
+++ b/helpcontent2/source/text/shared/01/03150100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03150100.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,13 +40,13 @@
<body>
- <bookmark branch="hid/SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE" xml-lang="en-US" id="bm_id3152823"/><paragraph role="heading" level="1" id="hd_id3150278" l10n="U" xml-lang="en-US" oldref="1">Confirm Delete</paragraph>
+ <!-- removed HID SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE --><paragraph role="heading" level="1" id="hd_id3150278" l10n="U" xml-lang="en-US" oldref="1">Confirm Delete</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3148668" xml-lang="en-US" oldref="2"><ahelp hid="SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE" visibility="visible">Confirms or cancels the deletion.</ahelp></paragraph>
- <bookmark branch="hid/SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES" xml-lang="en-US" id="bm_id3155934"/><paragraph role="heading" level="2" id="hd_id3152821" l10n="U" xml-lang="en-US" oldref="3">Delete</paragraph>
+ <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES --><paragraph role="heading" level="2" id="hd_id3152821" l10n="U" xml-lang="en-US" oldref="3">Delete</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3150040" xml-lang="en-US" oldref="4"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES" visibility="visible">Performs the deletion in the current file.</ahelp></paragraph>
- <bookmark branch="hid/SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL" xml-lang="en-US" id="bm_id3145829"/><paragraph role="heading" level="2" id="hd_id3149999" l10n="U" xml-lang="en-US" oldref="5">Delete All</paragraph>
+ <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL --><paragraph role="heading" level="2" id="hd_id3149999" l10n="U" xml-lang="en-US" oldref="5">Delete All</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155616" xml-lang="en-US" oldref="6"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL" visibility="visible">Performs the deletion in all selected files.</ahelp></paragraph>
- <bookmark branch="hid/SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO" xml-lang="en-US" id="bm_id3152426"/><paragraph role="heading" level="2" id="hd_id3157991" l10n="U" xml-lang="en-US" oldref="7">Do Not Delete</paragraph>
+ <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO --><paragraph role="heading" level="2" id="hd_id3157991" l10n="U" xml-lang="en-US" oldref="7">Do Not Delete</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147043" xml-lang="en-US" oldref="8"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO" visibility="visible">Rejects the deletion for the current file.</ahelp></paragraph>
<paragraph role="heading" level="2" id="hd_id3149346" l10n="U" xml-lang="en-US" oldref="9">Cancel</paragraph>
<paragraph role="paragraph" id="par_id3148620" l10n="U" xml-lang="en-US" oldref="10">Cancels the deletion in the current file and any other selected files.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/03170000.xhp b/helpcontent2/source/text/shared/01/03170000.xhp
index 188c78b5bb..762e687a86 100644
--- a/helpcontent2/source/text/shared/01/03170000.xhp
+++ b/helpcontent2/source/text/shared/01/03170000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03170000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/03990000.xhp b/helpcontent2/source/text/shared/01/03990000.xhp
index 43790c567d..e7c970d058 100755
--- a/helpcontent2/source/text/shared/01/03990000.xhp
+++ b/helpcontent2/source/text/shared/01/03990000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03990000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index d4129c08fd..b3e8b14380 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 04050000.xhp,v $
- * $Revision: 1.10.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,77 +29,73 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared0104050000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Notes</title>
-<filename>/text/shared/01/04050000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>notes;inserting/editing/deleting/printing</bookmark_value>
-<bookmark_value>inserting; notes</bookmark_value>
-<bookmark_value>editing; notes</bookmark_value>
-<bookmark_value>deleting;notes</bookmark_value>
-<bookmark_value>Navigator;notes</bookmark_value>
-<bookmark_value>printing;notes</bookmark_value>
-<bookmark_value>records; inserting notes </bookmark_value>
-<bookmark_value>remarks, see also notes</bookmark_value>
+ <topic id="textshared0104050000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Comment</title>
+ <filename>/text/shared/01/04050000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value>
+ <bookmark_value>inserting; comments</bookmark_value>
+ <bookmark_value>editing; comments</bookmark_value>
+ <bookmark_value>deleting;comments</bookmark_value>
+ <bookmark_value>Navigator;comments</bookmark_value>
+ <bookmark_value>printing;comments</bookmark_value>
+ <bookmark_value>records; inserting comments </bookmark_value>
+ <bookmark_value>remarks, see also comments</bookmark_value>
</bookmark><comment>mw changed "notes;" and added 3 entries</comment>
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_POSTIT" id="bm_id8906707" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id3156045" localize="false"/>
-<paragraph role="heading" id="hd_id3154100" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a note anchored to the current cursor position.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154100" role="heading" level="1" l10n="CHG"
+ oldref="1">Comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a comment.</ahelp>
</variable></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000404.xhp#notiz"/>
-</section>
-<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 <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>
-<paragraph role="paragraph" id="par_id5201879" xml-lang="en-US" l10n="NEW">Every user with write permission to the text document can edit and delete notes of all authors.</paragraph>
-<paragraph role="paragraph" id="par_id2571794" xml-lang="en-US" l10n="NEW">The note box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete notes.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000404.xhp#notiz"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE" id="bm_id0429200810584478" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809383431" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current note.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETE_NOTE" id="bm_id0915200910461391" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETE_POSTIT" id="bm_id0915200910464881" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383431" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE_AUTHOR" id="bm_id0429200810592549" localize="false"/>
-<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/SID_DELETEALLBYAUTHOR_POSTIT" id="bm_id0915200910471559" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383485" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments 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><comment>View - Notes command</comment>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETEALL_POSTIT" id="bm_id0915200910474796" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383428" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1857051" role="paragraph" l10n="NEW"><ahelp hid=".">Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.</ahelp></paragraph><comment>22500 shown for Reply, which is the same as Delete.</comment>
+<paragraph xml-lang="en-US" id="par_id0305200911090684" role="paragraph" l10n="NEW">If the comment in a text document was written by another author, there is a Reply command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments 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 <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>
-<paragraph role="paragraph" id="par_id2254402" xml-lang="en-US" l10n="NEW">To set the printing options for notes in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for notes for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
-</case>
-<case select="CALC"><comment>Calc</comment>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="6">When you attach a note to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a note. To display the note permanently, right-click the cell, and choose <emph>Show Note</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id8336741" xml-lang="en-US" l10n="NEW">To change the object properties of a note, for example the background color, choose <emph>Show Note</emph> as above, then right-click the note (do not double-click the text).</paragraph>
-<paragraph role="paragraph" id="par_id3155390" xml-lang="en-US" l10n="CHG" oldref="7">To edit a shown note, double-click the note text. To edit a note that is not shown permanently, click in the cell that contains the note, and then choose <emph>Insert - Note</emph>. To specify the formatting of the note text, right-click the note text in edit mode.</paragraph>
-<paragraph role="paragraph" id="par_idN107A1" xml-lang="en-US" l10n="NEW">To change the position or size of a note, drag a border or corner of the note. <comment>UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id9499496" xml-lang="en-US" l10n="NEW">To delete a note, right-click the cell, then choose <emph>Delete Note</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id2036805" xml-lang="en-US" l10n="NEW">You can also right-click a note name in the Navigator window to choose some editing commands.</paragraph>
-<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="8">To set the printing options for notes in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
-</case>
-<default><comment>Draw, Impress</comment>
-<paragraph role="paragraph" id="par_id4844508" xml-lang="en-US" l10n="NEW">In Draw, there are no notes. If you want some annotations, use a custom layer and set the layer to visible or invisible as desired.</paragraph>
-<paragraph role="paragraph" id="par_id2419507" xml-lang="en-US" l10n="NEW">In Impress, you can use the Notes view to write a page of notes for every slide.</paragraph>
-</default>
-</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_POSTIT:ED_EDIT" id="bm_id3154935" localize="false"/><comment>Text edit box - are these still in use?</comment>
-<paragraph role="paragraph" id="par_id3153362" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="." visibility="hidden">Enter the text for your note.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_POSTIT:BTN_AUTHOR" id="bm_id3144434" localize="false"/><comment>Author edit box</comment>
-<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="." visibility="hidden">Enters your initials and the current date and time into the contents of the note.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id0804200803435883" role="paragraph" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Comments</item> to show or hide all comments (not available in Calc).</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200901430918" role="paragraph" l10n="NEW">In the Find &amp; Replace dialog of text documents, you can select to include the comments texts in your searches.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3445539" role="heading" level="2" l10n="NEW">Navigating from comment to comment in text documents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous comment.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5664235" role="heading" level="2" l10n="NEW">Printing comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To change the printing option for comments for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0915200910571612" role="heading" level="2" l10n="NEW">Comments in spreadsheets</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment (do not double-click the text).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="CHG" oldref="7">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, click in the cell that contains the comment, and then choose <emph>Insert - Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a comment, drag a border or corner of the comment.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9499496" role="paragraph" l10n="NEW">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2036805" role="paragraph" l10n="NEW">You can also right-click a comment name in the Navigator window to choose some editing commands.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">To set the printing options for comments in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2419507" role="note" l10n="NEW">In Impress, you can choose to use the Notes view to write a page of notes for every slide. Additionally, you can insert comments to your slides. </paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/04060000.xhp b/helpcontent2/source/text/shared/01/04060000.xhp
index cbf22be225..ddaea4dd8c 100644
--- a/helpcontent2/source/text/shared/01/04060000.xhp
+++ b/helpcontent2/source/text/shared/01/04060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04060000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04060100.xhp b/helpcontent2/source/text/shared/01/04060100.xhp
index 27a08eb711..e0a2c2c448 100644
--- a/helpcontent2/source/text/shared/01/04060100.xhp
+++ b/helpcontent2/source/text/shared/01/04060100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04060100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04060200.xhp b/helpcontent2/source/text/shared/01/04060200.xhp
index dd069232da..78015e4c56 100644
--- a/helpcontent2/source/text/shared/01/04060200.xhp
+++ b/helpcontent2/source/text/shared/01/04060200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04060200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04100000.xhp b/helpcontent2/source/text/shared/01/04100000.xhp
index bd9cab9c9b..09b91c4fdb 100644
--- a/helpcontent2/source/text/shared/01/04100000.xhp
+++ b/helpcontent2/source/text/shared/01/04100000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04100000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/SID_CHARMAP" id="bm_id1495830" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertSymbol" id="bm_id3153391" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_BULLET" id="bm_id4021836" localize="false"/>
+<!-- removed HID SID_BULLET -->
<bookmark xml-lang="en-US" branch="hid/.uno:Bullet" id="bm_id3146902" localize="false"/>
<paragraph role="heading" id="hd_id3152937" xml-lang="en-US" level="1" l10n="U" oldref="1">Special Character</paragraph>
<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="sonder"><ahelp hid=".uno:Bullet">Inserts special characters from the installed fonts.</ahelp>
@@ -56,10 +53,10 @@
<embed href="text/shared/00/00000404.xhp#sonder"/>
</section>
<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="11">When you click a character in the <emph>Special Characters </emph>dialog, a preview and the corresponding numerical code for the character is displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_CHARMAP:LB_FONT" id="bm_id3153910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT" id="bm_id3153910" localize="false"/>
<paragraph role="heading" id="hd_id3151315" xml-lang="en-US" level="2" l10n="U" oldref="3">Font</paragraph>
<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_CHARMAP:LB_FONT">Select a font to display the special characters that are associated with it.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_CHARMAP_LB_SUBSET" id="bm_id3147292" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET" id="bm_id3147292" localize="false"/>
<paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="19">Subset</paragraph>
<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_CHARMAP_LB_SUBSET">Select a Unicode category for the current font.</ahelp> The special characters for the selected Unicode category are displayed in the character table.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_CHARMAP_CTL_SHOWSET" id="bm_id3147576" localize="false"/>
@@ -67,7 +64,7 @@
<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_CHARMAP_CTL_SHOWSET">Click the special character(s) that you want to insert, and then click <emph>OK</emph>.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="2" l10n="U" oldref="7">Characters</paragraph>
<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="8">Displays the special characters that you have selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_CHARMAP:BTN_DELETE" id="bm_id3147089" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE" id="bm_id3147089" localize="false"/>
<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete</paragraph>
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_CHARMAP:BTN_DELETE">Clears the current selection of special characters that you want to insert.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/04110000.xhp b/helpcontent2/source/text/shared/01/04110000.xhp
index 558e3f90e1..720fdef877 100644
--- a/helpcontent2/source/text/shared/01/04110000.xhp
+++ b/helpcontent2/source/text/shared/01/04110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04110000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04140000.xhp b/helpcontent2/source/text/shared/01/04140000.xhp
index e4b2ce210f..57e51c9425 100644
--- a/helpcontent2/source/text/shared/01/04140000.xhp
+++ b/helpcontent2/source/text/shared/01/04140000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04140000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_IMAGE_TEMPLATE" id="bm_id3150902" localize="false"/>
<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="2" l10n="U" oldref="17">Style</paragraph>
<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_FILEOPEN_IMAGE_TEMPLATE">Select the frame style for the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_IMPGRF_CB_LINK" id="bm_id3157991" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OFA_HYPERLINK_URL_TXT" id="bm_id3157991" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_LINK_CB" id="bm_id3152542" localize="false"/>
<paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="2" l10n="U" oldref="6">Link</paragraph>
<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_FILEDLG_LINK_CB">Inserts the selected graphic file as a link.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/04150000.xhp b/helpcontent2/source/text/shared/01/04150000.xhp
index ef435dc50e..7bde2a135f 100755
--- a/helpcontent2/source/text/shared/01/04150000.xhp
+++ b/helpcontent2/source/text/shared/01/04150000.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04150000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,31 +29,36 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0104150000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Object</title>
-<filename>/text/shared/01/04150000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="objekt">
-<bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/><paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/04150000.xhp" name="Objects">Object</link></paragraph>
-<paragraph role="paragraph" id="par_id3159079" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Inserts an object into your document. For movies and sounds, use <emph>Insert - Movie and Sound</emph> instead.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000404.xhp#objekteinf"/>
-</section>
-<paragraph role="heading" id="hd_id3154894" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph>
-<embed href="text/shared/01/04150100.xhp#ole"/>
-<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/04150400.xhp" name="Sound">Sound</link></paragraph>
-<embed href="text/shared/01/04150400.xhp#klang"/>
-<paragraph role="heading" id="hd_id3157896" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04150500.xhp" name="Video">Video</link></paragraph>
-<embed href="text/shared/01/04150500.xhp#video"/><comment>removed Insert Applet link</comment><paragraph role="heading" id="hd_id3153577" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph>
-<embed href="text/shared/01/04160300.xhp#starmath"/>
-<paragraph role="heading" id="hd_id3152552" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="WRITER"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link>
+ <topic id="textshared0104150000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Drawing Object</title>
+ <filename>/text/shared/01/04150000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="objekt">
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/01/04150000.xhp" name="Drawing Object">Drawing Object</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159079" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Inserts an object into your document. For movies and sounds, use <emph>Insert - Movie and Sound</emph> instead.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000404.xhp#objekteinf"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154894" role="heading" level="2" l10n="U" oldref="8"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph>
+ <embed href="text/shared/01/04150100.xhp#ole"/>
+ <paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04150400.xhp" name="Sound">Sound</link></paragraph>
+ <embed href="text/shared/01/04150400.xhp#klang"/>
+ <paragraph xml-lang="en-US" id="hd_id3157896" role="heading" level="2" l10n="U" oldref="7"><link href="text/shared/01/04150500.xhp" name="Video">Video</link></paragraph>
+ <embed href="text/shared/01/04150500.xhp#video"/><comment>removed Insert Applet link</comment>
+<paragraph xml-lang="en-US" id="hd_id3153577" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph>
+ <embed href="text/shared/01/04160300.xhp#starmath"/>
+ <paragraph xml-lang="en-US" id="hd_id3152552" role="heading" level="2" l10n="U"
+ oldref="10"><switchinline select="appl"><caseinline select="WRITER"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link>
+</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200903593543" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="WRITER">Inserts a chart.
</caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/04150100.xhp b/helpcontent2/source/text/shared/01/04150100.xhp
index f5033b7cef..3e10467506 100644
--- a/helpcontent2/source/text/shared/01/04150100.xhp
+++ b/helpcontent2/source/text/shared/01/04150100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04150100.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
<bookmark_value>inserting; OLE objects</bookmark_value>
<bookmark_value>objects; inserting OLE objects</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_INSERT_OLEOBJECT" id="bm_id3150278" localize="false"/>
+<!-- removed HID SO3:MODALDIALOG:MD_INSERT_OLEOBJECT -->
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_OBJECT" id="bm_id9083923" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertObject" id="bm_id3152952" localize="false"/><paragraph role="heading" id="hd_id3153116" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert OLE Object</paragraph>
<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="2"><variable id="ole"><ahelp hid=".uno:InsertObject">Inserts an <link href="text/shared/00/00000005.xhp#ole" name="OLE">OLE</link> object into the current document. The OLE object is inserted as a link or an embedded object.</ahelp>
@@ -58,19 +55,19 @@
<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="U" oldref="19">To speed up the display of the document, OLE objects are kept in the program cache. If you want to change the cache settings, choose <link href="text/shared/optionen/01011000.xhp" name="Tools - Options - $[officename] - Memory"><emph>Tools - Options - $[officename] - Memory</emph></link>.</paragraph>
<paragraph role="note" id="par_id3145314" xml-lang="en-US" l10n="U" oldref="18">You cannot use the clipboard or drag and drop to move OLE objects to other files.</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="17">Empty and inactive OLE objects are transparent.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="2" l10n="U" oldref="3">Create new</paragraph>
+<!-- removed HID SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT --><paragraph role="heading" id="hd_id3149178" xml-lang="en-US" level="2" l10n="U" oldref="3">Create new</paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT">Creates a new OLE object based on the object type that you select.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE" id="bm_id3152781" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Object type</paragraph>
+<!-- removed HID SO3:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE --><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Object type</paragraph>
<paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SO3:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE">Select the type of document that you want to create.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE" id="bm_id3145383" localize="false"/><paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="2" l10n="U" oldref="7">Create from file</paragraph>
+<!-- removed HID SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE --><paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="2" l10n="U" oldref="7">Create from file</paragraph>
<paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SO3:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE">Creates an OLE object from an existing file.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150084" xml-lang="en-US" level="2" l10n="U" oldref="15">File</paragraph>
<paragraph role="paragraph" id="par_id3146773" xml-lang="en-US" l10n="U" oldref="16">Choose the file that you want to insert as an OLE object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH" id="bm_id3159148" localize="false"/><paragraph role="heading" id="hd_id3144438" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
+<!-- removed HID SO3:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH --><paragraph role="heading" id="hd_id3144438" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
<paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SO3:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH">Enter the name of the file that you want to link or embed, or click <emph>Search</emph>, to locate the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH" id="bm_id3146848" localize="false"/><paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="11">Search...</paragraph>
+<!-- removed HID SO3:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH --><paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="11">Search...</paragraph>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SO3:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH">Locate the file that you want to insert, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/so3_CheckBox_MD_INSERT_OLEOBJECT_CB_FILELINK" id="bm_id77211" localize="false"/><paragraph role="heading" id="hd_id4174321" xml-lang="en-US" level="3" l10n="NEW">Link to file</paragraph>
+<!-- removed HID so3_CheckBox_MD_INSERT_OLEOBJECT_CB_FILELINK --><paragraph role="heading" id="hd_id4174321" xml-lang="en-US" level="3" l10n="NEW">Link to file</paragraph>
<paragraph role="paragraph" id="par_id6636555" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable this checkbox to insert the OLE object as a link to the original file. If this checkbox is not enabled, the OLE object will be embedded into your document.</ahelp><comment>which consequences? cannot find featuremail or spec doc</comment></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/04150200.xhp b/helpcontent2/source/text/shared/01/04150200.xhp
index ae53c8fb12..585e959b46 100644
--- a/helpcontent2/source/text/shared/01/04150200.xhp
+++ b/helpcontent2/source/text/shared/01/04150200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04150200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
</bookmark>
<comment>MW deleted "adding;"</comment>
-<bookmark xml-lang="en-US" branch="hid/SO3:MODALDIALOG:MD_INSERT_OBJECT_PLUGIN" id="bm_id3154812" localize="false"/>
+<!-- removed HID SO3:MODALDIALOG:MD_INSERT_OBJECT_PLUGIN -->
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_PLUGIN" id="bm_id9254880" localize="false"/>
@@ -65,15 +62,15 @@
</section>
-<bookmark xml-lang="en-US" branch="hid/SO3:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL" id="bm_id3157896" localize="false"/>
+<!-- removed HID SO3:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL -->
<paragraph xml-lang="en-US" id="hd_id3148585" role="heading" level="2" l10n="U" oldref="3">File/URL</paragraph>
<paragraph xml-lang="en-US" id="par_id3147399" role="paragraph" l10n="U" oldref="4"><ahelp hid="SO3:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL">Enter the URL for the plug-in or click <emph>Browse</emph>, and then locate the plug-in that you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL" id="bm_id3155892" localize="false"/>
+<!-- removed HID SO3:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL -->
<paragraph xml-lang="en-US" id="hd_id3155552" role="heading" level="3" l10n="U" oldref="5">Browse</paragraph>
<paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="U" oldref="6"><ahelp hid="SO3:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL">Locate the plug-in that you want to insert, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS" id="bm_id3155941" localize="false"/>
+<!-- removed HID SO3:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS -->
<paragraph xml-lang="en-US" id="hd_id3149750" role="heading" level="2" l10n="U" oldref="7">Options</paragraph>
<paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="8"><ahelp hid="SO3:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS">Enter the parameters for the plug-in using the format <emph>parameter1="some text"</emph>.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/04150400.xhp b/helpcontent2/source/text/shared/01/04150400.xhp
index af5ea5826c..a1cbd96769 100644
--- a/helpcontent2/source/text/shared/01/04150400.xhp
+++ b/helpcontent2/source/text/shared/01/04150400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04150400.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04150500.xhp b/helpcontent2/source/text/shared/01/04150500.xhp
index 967f2b2571..0cdaf7177b 100644
--- a/helpcontent2/source/text/shared/01/04150500.xhp
+++ b/helpcontent2/source/text/shared/01/04150500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04150500.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04160300.xhp b/helpcontent2/source/text/shared/01/04160300.xhp
index 65f2e9ec41..ecb947e1fb 100644
--- a/helpcontent2/source/text/shared/01/04160300.xhp
+++ b/helpcontent2/source/text/shared/01/04160300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04160300.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04160500.xhp b/helpcontent2/source/text/shared/01/04160500.xhp
index 3204779f73..5070e800df 100644
--- a/helpcontent2/source/text/shared/01/04160500.xhp
+++ b/helpcontent2/source/text/shared/01/04160500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04160500.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#eiobframe"/>
</section>
-<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph>Tools - Options - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
+<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="C"><link href="text/shared/01/02210101.xhp" name="Floating frame properties">Floating frame properties</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/01/04180100.xhp b/helpcontent2/source/text/shared/01/04180100.xhp
index 7f428f5c38..07f85fb394 100644
--- a/helpcontent2/source/text/shared/01/04180100.xhp
+++ b/helpcontent2/source/text/shared/01/04180100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04180100.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/04990000.xhp b/helpcontent2/source/text/shared/01/04990000.xhp
index 9c204d4e80..d9e3dd2c4b 100755
--- a/helpcontent2/source/text/shared/01/04990000.xhp
+++ b/helpcontent2/source/text/shared/01/04990000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04990000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05010000.xhp b/helpcontent2/source/text/shared/01/05010000.xhp
index 95db7d8758..33161451c6 100644
--- a/helpcontent2/source/text/shared/01/05010000.xhp
+++ b/helpcontent2/source/text/shared/01/05010000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05010000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05020000.xhp b/helpcontent2/source/text/shared/01/05020000.xhp
index cfe2e1245e..01494a6aba 100644
--- a/helpcontent2/source/text/shared/01/05020000.xhp
+++ b/helpcontent2/source/text/shared/01/05020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp b/helpcontent2/source/text/shared/01/05020100.xhp
index fd05be04a3..3f4e7ddfa3 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020100.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,38 +76,38 @@
<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="57">Complex text layout font - right-to-left text direction</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME" id="bm_id3149796" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_NAME" id="bm_id3159158" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME_NOCJK" id="bm_id3149795" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_NAME" id="bm_id3155419" localize="false"/>
+<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME" id="bm_id3149796" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK" id="bm_id3149795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME" id="bm_id3155419" localize="false"/>
<paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="2" l10n="U" oldref="4">Font</paragraph>
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_NAME">Enter the name of an installed font that you want to use, or select a font from the list.</ahelp></paragraph>
<embed href="text/shared/02/02020000.xhp#vorschautext"/>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/02/02020000.xhp#syschriftart"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE" id="bm_id3158432" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_STYLE" id="bm_id3150670" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE_NOCJK" id="bm_id3158430" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_STYLE" id="bm_id3144439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE" id="bm_id3158432" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE" id="bm_id3150670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK" id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE" id="bm_id3144439" localize="false"/>
<paragraph role="heading" id="hd_id3143271" xml-lang="en-US" level="2" l10n="U" oldref="10">Typeface</paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_STYLE">Select the formatting that you want to apply.</ahelp></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00040502.xhp#syfett"/>
<embed href="text/shared/00/00040502.xhp#sykursiv"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE" id="bm_id3154389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_SIZE" id="bm_id3148756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE_NOCJK" id="bm_id3154388" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_SIZE" id="bm_id3152771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE" id="bm_id3154389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE" id="bm_id3148756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK" id="bm_id3154388" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE" id="bm_id3152771" localize="false"/>
<paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Size</paragraph>
<paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX_METRICBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_SIZE">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="45">If you are creating a Style that is based on another Style, you can enter a percentage value or a point value (for example, -2pt or +5pt).</paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/02/02030000.xhp#syschriftgroesse"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG" id="bm_id3154153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_LANG" id="bm_id3150289" localize="false"/>
-<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG" id="bm_id3154153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG" id="bm_id3150289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK" id="bm_id3149204" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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 or the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 3bafd19072..5a663d6449 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 05020200.xhp,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,134 +31,171 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0105020200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Font Effects</title>
-<filename>/text/shared/01/05020200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="schrifteffekt">
+ <topic id="textshared0105020200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Font Effects</title>
+ <filename>/text/shared/01/05020200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="schrifteffekt">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153514"><bookmark_value>fonts;effects</bookmark_value>
-<bookmark_value>formatting; font effects</bookmark_value>
-<bookmark_value>characters; font effects</bookmark_value>
-<bookmark_value>text; font effects</bookmark_value>
-<bookmark_value>effects; fonts</bookmark_value>
-<bookmark_value>underlining; text</bookmark_value>
-<bookmark_value>capital letters; font effects</bookmark_value>
-<bookmark_value>lowercase letters; font effects</bookmark_value>
-<bookmark_value>titles; font effects</bookmark_value>
-<bookmark_value>small capitals</bookmark_value>
-<bookmark_value>strikethrough; font effects</bookmark_value>
-<bookmark_value>fonts; strikethrough</bookmark_value>
-<bookmark_value>outlines; font effects</bookmark_value>
-<bookmark_value>fonts; outlines</bookmark_value>
-<bookmark_value>shadows; characters</bookmark_value>
-<bookmark_value>fonts; shadows</bookmark_value>
-<bookmark_value>colors; fonts</bookmark_value>
-<bookmark_value>fonts;colors</bookmark_value>
-</bookmark><comment>ufi inserted "fonts;colors"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/><paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
-</section>
-<embed href="text/shared/01/05020100.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE" id="bm_id3153527" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="41">Underlining</paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words </emph>box.</ahelp></paragraph>
-<paragraph role="note" id="par_id3153147" xml-lang="en-US" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
-<embed href="text/shared/00/00000007.xhp#objektleiste"/>
-<embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR" id="bm_id3156327" localize="false"/><paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="2" l10n="U" oldref="78">Color</paragraph>
-<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR">Select the color for the underlining.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2" id="bm_id3153666" localize="false"/>
+ <bookmark_value>formatting; font effects</bookmark_value>
+ <bookmark_value>characters; font effects</bookmark_value>
+ <bookmark_value>text; font effects</bookmark_value>
+ <bookmark_value>effects; fonts</bookmark_value>
+ <bookmark_value>underlining; text</bookmark_value>
+ <bookmark_value>capital letters; font effects</bookmark_value>
+ <bookmark_value>lowercase letters; font effects</bookmark_value>
+ <bookmark_value>titles; font effects</bookmark_value>
+ <bookmark_value>small capitals</bookmark_value>
+ <bookmark_value>strikethrough; font effects</bookmark_value>
+ <bookmark_value>fonts; strikethrough</bookmark_value>
+ <bookmark_value>outlines; font effects</bookmark_value>
+ <bookmark_value>fonts; outlines</bookmark_value>
+ <bookmark_value>shadows; characters</bookmark_value>
+ <bookmark_value>fonts; shadows</bookmark_value>
+ <bookmark_value>fonts;color ignored</bookmark_value>
+ <bookmark_value>ignored font colors</bookmark_value>
+ <bookmark_value>colors;ignored text color</bookmark_value>
+</bookmark><comment>ufi inserted "fonts;colors"</comment><comment>MW copied two entries about font colors to text/shared/guide/text_color</comment><comment>mw added 3 index entries about ignored font colors</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SVXPAGE_CHAR_EFFECTS" id="bm_id3147090" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153514" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020200.xhp" name="Font Effects">Font Effects</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149205" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SVXPAGE_CHAR_EFFECTS">Specify the font effects that you want to use.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#schrifteffekt"/>
+ </section>
+ <embed href="text/shared/01/05020100.xhp#hinweis"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2" id="bm_id3153728" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR" id="bm_id0123200902114658" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149482" role="heading" level="2" l10n="U"
+ oldref="81">Font Color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146924" role="paragraph" l10n="U" oldref="82"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CC2" role="paragraph" l10n="CHG">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CC9" role="paragraph" l10n="CHG">If you click the <emph>Font Color</emph> icon before you select text, the paint can cursor appears. To change the color of text, select the text with the paint can cursor. To change the color of a single word, double-click in a word. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CD6" role="paragraph" l10n="NEW">To undo the last change, right-click.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10CDA" role="paragraph" l10n="NEW">To exit the paint can mode, click once, or press the Escape key.</paragraph>
+ </listitem>
+ </list>
<switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id3146137" xml-lang="en-US" level="2" l10n="U" oldref="3">Effects</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2">Select the font effects that you want to apply.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="3" l10n="U" oldref="65">Effects</paragraph>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="66">The following capitalization effects are available:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="67">Without - no effect is applied</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="68">Capitals - changes the selected lowercase characters to uppercase characters</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="69">Lowercase - changes the selected uppercase characters to lower characters</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="71">Title font - changes the first character of each selected word to an uppercase character</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154937" xml-lang="en-US" l10n="U" oldref="70">Small capitals - changes the selected lowercase characters to uppercase characters, and then reduces their size</paragraph>
-</listitem>
-</list>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3150037" role="warning" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black</emph> check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Writer - Print"><emph>%PRODUCTNAME Writer - Print</emph></link> in the Options dialog box.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT" id="bm_id3150791" localize="false"/><paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="2" l10n="U" oldref="43">Strikethrough</paragraph>
-<paragraph role="paragraph" id="par_id3145203" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT">Select a strikethrough style for the selected text.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150496" xml-lang="en-US" l10n="U" oldref="48">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS" id="bm_id3154125" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="2" l10n="U" oldref="45">Individual words</paragraph>
-<paragraph role="paragraph" id="par_id3152935" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE" id="bm_id3149985" localize="false"/><paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="3" l10n="U" oldref="72">Outlines</paragraph>
-<paragraph role="paragraph" id="par_id3159126" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW" id="bm_id3147326" localize="false"/><paragraph role="heading" id="hd_id3163714" xml-lang="en-US" level="3" l10n="U" oldref="74">Shadows</paragraph>
-<paragraph role="paragraph" id="par_id3150962" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id7613757" role="warning" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01013000.xhp"><emph>%PRODUCTNAME - Accessibility</emph></link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3144766" role="paragraph" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar.
+</variable></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2" id="bm_id0123200902144733" localize="false"/>
<switch select="appl">
<case select="WRITER">
-<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
-<bookmark_value>flashing fonts</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id3159179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id1213415" localize="false"/><paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="3" l10n="U" oldref="15">Blinking</paragraph>
-<paragraph role="paragraph" id="par_id3145662" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_CHARHIDDEN" id="bm_id2219000" localize="false"/><paragraph role="heading" id="par_idN10B81" xml-lang="en-US" level="3" l10n="NEW">Hidden</paragraph>
-<paragraph role="paragraph" id="par_idN10B85" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146137" role="heading" level="2" l10n="U" oldref="3">Effects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EFFECTS2">Select the font effects that you want to apply.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149575" role="heading" level="3" l10n="U"
+ oldref="65">Effects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="66">The following capitalization effects are available:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="listitem" l10n="U" oldref="67">Without - no effect is applied</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154280" role="listitem" l10n="U" oldref="68">Capitals - changes the selected lowercase characters to uppercase characters</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148947" role="listitem" l10n="U" oldref="69">Lowercase - changes the selected uppercase characters to lower characters</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="U" oldref="71">Title font - changes the first character of each selected word to an uppercase character</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154937" role="listitem" l10n="U" oldref="70">Small capitals - changes the selected lowercase characters to uppercase characters, and then reduces their size</paragraph>
+ </listitem>
+ </list>
</case>
</switch>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<embed href="text/shared/00/00000007.xhp#asia"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS" id="bm_id3163710" localize="false"/><paragraph role="heading" id="hd_id3150332" xml-lang="en-US" level="2" l10n="U" oldref="60">Emphasis mark</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS">Select a character to display over or below the entire length of the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION" id="bm_id3163820" localize="false"/><paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="2" l10n="U" oldref="62">Position</paragraph>
-<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION">Specify where to display the emphasis marks.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF" id="bm_id3155511" localize="false"/><paragraph role="heading" id="hd_id3154129" xml-lang="en-US" level="2" l10n="U" oldref="76">Relief</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_COLOR2" id="bm_id3153728" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR" id="bm_id3147214" localize="false"/><paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="2" l10n="U" oldref="81">Font Color</paragraph>
-<paragraph role="paragraph" id="par_id3146924" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_FONTCOLOR">Sets the color for the selected text. If you select<emph> Automatic</emph>, the text color is set to black for light backgrounds and to white for dark backgrounds.</ahelp></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10CC2" xml-lang="en-US" l10n="CHG">To change the color of a text selection, select the text that you want to change, and click the <emph>Font Color</emph> icon. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CC9" xml-lang="en-US" l10n="CHG">If you click the <emph>Font Color</emph> icon before you select text, the paint can cursor appears. To change the color of text, select the text with the paint can cursor. To change the color of a single word, double-click in a word. To apply a different color, click the arrow next to the <emph>Font Color</emph> icon, and then select the color that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CD6" xml-lang="en-US" l10n="NEW">To undo the last change, right-click.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10CDA" xml-lang="en-US" l10n="NEW">To exit the paint can mode, click once, or press the Escape key.</paragraph>
-</listitem>
-</list>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF" id="bm_id0123200902202314" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154129" role="heading" level="2" l10n="U"
+ oldref="76">Relief</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph" l10n="U" oldref="77"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_RELIEF">Select a relief effect to apply to the selected text. The embossed relief makes the characters appear as if they are raised above the page. The engraved relief makes the characters appear as if they are pressed into the page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE" id="bm_id0123200902155356" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147287" role="heading" level="3" l10n="CHG"
+ oldref="72">Outline</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159126" role="paragraph" l10n="U" oldref="73"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_OUTLINE">Displays the outline of the selected characters. This effect does not work with every font.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW" id="bm_id0123200902163281" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163714" role="heading" level="3" l10n="CHG"
+ oldref="74">Shadow</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150962" role="paragraph" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="warning" id="par_id3150037" xml-lang="en-US" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black </emph>check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<case select="WRITER">
+<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
+ <bookmark_value>flashing fonts</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING" id="bm_id012320090217277" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152941" role="heading" level="3" l10n="U"
+ oldref="15">Blinking</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN" id="bm_id0123200902180465" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10B81" role="heading" level="3" l10n="NEW">Hidden</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
</case>
</switch>
-<paragraph role="warning" id="par_id7613757" xml-lang="en-US" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <link href="text/shared/optionen/01013000.xhp"><emph>Tools - Options - %PRODUCTNAME - Accessibility</emph></link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/><paragraph role="paragraph" id="par_id3144766" xml-lang="en-US" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the <emph>Font color </emph>toolbar.
-</variable></ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<paragraph role="paragraph" id="par_id3151053" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
-<embed href="text/shared/guide/text_color.xhp#text_color"/>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0123200902291084" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden"><emph>Overlines or removes overlining from the selected text. If the cursor is not in a word, the new text that you enter is overlined.</emph></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE" id="bm_id0123200902014986" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0123200902243376" role="heading" level="2" l10n="NEW">Overlining</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph" l10n="NEW"><ahelp hid=".">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR" id="bm_id0123200902032228" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0123200902243470" role="heading" level="2" l10n="NEW">Overline color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph" l10n="NEW"><ahelp hid=".">Select the color for the overlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT" id="bm_id0123200902074215" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="2" l10n="U"
+ oldref="43">Strikethrough</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph" l10n="U" oldref="44"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_STRIKEOUT">Select a strikethrough style for the selected text.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150496" role="note" l10n="U" oldref="48">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE" id="bm_id0123200902053711" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
+ oldref="41">Underlining</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153147" role="note" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
+ <embed href="text/shared/00/00000007.xhp#objektleiste"/>
+ <embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR" id="bm_id0123200902050229" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148642" role="heading" level="2" l10n="CHG"
+ oldref="78">Underline color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="79"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE_COLOR">Select the color for the underlining.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS" id="bm_id0123200902090860" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153104" role="heading" level="2" l10n="U"
+ oldref="45">Individual words</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152935" role="paragraph" l10n="U" oldref="46"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_INDIVIDUALWORDS">Applies the selected effect only to words and ignores spaces.</ahelp></paragraph>
+ <embed href="text/shared/00/00000007.xhp#asia"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS" id="bm_id0123200902235399" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="2" l10n="U"
+ oldref="60">Emphasis mark</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="61"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_EMPHASIS">Select a character to display over or below the entire length of the selected text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION" id="bm_id0123200902241815" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152460" role="heading" level="2" l10n="U"
+ oldref="62">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_POSITION">Specify where to display the emphasis marks.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+ <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+ <paragraph xml-lang="en-US" id="par_id3151053" role="paragraph" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
+ <embed href="text/shared/guide/text_color.xhp#text_color"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05020300.xhp b/helpcontent2/source/text/shared/01/05020300.xhp
index 65d69fec8a..8293b72453 100644
--- a/helpcontent2/source/text/shared/01/05020300.xhp
+++ b/helpcontent2/source/text/shared/01/05020300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020300.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
<section id="howtoget">
<embed href="text/shared/00/00040503.xhp#zahlen"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY" id="bm_id3153312" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY" id="bm_id3153312" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155392" role="heading" level="2" l10n="U" oldref="3">Category</paragraph>
<paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY">Select a category from the list, and then select a formatting style in the <emph>Format </emph>box.</ahelp></paragraph>
@@ -81,7 +78,7 @@
<paragraph xml-lang="en-US" id="hd_id3155342" role="heading" level="2" l10n="U" oldref="5">Format</paragraph>
<paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_NUMBERFORMAT_LB_FORMAT">Select how you want the contents of the selected cell(s) to be displayed.</ahelp> The code for the selected option is displayed in the <emph>Format Code</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY" id="bm_id3154381" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154811" role="heading" level="3" l10n="U" oldref="97">Currency category list boxes</paragraph>
<paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="98"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY">Select a currency, and then scroll to the top of the <emph>Format</emph> list to view the formatting options for the currency.</ahelp></paragraph>
<section id="waehrungtext">
@@ -90,36 +87,36 @@
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE" id="bm_id3148797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE" id="bm_id3148797" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2" l10n="U" oldref="23">Language</paragraph>
<paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE">Specifies the language setting for the selected <switchinline select="appl"><caseinline select="CALC">cells
</caseinline><defaultinline>fields</defaultinline></switchinline>. With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected <switchinline select="appl"><caseinline select="CALC">cells
</caseinline><defaultinline>fields</defaultinline></switchinline>.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="102">The language setting ensures that date and currency formats are preserved even when the document is opened in an operating system that uses a different default language setting.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_NUMBERFORMAT_CB_SOURCEFORMAT" id="bm_id3145747" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT" id="bm_id3145747" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155995" role="heading" level="2" l10n="U" oldref="104">Source format</paragraph>
<paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="U" oldref="105"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_NUMBERFORMAT_CB_SOURCEFORMAT">Uses the same number format as the cells containing the data for the chart.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="2" l10n="U" oldref="7">Options</paragraph>
<paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="8">Specify the options for the selected format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS" id="bm_id3151178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS" id="bm_id3151178" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153970" role="heading" level="3" l10n="U" oldref="9">Decimal places</paragraph>
<paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS">Enter the number of decimal places that you want to display.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES" id="bm_id3153106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES" id="bm_id3153106" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3" l10n="U" oldref="11">Leading zeroes</paragraph>
<paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES">Enter the maximum number of zeroes to display in front of the decimal point.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED" id="bm_id3157895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED" id="bm_id3157895" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155131" role="heading" level="3" l10n="U" oldref="13">Negative numbers in red</paragraph>
<paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED">Changes the font color of negative numbers to red.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND" id="bm_id3148645" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND" id="bm_id3148645" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="3" l10n="U" oldref="15">Use thousands separator</paragraph>
<paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND">Inserts a separator between thousands. The type of separator that is used depends on your language settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT" id="bm_id3150961" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT" id="bm_id3150961" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150103" role="heading" level="2" l10n="U" oldref="17">Format code</paragraph>
<paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT">Displays the number format code for the selected format. You can also enter a custom format.</ahelp> The following options are only available for user-defined number formats.</paragraph>
@@ -135,7 +132,7 @@
<paragraph xml-lang="en-US" id="hd_id3153573" role="heading" level="3" l10n="U" oldref="26">Edit Comment</paragraph>
<paragraph xml-lang="en-US" id="par_id3083444" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_NUMBERFORMAT_TBI_INFO">Adds a comment to the selected number format.</ahelp>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT" id="bm_id3154470" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT" id="bm_id3154470" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="3" l10n="U" oldref="95">Name line</paragraph>
<paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="96"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT">Enter a comment for the selected number format, and then click outside this box.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index 567c64a43b..d89091ae99 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020301.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -671,7 +668,7 @@
<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_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - 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>
diff --git a/helpcontent2/source/text/shared/01/05020400.xhp b/helpcontent2/source/text/shared/01/05020400.xhp
index 9517c4fb8b..c4ed42c4eb 100644
--- a/helpcontent2/source/text/shared/01/05020400.xhp
+++ b/helpcontent2/source/text/shared/01/05020400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020400.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0105020400xml" indexer="include" status="PUBLISH">
@@ -65,37 +62,37 @@
</section>
<paragraph role="heading" id="hd_id3147243" xml-lang="en-US" level="2" l10n="U" oldref="12">Hyperlink</paragraph>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="13">Specify the properties for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_CHAR_URL:ED_URL" id="bm_id3148685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_URL" id="bm_id3148685" localize="false"/>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="14">URL</paragraph>
-<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_URL">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame.
+<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_URL">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CHAR_URL:PB_URL" id="bm_id3150771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CHAR_URL:PB_URL" id="bm_id3150771" localize="false"/>
<paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="3" l10n="U" oldref="16">Browse</paragraph>
<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:PUSHBUTTON:TP_CHAR_URL:PB_URL">Locate the file that you want to link to, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_CHAR_URL:ED_TEXT" id="bm_id3159166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_TEXT" id="bm_id3159166" localize="false"/>
<paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="3" l10n="U" oldref="18">Reference</paragraph>
<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_TEXT">Enter the text that you want to display for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CHAR_URL:PB_EVENT" id="bm_id3148491" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_CHAR_URL:PB_EVENT" id="bm_id3148491" localize="false"/>
<paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="28">Events</paragraph>
<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:PUSHBUTTON:TP_CHAR_URL:PB_EVENT">Specify an event that triggers when you click the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_CHAR_URL:ED_NAME" id="bm_id3146847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_CHAR_URL:ED_NAME" id="bm_id3146847" localize="false"/>
<paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
<section id="textname">
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_NAME">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink:</paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="34">&lt;A HREF="http://www.sun.com/" NAME="Nametext" TARGET="_blank"&gt;Note&lt;/A&gt;</paragraph>
+<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="34">&lt;A HREF="http://www.example.com/" NAME="Nametext" TARGET="_blank"&gt;Note&lt;/A&gt;</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_CHAR_URL:LB_TARGET" id="bm_id3146795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_CHAR_URL:LB_TARGET" id="bm_id3146795" localize="false"/>
<paragraph role="heading" id="hd_id3155923" xml-lang="en-US" level="3" l10n="U" oldref="20">Frame</paragraph>
<section id="textframe2">
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="SW:COMBOBOX:TP_CHAR_URL:LB_TARGET">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
+<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="SW:COMBOBOX:TP_CHAR_URL:LB_TARGET">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
</variable></paragraph>
</section>
<paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="2" l10n="U" oldref="22">Character Styles</paragraph>
<paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="23">Specify the formatting options for the hyperlink.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CHAR_URL:LB_VISITED" id="bm_id3148740" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CHAR_URL:LB_VISITED" id="bm_id3148740" localize="false"/>
<paragraph role="heading" id="hd_id3151056" xml-lang="en-US" level="3" l10n="U" oldref="24">Visited links</paragraph>
<paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SW:LISTBOX:TP_CHAR_URL:LB_VISITED">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CHAR_URL:LB_NOT_VISITED" id="bm_id3148676" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CHAR_URL:LB_NOT_VISITED" id="bm_id3148676" localize="false"/>
<paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="26">Unvisited links</paragraph>
<paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SW:LISTBOX:TP_CHAR_URL:LB_NOT_VISITED">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the <emph>Styles and Formatting</emph> icon on the <emph>Formatting</emph> toolbar.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/05020500.xhp b/helpcontent2/source/text/shared/01/05020500.xhp
index 66598e751a..9576dc43a7 100644
--- a/helpcontent2/source/text/shared/01/05020500.xhp
+++ b/helpcontent2/source/text/shared/01/05020500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020500.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,51 +69,51 @@
<paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Set the subscript or superscript options for a character.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_SET_SUPER_SCRIPT" id="bm_id5816078" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_HIGHPOS" id="bm_id3153032" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS" id="bm_id3153032" localize="false"/>
<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="5">Superscript</paragraph>
<paragraph role="paragraph" id="par_id3154750" xml-lang="en-US" l10n="U" oldref="6"><variable id="hochtext"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_HIGHPOS">Reduces the font size of the selected text and raises the text above the baseline.</ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_NORMALPOS" id="bm_id3154897" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS" id="bm_id3154897" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">Normal</paragraph>
<paragraph role="paragraph" id="par_id3155503" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_NORMALPOS">Removes superscript or subscript formatting.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_SET_SUB_SCRIPT" id="bm_id879503" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_LOWPOS" id="bm_id3159157" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS" id="bm_id3159157" localize="false"/>
<paragraph role="heading" id="hd_id3150465" xml-lang="en-US" level="3" l10n="U" oldref="9">Subscript</paragraph>
<paragraph role="paragraph" id="par_id3155420" xml-lang="en-US" l10n="U" oldref="10"><variable id="tieftext"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_LOWPOS">Reduces the font size of the selected text and lowers the text below the baseline.</ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_HIGHLOW" id="bm_id3156152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW" id="bm_id3156152" localize="false"/>
<paragraph role="heading" id="hd_id3148992" xml-lang="en-US" level="3" l10n="U" oldref="11">Raise/lower by</paragraph>
<paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_HIGHLOW">Enter the amount by which you want to raise or to lower the selected text in relation to the baseline. One hundred percent is equal to the height of the font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_FONTSIZE" id="bm_id3156155" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE" id="bm_id3156155" localize="false"/>
<paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="3" l10n="U" oldref="13">Relative font size</paragraph>
<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_FONTSIZE">Enter the amount by which you want to reduce the font size of the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_HIGHLOW" id="bm_id3153666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW" id="bm_id3153666" localize="false"/>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="15">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_HIGHLOW">Automatically sets the amount by which the selected text is raised or lowered in relation to the baseline.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154905" xml-lang="en-US" level="2" l10n="U" oldref="30">Rotation / scaling</paragraph>
<switch select="appl">
<case select="WRITER">
<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="U" oldref="36">Set the rotation and the scaling options for the selected text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_0_DEG" id="bm_id3154347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG" id="bm_id3154347" localize="false"/>
<paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="3" l10n="U" oldref="31">0 degrees</paragraph>
<paragraph role="paragraph" id="par_id3149045" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_0_DEG">Does not rotate the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_90_DEG" id="bm_id3151056" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG" id="bm_id3151056" localize="false"/>
<paragraph role="heading" id="hd_id3156434" xml-lang="en-US" level="3" l10n="U" oldref="32">90 degrees</paragraph>
<paragraph role="paragraph" id="par_id3148739" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_90_DEG">Rotates the selected text to the left by 90 degrees.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_270_DEG" id="bm_id3150792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG" id="bm_id3150792" localize="false"/>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="33">270 degrees</paragraph>
<paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_CHAR_POSITION_RB_270_DEG">Rotates the selected text to the right by 90 degrees.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_FIT_TO_LINE" id="bm_id3157320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE" id="bm_id3157320" localize="false"/>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="34">Fit to line</paragraph>
<paragraph role="paragraph" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_FIT_TO_LINE">Stretches or compresses the selected text so that it fits between the line that is above the text and the line that is below the text.</ahelp></paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_MF_SCALE_WIDTH" id="bm_id3150447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH" id="bm_id3150447" localize="false"/>
<paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="3" l10n="U" oldref="35">Scale width</paragraph>
<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_MF_SCALE_WIDTH">Enter the percentage of the font width by which to horizontally stretch or compress the selected text.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="2" l10n="U" oldref="17">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="18">Specify the spacing between individual characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_POSITION_LB_KERNING2" id="bm_id3153968" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2" id="bm_id3153968" localize="false"/>
<paragraph role="heading" id="hd_id3125865" xml-lang="en-US" level="3" l10n="U" oldref="19">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_POSITION_LB_KERNING2">Specifies the spacing between the characters of the selected text. For expanded or condensed spacing, enter the amount that you want to expand or condense the text in the <emph>by </emph>box.</ahelp></paragraph>
<list type="unordered">
@@ -133,10 +130,10 @@
<emph>Condensed</emph> - decreases the character spacing</paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_KERNING2" id="bm_id3150103" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2" id="bm_id3150103" localize="false"/>
<paragraph role="heading" id="hd_id3157870" xml-lang="en-US" level="3" l10n="U" oldref="25">by</paragraph>
<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_CHAR_POSITION_ED_KERNING2">Enter the amount by which you want to expand or condense the character spacing for the selected text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_PAIRKERNING" id="bm_id3153095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING" id="bm_id3153095" localize="false"/>
<paragraph role="heading" id="hd_id3154127" xml-lang="en-US" level="3" l10n="U" oldref="27"><link href="text/shared/00/00000005.xhp#kerning" name="Pair kerning">Pair kerning</link></paragraph>
<paragraph role="paragraph" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_POSITION_CB_PAIRKERNING">Automatically adjust the character spacing for specific letter combinations.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="29">Kerning is only available for certain font types and requires that your printer support this option.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020600.xhp b/helpcontent2/source/text/shared/01/05020600.xhp
index 5c2d3a4fd0..c5f8a16bb2 100755
--- a/helpcontent2/source/text/shared/01/05020600.xhp
+++ b/helpcontent2/source/text/shared/01/05020600.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020600.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,15 +56,15 @@
</section>
<paragraph role="heading" id="hd_id3152552" xml-lang="en-US" level="2" l10n="U" oldref="3">Double-lined</paragraph>
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">Set the double-line options for the selected text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_TWOLINES_CB_TWOLINES" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES" id="bm_id3154318" localize="false"/>
<paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="5">Write in double lines</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_TWOLINES_CB_TWOLINES">Allows you to write in double lines in the area that you selected in the current document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3157959" xml-lang="en-US" level="2" l10n="U" oldref="7">Enclosing characters</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="8">Specify the characters to enclose the double-lined area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_STARTBRACKET" id="bm_id3147620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET" id="bm_id3147620" localize="false"/>
<paragraph role="heading" id="hd_id3148539" xml-lang="en-US" level="3" l10n="U" oldref="9">Initial character</paragraph>
<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_STARTBRACKET">Select the character to define the start of the double-lined area. If you want to choose a custom character, select <emph>Other Characters</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_ENDBRACKET" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET" id="bm_id3159158" localize="false"/>
<paragraph role="heading" id="hd_id3159115" xml-lang="en-US" level="3" l10n="U" oldref="11">Final character</paragraph>
<paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_TWOLINES_ED_ENDBRACKET">Select the character to define the end of the double-lined area. If you want to choose a custom character, select <emph>Other Characters</emph>.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05020700.xhp b/helpcontent2/source/text/shared/01/05020700.xhp
index 1a4145d727..ddd710aa6c 100755
--- a/helpcontent2/source/text/shared/01/05020700.xhp
+++ b/helpcontent2/source/text/shared/01/05020700.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020700.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,23 +46,23 @@
<bookmark_value>paragraphs; Asian typography</bookmark_value>
<bookmark_value>typography; Asian</bookmark_value>
</bookmark><comment>MW changed "formats;" to "formatting;"</comment><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020700.xhp" name="Asian Typography">Asian Typography</link></paragraph>
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled</emph> box in the <emph>Asian language support </emph>area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
+<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Language Settings - Languages</emph> in the Options dialog box, and then select the <emph>Enabled</emph> box in the <emph>Asian language support</emph> area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#asitypo"/>
</section>
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="3">Line change</paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="4">Set the options for line breaks in Asian language documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="9">Apply list of forbidden characters to the beginning and end of line</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line. To edit the list of restricted characters, choose <emph>Tools - Options - Language Settings - </emph><link href="text/shared/optionen/01150100.xhp" name="Asian Layout"><emph>Asian Layout</emph></link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow hanging punctuation</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="9">Apply list of forbidden characters to the beginning and end of line</paragraph>
+<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line.</ahelp> To edit the list of restricted characters, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - <link href="text/shared/optionen/01150100.xhp" name="Asian Layout">Asian Layout</link></emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow hanging punctuation</paragraph>
<paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC">Prevents commas and periods from breaking the line. Instead, these characters are added to the end of the line, even in the page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE" id="bm_id3149811" localize="false"/><paragraph role="heading" id="par_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE" id="bm_id3149811" localize="false"/><paragraph role="heading" id="par_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">
<emph>Apply spacing between Asian, Latin and Complex text</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE">Inserts a space between Asian, Latin and complex characters.</ahelp></paragraph>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="C"><link href="text/shared/01/05020700.xhp" name="Enabling Asian language support">Enabling Asian language support</link></paragraph>
+<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01140000.xhp" name="Enabling Asian language support">Enabling Asian language support</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05030000.xhp b/helpcontent2/source/text/shared/01/05030000.xhp
index 01820b9d0a..38813badae 100644
--- a/helpcontent2/source/text/shared/01/05030000.xhp
+++ b/helpcontent2/source/text/shared/01/05030000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05030100.xhp b/helpcontent2/source/text/shared/01/05030100.xhp
index 9cd75a17cd..26b92a23b1 100644
--- a/helpcontent2/source/text/shared/01/05030100.xhp
+++ b/helpcontent2/source/text/shared/01/05030100.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030100.xhp,v $
- * $Revision: 1.16 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,53 +29,62 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105030100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Indents and Spacing</title>
-<filename>/text/shared/01/05030100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einzuege">
+ <topic id="textshared0105030100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Indents and Spacing</title>
+ <filename>/text/shared/01/05030100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="einzuege">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154689"><bookmark_value>spacing; between paragraphs in footnotes</bookmark_value>
-<bookmark_value>line spacing; paragraph</bookmark_value>
-<bookmark_value>spacing; lines and paragraphs</bookmark_value>
-<bookmark_value>single-line spacing in text</bookmark_value>
-<bookmark_value>one and a half line spacing in text</bookmark_value>
-<bookmark_value>double-line spacing in paragraphs</bookmark_value>
-<bookmark_value>leading between paragraphs</bookmark_value>
-<bookmark_value>paragraphs;spacing</bookmark_value>
+ <bookmark_value>line spacing; paragraph</bookmark_value>
+ <bookmark_value>spacing; lines and paragraphs</bookmark_value>
+ <bookmark_value>single-line spacing in text</bookmark_value>
+ <bookmark_value>one and a half line spacing in text</bookmark_value>
+ <bookmark_value>double-line spacing in paragraphs</bookmark_value>
+ <bookmark_value>leading between paragraphs</bookmark_value>
+ <bookmark_value>paragraphs;spacing</bookmark_value>
</bookmark><comment>mw deleted "footnote spacings" and added "paragraphs;spacing"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_STD" id="bm_id3145138" localize="false"/><paragraph role="heading" id="hd_id3154689" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030100.xhp" name="Indents and Spacing">Indents and Spacing</link></paragraph>
-<paragraph role="paragraph" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_STD">Sets the indenting and the spacing options for the paragraph.</ahelp></paragraph>
-</section>
-<paragraph role="note" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="64">To change the measurement units used in this dialog, choose Tools - Options - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_STD" id="bm_id3145138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154689" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030100.xhp" name="Indents and Spacing">Indents and Spacing</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155069" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_STD">Sets the indenting and the spacing options for the paragraph.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3153910" role="note" l10n="U" oldref="64">To change the measurement units used in this dialog, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="11">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <emph>View - Ruler</emph>.</paragraph>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3154823" role="tip" l10n="CHG" oldref="11">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <emph>View - Ruler</emph>.</paragraph>
</case>
</switch>
<section id="howtoget">
-<embed href="text/shared/00/00040500.xhp#einzug"/>
-</section>
-<paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="2" l10n="U" oldref="3">Indent</paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="4">Specify the amount of space to leave between the left and the right page margins and the paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3153698" xml-lang="en-US" level="3" l10n="U" oldref="5">Before text</paragraph>
-<paragraph role="paragraph" id="par_id3148990" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the left edge of the paragraph is indented with respect to the left page margin. In Right-to-Left languages, the right edge of the paragraph is indented with respect to the right page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT" id="bm_id3149656" localize="false"/><paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="3" l10n="U" oldref="9">After text</paragraph>
-<paragraph role="paragraph" id="par_id3154390" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the right edge of the paragraph is indented with respect to the right page margin. In Right-to-Left languages, the left edge of the paragraph is indented with respect to the left page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT" id="bm_id3144762" localize="false"/><paragraph role="heading" id="hd_id3149169" xml-lang="en-US" level="3" l10n="U" oldref="7">First line</paragraph>
-<paragraph role="paragraph" id="par_id3150651" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT">Indents the first line of a paragraph by the amount that you enter. To create a hanging indent enter a positive value for "Before text" and a negative value for "First line". To indent the first line of a paragraph that uses numbering or bullets, choose "Format - Bullets and Numbering", click the <emph>Position</emph> tab, and then enter an amount in the "Minimum space numbering &lt;-&gt; text" box.</ahelp><comment>UFI: for complicated UI names, prefer quotes rather than emph tags for the Extended Help text because the yellow bubbles currently don't know any formatting</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO" id="bm_id3155994" localize="false"/><paragraph role="heading" id="hd_id3150288" xml-lang="en-US" level="3" l10n="U" oldref="52"><switchinline select="appl"><caseinline select="WRITER">Automatic
+ <embed href="text/shared/00/00040500.xhp#einzug"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3158430" role="heading" level="2" l10n="U" oldref="3">Indent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="4">Specify the amount of space to leave between the left and the right page margins and the paragraph.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT" id="bm_id3154898" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153698" role="heading" level="2" l10n="U" oldref="5">Before text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148990" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the left edge of the paragraph is indented with respect to the left page margin. In Right-to-Left languages, the right edge of the paragraph is indented with respect to the right page margin.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT" id="bm_id3149656" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152361" role="heading" level="2" l10n="U" oldref="9">After text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154390" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT">Enter the amount of space that you want to indent the paragraph from the page margin. If you want the paragraph to extend into the page margin, enter a negative number. In Left-to-Right languages, the right edge of the paragraph is indented with respect to the right page margin. In Right-to-Left languages, the left edge of the paragraph is indented with respect to the left page margin.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT" id="bm_id3144762" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149169" role="heading" level="2" l10n="U" oldref="7">First line</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150651" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT">Indents the first line of a paragraph by the amount that you enter. To create a hanging indent enter a positive value for "Before text" and a negative value for "First line". To indent the first line of a paragraph that uses numbering or bullets, choose "<link href="text/shared/01/06050600.xhp">Format - Bullets and Numbering - Position</link>".</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO" id="bm_id3155994" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150288" role="heading" level="2" l10n="U"
+ oldref="52"><switchinline select="appl"><caseinline select="WRITER">Automatic
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="CHG" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO">Automatically indents a paragraph according to the font size and the line spacing. The setting in the <emph>First Line </emph>box is ignored.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="CHG" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO">Automatically indents a paragraph according to the font size and the line spacing. The setting in the <emph>First Line </emph>box is ignored.</ahelp>
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3157894" xml-lang="en-US" level="2" l10n="U" oldref="22">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="23">Specify the amount of space to leave between selected paragraphs.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST" id="bm_id3147350" localize="false"/><paragraph role="heading" id="hd_id3147216" xml-lang="en-US" level="3" l10n="U" oldref="24">Above paragraph</paragraph>
-<paragraph role="paragraph" id="par_id3146148" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST">Enter the amount of space that you want to leave above the selected paragraph(s).</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3157894" role="heading" level="2" l10n="U"
+ oldref="22">Spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="23">Specify the amount of space to leave between selected paragraphs.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST" id="bm_id3147350" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147216" role="heading" level="2" l10n="U"
+ oldref="24">Above paragraph</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST">Enter the amount of space that you want to leave above the selected paragraph(s).</ahelp></paragraph>
<switch select="appl">
<case select="DRAW"><embed href="text/shared/00/00000007.xhp#textobjektleiste"/>
</case>
@@ -104,45 +109,63 @@
<case select="IMPRESS"><embed href="text/shared/02/03120000.xhp#syabstandvermindern"/>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST" id="bm_id3154921" localize="false"/><paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="U" oldref="26">Below paragraph</paragraph>
-<paragraph role="paragraph" id="par_id3163822" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST">Enter the amount of space that you want to leave below the selected paragraph(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST" id="bm_id3153095" localize="false"/><paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="2" l10n="U" oldref="28">Line spacing</paragraph>
-<paragraph role="paragraph" id="par_id3146985" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST">Specify the amount of space to leave between lines of text in a paragraph.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146923" xml-lang="en-US" level="3" l10n="U" oldref="30">Single</paragraph>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="31"><variable id="einzeiligtext">Applies single line spacing to the current paragraph. This is the default setting.
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST" id="bm_id3154921" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145590" role="heading" level="2" l10n="U"
+ oldref="26">Below paragraph</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163822" role="paragraph" l10n="U" oldref="27"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST">Enter the amount of space that you want to leave below the selected paragraph(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST" id="bm_id3153095" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156441" role="heading" level="2" l10n="U"
+ oldref="28">Line spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146985" role="paragraph" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST">Specify the amount of space to leave between lines of text in a paragraph.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3146923" role="heading" level="2" l10n="U"
+ oldref="30">Single</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150011" role="paragraph" l10n="U" oldref="31"><variable id="einzeiligtext">Applies single line spacing to the current paragraph. This is the default setting.
</variable></paragraph>
-<paragraph role="heading" id="hd_id3148500" xml-lang="en-US" level="3" l10n="U" oldref="33">1.5 lines</paragraph>
-<paragraph role="paragraph" id="par_id3150094" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="eineinhalbzeiligtext">Sets the line spacing to 1.5 lines.
+ <paragraph xml-lang="en-US" id="hd_id3148500" role="heading" level="2" l10n="U"
+ oldref="33">1.5 lines</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150094" role="paragraph" l10n="CHG" oldref="34"><variable id="eineinhalbzeiligtext">Sets the line spacing to 1.5 lines.
</variable></paragraph>
-<paragraph role="heading" id="hd_id3149378" xml-lang="en-US" level="3" l10n="U" oldref="36">Double</paragraph>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="CHG" oldref="37"><variable id="zweizeiligtext">Sets the line spacing to two lines.
+ <paragraph xml-lang="en-US" id="hd_id3149378" role="heading" level="2" l10n="U"
+ oldref="36">Double</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154512" role="paragraph" l10n="CHG" oldref="37"><variable id="zweizeiligtext">Sets the line spacing to two lines.
</variable></paragraph>
-<paragraph role="heading" id="hd_id3151206" xml-lang="en-US" level="3" l10n="U" oldref="39">Proportional</paragraph>
-<paragraph role="paragraph" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="40">Select this option and then enter a percentage value in the box, where 100% corresponds to single line spacing.</paragraph>
-<paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="41">At Least</paragraph>
-<paragraph role="paragraph" id="par_id3157965" xml-lang="en-US" l10n="U" oldref="42">Sets the minimum line spacing to the value that you enter in the box.</paragraph>
-<paragraph role="tip" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="47">If you use different font sizes within a paragraph, the line spacing is automatically adjusted to the largest font size. If you prefer to have identical spacing for all lines, specify a value in <emph>At least</emph> that corresponds to the largest font size.</paragraph>
-<paragraph role="heading" id="hd_id3153927" xml-lang="en-US" level="3" l10n="U" oldref="43">Leading</paragraph>
-<paragraph role="paragraph" id="par_id3153354" xml-lang="en-US" l10n="U" oldref="44">Sets the height of the vertical space that is inserted between two lines.</paragraph>
-<paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3" l10n="U" oldref="54"><switchinline select="appl"><caseinline select="WRITER">Fixed
+ <paragraph xml-lang="en-US" id="hd_id3151206" role="heading" level="2" l10n="U"
+ oldref="39">Proportional</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147494" role="paragraph" l10n="U" oldref="40">Select this option and then enter a percentage value in the box, where 100% corresponds to single line spacing.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156332" role="heading" level="2" l10n="U"
+ oldref="41">At Least</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="42">Sets the minimum line spacing to the value that you enter in the box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150744" role="tip" l10n="U" oldref="47">If you use different font sizes within a paragraph, the line spacing is automatically adjusted to the largest font size. If you prefer to have identical spacing for all lines, specify a value in <emph>At least</emph> that corresponds to the largest font size.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153927" role="heading" level="2" l10n="U"
+ oldref="43">Leading</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153354" role="paragraph" l10n="U" oldref="44">Sets the height of the vertical space that is inserted between two lines.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155443" role="heading" level="2" l10n="U"
+ oldref="54"><switchinline select="appl"><caseinline select="WRITER">Fixed
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Sets the line spacing to exactly match the value that you enter in the box. This can result in cropped characters.
+ <paragraph xml-lang="en-US" id="par_id3153711" role="paragraph" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Sets the line spacing to exactly match the value that you enter in the box. This can result in cropped characters.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT" id="bm_id3147582" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC" id="bm_id3147338" localize="false"/><paragraph role="heading" id="hd_id3156383" xml-lang="en-US" level="3" l10n="U" oldref="45">of</paragraph>
-<paragraph role="paragraph" id="par_id3154304" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC">Enter the value to use for the line spacing.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<paragraph role="heading" id="hd_id3154965" xml-lang="en-US" level="2" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="WRITER">Register-true
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT" id="bm_id3147582" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC" id="bm_id3147338" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156383" role="heading" level="2" l10n="U"
+ oldref="45">of</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154304" role="paragraph" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC">Enter the value to use for the line spacing.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+ <paragraph xml-lang="en-US" id="hd_id3154965" role="heading" level="2" l10n="U"
+ oldref="48"><switchinline select="appl"><caseinline select="WRITER">Register-true
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3146316" xml-lang="en-US" level="3" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Activate
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER" id="bm_id3147344" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146316" role="heading" level="2" l10n="U"
+ oldref="50"><switchinline select="appl"><caseinline select="WRITER">Activate
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156315" xml-lang="en-US" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER">Aligns the baseline of each line of text to a vertical document grid, so that each line is the same height. To use this feature, you must first activate the <emph>Register-true </emph>option for the current page style. To do this, choose <emph>Format - Page</emph>, click on the <emph>Page </emph>tab, and then select the<emph> Register-true</emph> box in the<emph> Layout settings</emph> area.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3156315" role="paragraph" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER">Aligns the baseline of each line of text to a vertical document grid, so that each line is the same height. To use this feature, you must first activate the <emph>Register-true </emph>option for the current page style. To do this, choose <emph>Format - Page</emph>, click on the <emph>Page </emph>tab, and then select the<emph> Register-true</emph> box in the<emph> Layout settings</emph> area.</ahelp>
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="WRITER"><section id="relatedtopics">
-<embed href="text/swriter/guide/indenting.xhp#indenting"/>
-<paragraph role="paragraph" id="par_id9267250" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/registertrue.xhp" name="Writing Register-true">Writing Register-true</link></paragraph>
-</section>
+<case select="WRITER">
+<section id="relatedtopics">
+ <embed href="text/swriter/guide/indenting.xhp#indenting"/>
+ <paragraph xml-lang="en-US" id="par_id9267250" role="paragraph" l10n="NEW"><link href="text/swriter/guide/registertrue.xhp" name="Writing Register-true">Writing Register-true</link></paragraph>
+ </section>
</case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05030300.xhp b/helpcontent2/source/text/shared/01/05030300.xhp
index f7a10320e8..14aad13b3a 100755
--- a/helpcontent2/source/text/shared/01/05030300.xhp
+++ b/helpcontent2/source/text/shared/01/05030300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030300.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,52 +51,52 @@
<section id="howtoget">
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER" id="bm_id3153057" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<embed href="text/shared/00/00000001.xhp#loeschen1"/>
diff --git a/helpcontent2/source/text/shared/01/05030500.xhp b/helpcontent2/source/text/shared/01/05030500.xhp
index d81485a1ac..1b4b4c918c 100644
--- a/helpcontent2/source/text/shared/01/05030500.xhp
+++ b/helpcontent2/source/text/shared/01/05030500.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030500.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,22 +61,22 @@
<paragraph role="paragraph" id="par_id3148643" xml-lang="en-US" l10n="CHG" oldref="5">If you are in a table or spreadsheet, you can also add or remove predefined borders. Use the <emph>Borders</emph> icon on the <emph>Table Bar</emph>.</paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/02/03130000.xhp#syumrandung"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINESTYLE" id="bm_id3153896" localize="false"/><paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2" l10n="U" oldref="23">Line</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE" id="bm_id3153896" localize="false"/><paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2" l10n="U" oldref="23">Line</paragraph>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINESTYLE">Click the border style that you want to apply. The style is applied to the borders selected in the preview.</ahelp></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/02/03140000.xhp#sylinienstil"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINECOLOR" id="bm_id3154072" localize="false"/><paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINECOLOR">Select the line color that you want to use for the selected border(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR" id="bm_id3154072" localize="false"/><paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_LINECOLOR">Select the line color that you want to use for the selected border(s).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="2" l10n="U" oldref="21">Spacing to contents</paragraph>
<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="22">Specify the amount of space that you want to leave between the border and the contents of the selection.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_LEFT" id="bm_id3154819" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3" l10n="U" oldref="45">Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT" id="bm_id3154819" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3" l10n="U" oldref="45">Left</paragraph>
<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_LEFT">Enter the distance that you want to have between the left border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_RIGHT" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3150650" xml-lang="en-US" level="3" l10n="U" oldref="47">Right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3150650" xml-lang="en-US" level="3" l10n="U" oldref="47">Right</paragraph>
<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_RIGHT">Enter the distance that you want to have between the right border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_TOP" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Top</paragraph>
<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_TOP">Enter the distance that you want to have between the top border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_BOTTOM" id="bm_id3148451" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="CHG" oldref="51">Bottom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM" id="bm_id3148451" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="CHG" oldref="51">Bottom</paragraph>
<paragraph role="paragraph" id="par_id3158410" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BORDER_MF_BOTTOM">Enter the distance that you want to have between the bottom border and the contents of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_BORDER_CB_SYNC" id="bm_id3157893" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="U" oldref="53">Synchronize</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC" id="bm_id3157893" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="U" oldref="53">Synchronize</paragraph>
<paragraph role="paragraph" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_BORDER_CB_SYNC">Applies the same <emph>spacing to contents</emph> setting to all four borders when you enter a new distance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155855"><bookmark_value>shadows; borders</bookmark_value>
<bookmark_value>borders; shadows</bookmark_value>
@@ -90,16 +87,16 @@
<paragraph role="note" id="par_id3157309" xml-lang="en-US" l10n="U" oldref="43">Graphics or objects that are anchored to a frame in the document cannot exceed the size of the frame. If you apply a shadow to the borders of an object that fills an entire frame, the size of the object is reduced to display the shadows.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BORDER_CTL_SHADOWS" id="bm_id3154321" localize="false"/><paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="33">Position</paragraph>
<paragraph role="paragraph" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_BORDER_CTL_SHADOWS">Click a shadow style for the selected borders.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_BORDER:ED_SHADOWSIZE" id="bm_id3152576" localize="false"/><paragraph role="heading" id="hd_id3156444" xml-lang="en-US" level="3" l10n="U" oldref="35">Distance</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE" id="bm_id3152576" localize="false"/><paragraph role="heading" id="hd_id3156444" xml-lang="en-US" level="3" l10n="U" oldref="35">Distance</paragraph>
<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_BORDER:ED_SHADOWSIZE">Enter the width of the shadow.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR" id="bm_id3152463" localize="false"/><paragraph role="heading" id="hd_id3155307" xml-lang="en-US" level="3" l10n="U" oldref="37">Color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR" id="bm_id3152463" localize="false"/><paragraph role="heading" id="hd_id3155307" xml-lang="en-US" level="3" l10n="U" oldref="37">Color</paragraph>
<paragraph role="paragraph" id="par_id3146147" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR">Select a color for the shadow.</ahelp></paragraph>
<switch select="appl">
<case select="WRITER"><paragraph role="heading" id="par_idN10A2B" xml-lang="en-US" level="2" l10n="CHG">Properties</paragraph>
<paragraph role="paragraph" id="par_idN10A2F" xml-lang="en-US" l10n="CHG">Specifies the properties for the current paragraph or the selected paragraphs.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_BORDER_CB_MERGEWITHNEXT" id="bm_id177312" localize="false"/><paragraph role="heading" id="par_idN10A3A" xml-lang="en-US" level="3" l10n="CHG">Merge with next paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT" id="bm_id177312" localize="false"/><paragraph role="heading" id="par_idN10A3A" xml-lang="en-US" level="3" l10n="CHG">Merge with next paragraph</paragraph>
<paragraph role="paragraph" id="par_idN10A3E" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT">Merges the border style and the shadow style of the current paragraph with the next paragraph.</ahelp> These styles are only merged if the indent, border, and shadow styles of the next paragraph are the same as the current paragraph. This option is also available for Paragraph Styles.<comment>UFI: see spec "spec-merge-borders-and-shadow"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_BORDER_CB_MERGEADJACENTBORDERS" id="bm_id678731" localize="false"/><paragraph role="heading" id="par_idN109BA" xml-lang="en-US" level="3" l10n="NEW">Merge adjacent line styles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEADJACENTBORDERS" id="bm_id678731" localize="false"/><paragraph role="heading" id="par_idN109BA" xml-lang="en-US" level="3" l10n="NEW">Merge adjacent line styles</paragraph>
<paragraph role="paragraph" id="par_idN109BE" xml-lang="en-US" l10n="NEW"><ahelp hid="700793922">Merges two different border styles of adjacent cells in a Writer table into one border style. This property is valid for a whole table in a Writer document.</ahelp></paragraph>
<paragraph role="note" id="par_idN109C1" xml-lang="en-US" l10n="NEW">The rules can be condensed to the statement that the stronger attribute wins. If, for example, one cell has a red border of 2 point width, and the adjacent cell has a blue border of 3 point width, then the common border between these two cells will be blue with 3 point width.<comment>UFI: see spec "collapsing_table_borders"</comment></paragraph>
</case>
diff --git a/helpcontent2/source/text/shared/01/05030600.xhp b/helpcontent2/source/text/shared/01/05030600.xhp
index 4648a08ede..18aed6e477 100644
--- a/helpcontent2/source/text/shared/01/05030600.xhp
+++ b/helpcontent2/source/text/shared/01/05030600.xhp
@@ -1,16 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 05030600.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -29,23 +27,18 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
-
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105030600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Background</title>
-<filename>/text/shared/01/05030600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T13:47:54">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hintergrund">
+ <topic id="textshared0105030600xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Background</title>
+ <filename>/text/shared/01/05030600.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="hintergrund">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151097"><bookmark_value>frames; backgrounds</bookmark_value>
<bookmark_value>backgrounds; frames/sections/indexes</bookmark_value>
<bookmark_value>sections; backgrounds</bookmark_value>
@@ -54,77 +47,89 @@
<bookmark_value>headers;backgrounds</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND" id="bm_id3147000" localize="false"/>
-<paragraph role="heading" id="hd_id3151097" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030600.xhp" name="Background">Background</link></paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_BACKGROUND">Set the background color or graphic.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="34">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, text frames, tables, table cells, sections, and indexes.
-</caseinline><caseinline select="CALC">cells and pages.
+<paragraph xml-lang="en-US" id="hd_id3151097" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030600.xhp" name="Background">Background</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_BACKGROUND">Set the background color or graphic.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3147653" role="paragraph" l10n="U" oldref="34">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, text frames, tables, table cells, sections, and indexes.
+</caseinline><caseinline select="CALC">cells and pages.
</caseinline></switchinline></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#hintergrund"/>
-</section>
-<embed href="text/shared/guide/background.xhp#background"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR" id="bm_id3153321" localize="false"/>
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="2" l10n="U" oldref="4">As</paragraph>
-<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR">Select the type of background that you want to apply.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="2" l10n="U" oldref="7">Using a Color as a Background</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#hintergrund"/>
+ </section>
+ <embed href="text/shared/guide/background.xhp#background"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR" id="bm_id3153321" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="2" l10n="U" oldref="4">As</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154380" role="paragraph" l10n="U" oldref="5"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR">Select the type of background that you want to apply.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151245" role="heading" level="2" l10n="U" oldref="7">Using a Color as a Background</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_BGDCOLORSET" id="bm_id3159414" localize="false"/>
-<paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="2" l10n="U" oldref="8">Color Background</paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
-<embed href="text/shared/00/00000007.xhp#objektleiste"/>
-<embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
-<embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
-<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS" id="bm_id3150400" localize="false"/>
-<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="37"><switchinline select="appl"><caseinline select="WRITER">Transparency
+<paragraph xml-lang="en-US" id="hd_id3148946" role="heading" level="3" l10n="U" oldref="8">Color Background</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152361" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
+
+ <embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
+ <embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
+ <embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_COL_TRANS" id="bm_id3150400" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="3" l10n="U"
+ oldref="37"><switchinline select="appl"><caseinline select="WRITER">Transparency
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="note" id="par_idN107A4" xml-lang="en-US" l10n="NEW">Background transparency can be set only for frames.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107A4" role="note" l10n="NEW">Background transparency can be set only for frames.</paragraph>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS">Set the transparency for the background color or graphic of a frame, where 100% is completely transparent and 0% is opaque. When you increase the transparency of the background, the underlying text or objects become visible through the background of the frame.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3150358" role="paragraph" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS">Set the transparency for the background color or graphic of a frame, where 100% is completely transparent and 0% is opaque. When you increase the transparency of the background, the underlying text or objects become visible through the background of the frame.</ahelp>
</caseinline></switchinline></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX" id="bm_id3147228" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX" id="bm_id3153352" localize="false"/>
-<paragraph role="heading" id="hd_id3154216" xml-lang="en-US" level="2" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="WRITER">For
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX" id="bm_id3147228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX" id="bm_id3153352" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154216" role="heading" level="3" l10n="U"
+ oldref="11"><switchinline select="appl"><caseinline select="WRITER">For
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX">Select the area that you want to apply the background color to.</ahelp> For example, when you define the background color for a table, you can choose to apply it to the table, the active cell, the row, or the column.
+ <paragraph xml-lang="en-US" id="par_id3145419" role="paragraph" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX">Select the area that you want to apply the background color to.</ahelp> For example, when you define the background color for a table, you can choose to apply it to the table, the active cell, the row, or the column.
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="note" id="par_id3150497" xml-lang="en-US" l10n="U" oldref="13">This option is only available when you edit the background of a table or a paragraph style.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150497" role="note" l10n="U" oldref="13">This option is only available when you edit the background of a table or a paragraph style.</paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="2" l10n="U" oldref="14">Using a Graphic as a Background</paragraph>
-<paragraph role="heading" id="hd_id3149983" xml-lang="en-US" level="2" l10n="U" oldref="15">File</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="16">Contains information about the graphic file.</paragraph>
-<paragraph role="heading" id="hd_id3145592" xml-lang="en-US" level="3" l10n="U" oldref="17">Display field</paragraph>
-<paragraph role="paragraph" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="18">Shows the path for the graphic file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK" id="bm_id3145264" localize="false"/>
-<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="19">Link</paragraph>
-<paragraph role="paragraph" id="par_id3154150" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK">Links to or embeds the graphic file in the current file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW" id="bm_id3159196" localize="false"/>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW">Displays or hides a preview of the selected graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE" id="bm_id3153095" localize="false"/>
-<paragraph role="heading" id="hd_id3154472" xml-lang="en-US" level="3" l10n="U" oldref="23">Browse</paragraph>
-<paragraph role="paragraph" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE">Locate the graphic file that you want to use as a background, and then click <emph>Open</emph>.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="25">Type</paragraph>
-<paragraph role="paragraph" id="par_id3147442" xml-lang="en-US" l10n="U" oldref="26">Specify the way that you want to display the background graphic.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153056" role="heading" level="2" l10n="U"
+ oldref="14">Using a Graphic as a Background</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149983" role="heading" level="3" l10n="U"
+ oldref="15">File</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="16">Contains information about the graphic file.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145592" role="heading" level="3" l10n="U"
+ oldref="17">Display field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154920" role="paragraph" l10n="U" oldref="18">Shows the path for the graphic file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK" id="bm_id3145264" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145272" role="heading" level="3" l10n="U"
+ oldref="19">Link</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="CHG" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK">Links to or embeds the graphic file in the current file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW" id="bm_id3159196" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155366" role="heading" level="3" l10n="U"
+ oldref="21">Preview</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147426" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW">Displays or hides a preview of the selected graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE" id="bm_id3153095" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154472" role="heading" level="3" l10n="U"
+ oldref="23">Browse</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153951" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE">Locate the graphic file that you want to use as a background, and then click <emph>Open</emph>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="3" l10n="U"
+ oldref="25">Type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147442" role="paragraph" l10n="U" oldref="26">Specify the way that you want to display the background graphic.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_POSITION" id="bm_id3083445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION" id="bm_id3156062" localize="false"/>
-<paragraph role="heading" id="hd_id3153366" xml-lang="en-US" level="3" l10n="U" oldref="27">Position</paragraph>
-<paragraph role="paragraph" id="par_id3153741" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION">Select this option, and then click a location in the position grid.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA" id="bm_id3146146" localize="false"/>
-<paragraph role="heading" id="hd_id3156005" xml-lang="en-US" level="3" l10n="U" oldref="29">Area</paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA">Stretches the graphic to fill the entire background of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE" id="bm_id3153138" localize="false"/>
-<paragraph role="heading" id="hd_id3145663" xml-lang="en-US" level="3" l10n="U" oldref="32">Tile</paragraph>
-<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE">Repeats the graphic so that it covers the entire background of the selected object.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION" id="bm_id3156062" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153366" role="heading" level="3" l10n="U"
+ oldref="27">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153741" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION">Select this option, and then click a location in the position grid.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA" id="bm_id3146146" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156005" role="heading" level="3" l10n="U"
+ oldref="29">Area</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152596" role="paragraph" l10n="U" oldref="30"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA">Stretches the graphic to fill the entire background of the selected object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE" id="bm_id3153138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145663" role="heading" level="3" l10n="U"
+ oldref="32">Tile</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149481" role="paragraph" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE">Repeats the graphic so that it covers the entire background of the selected object.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/HID_POPUP_COLOR_CTRL" id="bm_id3151075" localize="false"/>
-<paragraph role="paragraph" id="par_id3151114" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_POPUP_COLOR_CTRL" visibility="hidden">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3151114" role="paragraph" l10n="U" oldref="35"><ahelp hid="." visibility="hidden">Click a color. Click No Fill to remove a background or highlighting color. Click Automatic to reset a font color.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05030700.xhp b/helpcontent2/source/text/shared/01/05030700.xhp
index dc6de00788..faeeb4e2ae 100755
--- a/helpcontent2/source/text/shared/01/05030700.xhp
+++ b/helpcontent2/source/text/shared/01/05030700.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030700.xhp,v $
- * $Revision: 1.14.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,56 +56,56 @@
</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>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN" id="bm_id3155941" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN" id="bm_id3155941" localize="false"/>
<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="3" l10n="U" oldref="5">Left</paragraph>
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="6"><variable id="linkstext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN">Aligns the paragraph to the left page margin.</ahelp>
</variable> If Asian language support is enabled, this option is named Left/Top.</paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00040502.xhp#sylinksbuendig"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN" id="bm_id3150465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN" id="bm_id3150465" localize="false"/>
<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="3" l10n="U" oldref="7">Right</paragraph>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="8"><variable id="rechtstext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN">Aligns the paragraph to the right page margin.</ahelp>
</variable> If Asian language support is enabled, this option is named Right/Bottom.</paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00040502.xhp#syrechtsbuendig"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN" id="bm_id3155179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN" id="bm_id3155179" localize="false"/>
<paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="3" l10n="U" oldref="9">Centered</paragraph>
<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="10"><variable id="zentrierttext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN">Centers the contents of the paragraph on the page.</ahelp>
</variable></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00040502.xhp#syzentriert"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN" id="bm_id3159270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN" id="bm_id3159270" localize="false"/>
<paragraph role="heading" id="hd_id3149415" xml-lang="en-US" level="3" l10n="U" oldref="11">Justify</paragraph>
<paragraph role="paragraph" id="par_id3152474" xml-lang="en-US" l10n="U" oldref="12"><variable id="blocksatztext"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN">Aligns the paragraph to the left and to the right page margins.</ahelp>
</variable></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00040502.xhp#syblocksatz"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE" id="bm_id3153896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE" id="bm_id3153896" localize="false"/>
<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Last Line
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE">Specify the alignment for the last line in the paragraph.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND" id="bm_id3150542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND" id="bm_id3150542" localize="false"/>
<paragraph role="heading" id="hd_id3154936" xml-lang="en-US" level="3" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">Expand single word
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND">If the last line of a justified paragraph consists of one word, the word is stretched to the width of the paragraph.</ahelp>
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER"><embed href="text/shared/00/00000007.xhp#asia"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP" id="bm_id3154123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP" id="bm_id3154123" localize="false"/>
<paragraph role="heading" id="hd_id3150495" xml-lang="en-US" level="3" l10n="U" oldref="22">Snap to text grid (if active)<comment>UFI: asian enabled</comment></paragraph>
<paragraph role="paragraph" id="par_id3154331" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP">Aligns the paragraph to a text grid. To activate the text grid, choose <link href="text/swriter/01/05040800.xhp" name="Format - Page - Text Grid"><emph>Format - Page - Text Grid</emph></link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_VERTALIGN" id="bm_id3384807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN" id="bm_id3384807" localize="false"/>
<paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="18">Text-to-text - Alignment</paragraph>
<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_VERTALIGN">Select an alignment option for oversized or undersized characters in the paragraph relative to the rest of the text in the paragraph.</ahelp></paragraph>
</case>
</switch>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<!-- removed HID SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_TEXTDIRECTION -->
+<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). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/01/05030800.xhp b/helpcontent2/source/text/shared/01/05030800.xhp
index 08592a655e..89beae9ffb 100755
--- a/helpcontent2/source/text/shared/01/05030800.xhp
+++ b/helpcontent2/source/text/shared/01/05030800.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030800.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,42 +59,42 @@
<section id="pixelcut">
<paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="2" l10n="U" oldref="3">Crop</paragraph>
<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4">Use this area to trim or scale the selected graphic, or to add white space around the graphic.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_ZOOMCONST" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST" id="bm_id3154751" localize="false"/>
<paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="3" l10n="U" oldref="15">Keep scale</paragraph>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_ZOOMCONST">Maintains the original scale of the graphic when you crop, so that only the size of the graphic changes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_SIZECONST" id="bm_id3147577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST" id="bm_id3147577" localize="false"/>
<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="13">Keep image size</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_GRFCROP_RB_SIZECONST">Maintains the original size of the graphic when you crop, so that only the scale of the graphic changes. To reduce the scale of the graphic, select this option and enter negative values in the cropping boxes. To increase the scale of the graphic, enter positive values in the cropping boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_LEFT" id="bm_id3155392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT" id="bm_id3155392" localize="false"/>
<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="5">Left</paragraph>
<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_LEFT">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the left edge of the graphic, or a negative amount to add white space to the left of the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the horizontal scale of the graphic, or a negative amount to decrease the horizontal scale of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_RIGHT" id="bm_id3154750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT" id="bm_id3154750" localize="false"/>
<paragraph role="heading" id="hd_id3163803" xml-lang="en-US" level="3" l10n="U" oldref="7">Right</paragraph>
<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_RIGHT">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the right edge of the graphic, or a negative amount to add white space to the right of the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the horizontal scale of the graphic, or a negative amount to decrease the horizontal scale of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_TOP" id="bm_id3153320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP" id="bm_id3153320" localize="false"/>
<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="9">Top</paragraph>
<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_TOP">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the top of the graphic, or a negative amount to add white space above the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the vertical scale of the graphic, or a negative amount to decrease the vertical scale of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_BOTTOM" id="bm_id3156156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM" id="bm_id3156156" localize="false"/>
<paragraph role="heading" id="hd_id3149956" xml-lang="en-US" level="3" l10n="U" oldref="11">Bottom</paragraph>
<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_BOTTOM">If the <emph>Keep Scale</emph> option is selected, enter a positive amount to trim the bottom of the graphic, or a negative amount to add white space below the graphic. If the <emph>Keep image size</emph> option is selected, enter a positive amount to increase the vertical scale of the graphic, or a negative amount to decrease the vertical scale of the graphic.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="23">Scale</paragraph>
<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="U" oldref="24">Changes the scale of the selected graphic.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTHZOOM" id="bm_id3151384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM" id="bm_id3151384" localize="false"/>
<paragraph role="heading" id="hd_id3155504" xml-lang="en-US" level="3" l10n="U" oldref="25">Width</paragraph>
<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTHZOOM">Enter the width for the selected graphic as a percentage.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHTZOOM" id="bm_id3144422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM" id="bm_id3144422" localize="false"/>
<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="U" oldref="27">Height</paragraph>
<paragraph role="paragraph" id="par_id3154348" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHTZOOM">Enter the height of the selected graphic as a percentage.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="2" l10n="U" oldref="17">Image size</paragraph>
<paragraph role="paragraph" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="18">Changes the size of the selected graphic.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTH" id="bm_id3150359" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH" id="bm_id3150359" localize="false"/>
<paragraph role="heading" id="hd_id3161656" xml-lang="en-US" level="3" l10n="U" oldref="19">Width</paragraph>
<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_WIDTH">Enter a width for the selected graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHT" id="bm_id3157320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT" id="bm_id3157320" localize="false"/>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="21">Height</paragraph>
<paragraph role="paragraph" id="par_id3154686" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRFCROP_MF_HEIGHT">Enter a height for the selected graphic.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_GRFCROP_PB_ORGSIZE" id="bm_id3153178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE" id="bm_id3153178" localize="false"/>
<paragraph role="heading" id="hd_id3148676" xml-lang="en-US" level="2" l10n="U" oldref="31">Original Size</paragraph>
<paragraph role="paragraph" id="par_id3154068" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_GRFCROP_PB_ORGSIZE">Returns the selected graphic to its original size.</ahelp></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/01/05040100.xhp b/helpcontent2/source/text/shared/01/05040100.xhp
index d6c4be1fe3..945c04229e 100644
--- a/helpcontent2/source/text/shared/01/05040100.xhp
+++ b/helpcontent2/source/text/shared/01/05040100.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05040100.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,56 +29,54 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105040100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Organizer</title>
-<filename>/text/shared/01/05040100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T11:30:14">UFI: spec "Assign Keyboard Shortcuts to Styles"
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="verwalten">
+ <topic id="textshared0105040100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Organizer</title>
+ <filename>/text/shared/01/05040100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="verwalten">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153383"><bookmark_value>organizing; styles</bookmark_value>
-<bookmark_value>styles; organizing</bookmark_value>
+ <bookmark_value>styles; organizing</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_MANAGE_STYLES" id="bm_id3145356" localize="false"/>
-<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040100.xhp" name="Organizer">Organizer</link></paragraph>
-<paragraph role="paragraph" id="par_id3147588" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_MANAGE_STYLES">Set the options for the selected style.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#seiteverwalten"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/sfx2_Edit_TP_MANAGE_STYLES_ED_NAME" id="bm_id3804437" localize="false"/>
-<paragraph role="heading" id="hd_id3149525" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
-<paragraph role="paragraph" id="par_id3160481" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_MANAGE_STYLES:ED_NAME">Displays the name of the selected style. If you are creating or modifying a custom style, enter a name for the style. You cannot change the name of a predefined style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_TP_MANAGE_STYLES_CB_AUTO" id="bm_id8273873" localize="false"/>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">AutoUpdate
+<paragraph xml-lang="en-US" id="hd_id3153383" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040100.xhp" name="Organizer">Organizer</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147588" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_MANAGE_STYLES">Set the options for the selected style.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#seiteverwalten"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:TP_MANAGE_STYLES:ED_NAME" id="bm_id3804437" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149525" role="heading" level="2" l10n="U" oldref="3">Name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3160481" role="paragraph" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:TP_MANAGE_STYLES:ED_NAME">Displays the name of the selected style. If you are creating or modifying a custom style, enter a name for the style. You cannot change the name of a predefined style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO" id="bm_id8273873" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153750" role="heading" level="2" l10n="U"
+ oldref="13"><switchinline select="appl"><caseinline select="WRITER">AutoUpdate
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153749" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SFX2:CHECKBOX:TP_MANAGE_STYLES:CB_AUTO">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3153749" role="paragraph" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SFX2:CHECKBOX:TP_MANAGE_STYLES:CB_AUTO">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_NEXT" id="bm_id1614123" localize="false"/>
-<paragraph role="heading" id="hd_id3155392" xml-lang="en-US" level="2" l10n="U" oldref="5">Next Style</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_NEXT">Select an existing style that you want to follow the current style in your document. For paragraph styles, the next style is applied to the paragraph that is created when you press Enter. For page styles, the next style is applied when a new page is created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_BASE" id="bm_id373241" localize="false"/>
-<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="7">Linked with</paragraph>
-<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_BASE">Select an existing style that you want to base the new style on, or select none to define your own style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2_ListBox_TP_MANAGE_STYLES_LB_REGION" id="bm_id7994018" localize="false"/>
-<paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="2" l10n="U" oldref="9">Category</paragraph>
-<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_REGION">Displays the category for the current style. If you are creating or modifying a new style, select 'Custom Style' from the list.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="17">You cannot change the category for a predefined style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC" id="bm_id3153127" localize="false"/>
-<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="2" l10n="U" oldref="11">Contains</paragraph>
-<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC">Describes the relevant formatting used in the current style.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1072D" xml-lang="en-US" level="2" l10n="NEW">Assign Shortcut Key</paragraph>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">Opens the <emph>Tools - Customize - Keyboard</emph> tab page where you can assign a shortcut key to the current Style.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05140000.xhp" name="Update Style">Update Style</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id0107200910584081" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Updates the style when you apply direct formatting to a paragraph using this style in your document. The formatting of all paragraphs using this style is automatically updated.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT" id="bm_id1614123" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155392" role="heading" level="2" l10n="U" oldref="5">Next Style</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_NEXT">Select an existing style that you want to follow the current style in your document. For paragraph styles, the next style is applied to the paragraph that is created when you press Enter. For page styles, the next style is applied when a new page is created.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE" id="bm_id373241" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="2" l10n="U" oldref="7">Linked with</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166461" role="paragraph" l10n="U" oldref="8"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_BASE">Select an existing style that you want to base the new style on, or select none to define your own style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION" id="bm_id7994018" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148474" role="heading" level="2" l10n="U" oldref="9">Category</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159269" role="paragraph" l10n="U" oldref="10"><ahelp hid="SFX2:LISTBOX:TP_MANAGE_STYLES:LB_REGION">Displays the category for the current style. If you are creating or modifying a new style, select 'Custom Style' from the list.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150771" role="note" l10n="U" oldref="17">You cannot change the category for a predefined style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC" id="bm_id3153127" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153717" role="heading" level="2" l10n="U"
+ oldref="11">Contains</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154306" role="paragraph" l10n="U" oldref="12"><ahelp hid="SFX2:MULTILINEEDIT:TP_MANAGE_STYLES:ED_DESC">Describes the relevant formatting used in the current style.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1072D" role="heading" level="2" l10n="NEW">Assign Shortcut Key</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">Opens the <emph>Tools - Customize - Keyboard</emph> tab page where you can assign a shortcut key to the current Style.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3145085" role="paragraph" l10n="C"><link href="text/swriter/01/05140000.xhp" name="Update Style">Update Style</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05040200.xhp b/helpcontent2/source/text/shared/01/05040200.xhp
index 7f1ef53547..f3325b883b 100755
--- a/helpcontent2/source/text/shared/01/05040200.xhp
+++ b/helpcontent2/source/text/shared/01/05040200.xhp
@@ -1,19 +1,15 @@
<?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: 05040200.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.19.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -34,8 +30,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0105040200xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Page</title>
@@ -64,50 +60,81 @@
<embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
<paragraph role="heading" id="hd_id3149549" xml-lang="en-US" level="2" l10n="U" oldref="31">Paper format</paragraph>
<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="32">Select from a list of predefined paper sizes, or define a custom paper format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_SIZE" id="bm_id3147834" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE" id="bm_id3147834" localize="false"/>
<paragraph role="heading" id="hd_id3153394" xml-lang="en-US" level="3" l10n="U" oldref="33">Format</paragraph>
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_SIZE">Select a predefined paper size, or create a custom format by entering the dimensions for the paper in the <emph>Height </emph>and <emph>Width </emph>boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH" id="bm_id3155893" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH" id="bm_id3155893" localize="false"/>
<paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="35">Width</paragraph>
<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH">Displays the width of the selected paper format. To define a custom format, enter a width here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT" id="bm_id3155392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT" id="bm_id3155392" localize="false"/>
<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="3" l10n="U" oldref="37">Height</paragraph>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT">Displays the height of the selected paper format. To define a custom format, enter a height here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_PORTRAIT" id="bm_id3147276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT" id="bm_id3147276" localize="false"/>
<paragraph role="heading" id="hd_id3146798" xml-lang="en-US" level="3" l10n="U" oldref="39">Portrait</paragraph>
<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_PORTRAIT">Displays and prints the current document with the paper oriented vertically.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_LANDSCAPE" id="bm_id3159116" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE" id="bm_id3159116" localize="false"/>
<paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="41">Landscape</paragraph>
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_PAGE:RB_LANDSCAPE">Displays and prints the current document with the paper oriented horizontally.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_PAGE_LB_TEXT_FLOW" id="bm_id3146774" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW" id="bm_id3146774" localize="false"/>
<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="74">Text direction</paragraph>
<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_PAGE_LB_TEXT_FLOW">Select the text direction that you want to use in your document.</ahelp> The "right-to-left (vertical)" text flow direction rotates all layout settings to the right by 90 degrees, except for the header and footer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_TRAY" id="bm_id3154516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY" id="bm_id3154516" localize="false"/>
<paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="3" l10n="U" oldref="43">Paper tray</paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_PAPER_TRAY">Select the paper source for your printer. If you want, you can assign different paper trays to different page styles. For example, assign a different tray to the First Page style and load the tray with your company's letterhead paper.</ahelp><comment>UFI: #i31234#</comment></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2" l10n="U" oldref="3">Margins</paragraph>
<paragraph role="paragraph" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="4">Specify the amount of space to leave between the edges of the page and the document text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN" id="bm_id3148943" localize="false"/>
<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="3" l10n="U" oldref="5">Left / Inner</paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN">Enter the amount of space to leave between the left edge of the page and the document text. If you are using the <emph>Mirrored</emph> page layout, enter the amount of space to leave between the inner text margin and the inner edge of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN" id="bm_id3154758" localize="false"/>
<paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3" l10n="U" oldref="8">Right / Outer</paragraph>
<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN">Enter the amount of space to leave between the right edge of the page and the document text. If you are using the <emph>Mirrored</emph> page layout, enter the amount of space to leave between the outer text margin and the outer edge of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_TOP_MARGIN" id="bm_id3148739" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN" id="bm_id3148739" localize="false"/>
<paragraph role="heading" id="hd_id3161657" xml-lang="en-US" level="3" l10n="U" oldref="11">Top</paragraph>
<paragraph role="paragraph" id="par_id3154226" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_TOP_MARGIN">Enter the amount of space to leave between the upper edge of the page and the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN" id="bm_id3153797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN" id="bm_id3153797" localize="false"/>
<paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="13">Bottom</paragraph>
<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN">Enter the amount of space to leave between the lower edge of the page and the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
+
<paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Page Layout</defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3157962" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Select the page layout style to use in the current document.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_LAYOUT" id="bm_id3153104" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_PAGE_LB_LAYOUT" id="bm_id5546128" localize="false"/><comment>ufi: see i47727 why the switched help text is not shown</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT" id="bm_id3153104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT" id="bm_id5546128" localize="false"/><comment>ufi: see i47727 why the switched help text is not shown</comment>
<paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="3" l10n="U" oldref="17"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Page layout</defaultinline></switchinline></paragraph>
@@ -138,43 +165,14 @@
<paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>The current page style shows only even (left) pages. Odd pages are shown as blank pages.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_PAGE_CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment
+<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page.
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page.
-</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page.
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id3149417" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_PAGE_LB_NUMBER_FORMAT" id="bm_id5692312" localize="false"/><comment>ufi: removed switches</comment>
+
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id3149417" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id5692312" localize="false"/><comment>ufi: removed switches</comment>
<paragraph role="heading" id="hd_id3083281" xml-lang="en-US" level="3" l10n="CHG" oldref="27">Format</paragraph>
<paragraph role="paragraph" id="par_id3153745" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT">Select the page numbering format that you want to use for the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_ADAPT" id="bm_id3156178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT" id="bm_id3156178" localize="false"/>
<paragraph role="paragraph" id="par_id0522200809473965" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151318" xml-lang="en-US" level="3" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="OFFICE">
</caseinline><caseinline select="WRITER">
diff --git a/helpcontent2/source/text/shared/01/05040300.xhp b/helpcontent2/source/text/shared/01/05040300.xhp
index 293ffc9379..52fa6a286e 100644
--- a/helpcontent2/source/text/shared/01/05040300.xhp
+++ b/helpcontent2/source/text/shared/01/05040300.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05040300.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,66 +29,87 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105040300xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Header</title>
-<filename>/text/shared/01/05040300.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="kopfzeile">
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_HEADER" id="bm_id3154926" localize="false"/><paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040300.xhp" name="Header">Header</link></paragraph>
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_HEADER">Adds a header to the current page style. A header is an area in the top page margin, where you can add text or graphics.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="33">If you want, you can also add borders or a background fill to a header.</paragraph>
+ <topic id="textshared0105040300xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Header</title>
+ <filename>/text/shared/01/05040300.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="kopfzeile">
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_HEADER" id="bm_id3154926" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040300.xhp" name="Header">Header</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156027" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_HEADER">Adds a header to the current page style. A header is an area in the top page margin, where you can add text or graphics.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3150693" role="paragraph" l10n="U" oldref="33">If you want, you can also add borders or a background fill to a header.</paragraph>
<switch select="appl">
<case select="IMPRESS"><embed href="text/simpress/guide/footer.xhp#footer"/>
</case>
</switch>
<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#kopfzeile"/>
-</section>
-<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER">To add a header to the current page style, select <emph>Header on</emph>, and then click <emph>OK</emph>.
+ <embed href="text/shared/00/00040500.xhp#kopfzeile"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3153821" role="paragraph" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER">To add a header to the current page style, select <emph>Header on</emph>, and then click <emph>OK</emph>.
</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>
+ <paragraph xml-lang="en-US" id="par_id3153827" role="paragraph" 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 <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 select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3154046" role="tip" 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>
-<paragraph role="paragraph" id="par_id3154924" xml-lang="en-US" l10n="U" oldref="5">Set the properties of the header.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_TURNON" id="bm_id3158209" localize="false"/><paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="3" l10n="U" oldref="7">Header on</paragraph>
-<paragraph role="paragraph" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_TURNON">Adds a header to the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED" id="bm_id3150543" localize="false"/><paragraph role="heading" id="hd_id3154936" xml-lang="en-US" level="3" l10n="U" oldref="21">Same content left/right<comment>i80087</comment></paragraph>
-<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different header to even and odd pages, clear this option, and then click <emph>Edit</emph>.
+<paragraph xml-lang="en-US" id="hd_id3152360" role="heading" level="2" l10n="U" oldref="4">Header</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154924" role="paragraph" l10n="U" oldref="5">Set the properties of the header.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON" id="bm_id3158209" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147304" role="heading" level="3" l10n="U" oldref="7">Header on</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154388" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_TURNON">Adds a header to the current page style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED" id="bm_id3150543" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154936" role="heading" level="3" l10n="U"
+ oldref="21">Same content left/right<comment>i80087</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different header to even and odd pages, clear this option, and then click <emph>Edit</emph>.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_LMARGIN" id="bm_id3154153" localize="false"/><paragraph role="heading" id="hd_id3145202" xml-lang="en-US" level="3" l10n="U" oldref="17">Left margin</paragraph>
-<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_RMARGIN" id="bm_id3151041" localize="false"/><paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3" l10n="U" oldref="19">Right margin</paragraph>
-<paragraph role="paragraph" id="par_id3157322" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_DIST" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="3" l10n="U" oldref="9">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the header and the top edge of the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_HEADER_CB_DYNSPACING" id="bm_id3144432" localize="false"/><paragraph role="heading" id="hd_id3154330" xml-lang="en-US" level="4" l10n="U" oldref="35">Use dynamic spacing</paragraph>
-<paragraph role="paragraph" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_HEADER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting, and allows the header to expand into the area between the header and the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_HEIGHT" id="bm_id3153056" localize="false"/><paragraph role="heading" id="hd_id3150290" xml-lang="en-US" level="3" l10n="U" oldref="13">Height</paragraph>
-<paragraph role="paragraph" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_HEIGHT">Enter the height that you want for the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN" id="bm_id3154300" localize="false"/><paragraph role="heading" id="hd_id3156543" xml-lang="en-US" level="3" l10n="U" oldref="15">AutoFit height</paragraph>
-<paragraph role="paragraph" id="par_id3153095" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN">Automatically adjusts the height of the header to fit the content that you enter.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HEADER:BTN_EXTRAS" id="bm_id3147434" localize="false"/><paragraph role="heading" id="hd_id3145271" xml-lang="en-US" level="2" l10n="U" oldref="24">More</paragraph>
-<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HEADER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_HEADER_EDIT" id="bm_id3145592" localize="false"/><paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="2" l10n="U" oldref="27"><switchinline select="appl"><caseinline select="CALC">Edit
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN" id="bm_id3154153" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145202" role="heading" level="3" l10n="U"
+ oldref="17">Left margin</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN" id="bm_id3151041" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="3" l10n="U"
+ oldref="19">Right margin</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157322" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST" id="bm_id3149167" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148672" role="heading" level="3" l10n="U" oldref="9">Spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153970" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the header and the top edge of the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING" id="bm_id3144432" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154330" role="heading" level="4" l10n="U"
+ oldref="35">Use dynamic spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148453" role="paragraph" l10n="U" oldref="36"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_HEADER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting, and allows the header to expand into the area between the header and the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT" id="bm_id3153056" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150290" role="heading" level="3" l10n="U"
+ oldref="13">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155429" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_HEIGHT">Enter the height that you want for the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN" id="bm_id3154300" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156543" role="heading" level="3" l10n="U"
+ oldref="15">AutoFit height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153095" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN">Automatically adjusts the height of the header to fit the content that you enter.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS" id="bm_id3147434" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145271" role="heading" level="2" l10n="U"
+ oldref="24">More</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="U" oldref="25"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HEADER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_HEADER_EDIT" id="bm_id3145592" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155306" role="heading" level="2" l10n="U"
+ oldref="27"><switchinline select="appl"><caseinline select="CALC">Edit
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145749" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_SC_HEADER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit">Add or edit</link> header text.
+ <paragraph xml-lang="en-US" id="par_id0609200910261473" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Add or edit header text.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="U" oldref="28"><ahelp hid="HID_SC_HEADER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit">Add or edit</link> header text.
</caseinline></switchinline></ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3163716" xml-lang="en-US" l10n="C"><link href="text/swriter/01/04220000.xhp" name="Headers">Headers</link></paragraph>
-<paragraph role="paragraph" id="par_id3150032" xml-lang="en-US" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
-<paragraph role="paragraph" id="par_id3150873" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
-<paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3163716" role="paragraph" l10n="C"><link href="text/swriter/01/04220000.xhp" name="Headers">Headers</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150873" role="paragraph" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147326" role="paragraph" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05040400.xhp b/helpcontent2/source/text/shared/01/05040400.xhp
index ffc76d66af..4b4ecae6fb 100644
--- a/helpcontent2/source/text/shared/01/05040400.xhp
+++ b/helpcontent2/source/text/shared/01/05040400.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05040400.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,66 +29,87 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105040400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Footer</title>
-<filename>/text/shared/01/05040400.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="fusszeile">
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_FOOTER" id="bm_id3145348" localize="false"/><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040400.xhp" name="Footer">Footer</link></paragraph>
-<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_FOOTER">Adds a footer to the current page style. A footer is an area in the bottom page margin, where you can add text or graphics.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="32">If you want, you can also add borders or a background fill to a footer.</paragraph>
+ <topic id="textshared0105040400xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Footer</title>
+ <filename>/text/shared/01/05040400.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="fusszeile">
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_FOOTER" id="bm_id3145348" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155620" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040400.xhp" name="Footer">Footer</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156553" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_FOOTER">Adds a footer to the current page style. A footer is an area in the bottom page margin, where you can add text or graphics.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="32">If you want, you can also add borders or a background fill to a footer.</paragraph>
<switch select="appl">
<case select="IMPRESS"><embed href="text/simpress/guide/footer.xhp#footer"/>
</case>
</switch>
<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#fusszeile"/>
-</section>
-<paragraph role="paragraph" id="par_id3155339" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="WRITER">To insert a footer into the current document, select <emph>Footer on</emph>, and then click <emph>OK</emph>.
+ <embed href="text/shared/00/00040500.xhp#fusszeile"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3155339" role="paragraph" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="WRITER">To insert a footer into the current document, select <emph>Footer on</emph>, and then click <emph>OK</emph>.
</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>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" 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 <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 select="WRITER">
+<paragraph xml-lang="en-US" id="par_id3150976" role="tip" 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>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="4">Set the properties of the footer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_TURNON" id="bm_id3155434" localize="false"/><paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="6">Footer on</paragraph>
-<paragraph role="paragraph" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_TURNON">Adds a footer to the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED" id="bm_id3149244" localize="false"/><paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="3" l10n="U" oldref="20">Same content left/right</paragraph>
-<paragraph role="paragraph" id="par_id3149575" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different footer to even and odd pages, clear this option, and then click <emph>Edit</emph>.
+<paragraph xml-lang="en-US" id="hd_id3150504" role="heading" level="2" l10n="U" oldref="3">Footer</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="4">Set the properties of the footer.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON" id="bm_id3155434" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154380" role="heading" level="3" l10n="U" oldref="6">Footer on</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153348" role="paragraph" l10n="U" oldref="7"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_TURNON">Adds a footer to the current page style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED" id="bm_id3149244" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="3" l10n="U"
+ oldref="20">Same content left/right</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149575" role="paragraph" l10n="CHG" oldref="21"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different footer to even and odd pages, clear this option, and then click <emph>Edit</emph>.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_LMARGIN" id="bm_id3149457" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="16">Left margin</paragraph>
-<paragraph role="paragraph" id="par_id3156434" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_RMARGIN" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3154073" xml-lang="en-US" level="3" l10n="U" oldref="18">Right margin</paragraph>
-<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_DIST" id="bm_id3154123" localize="false"/><paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="3" l10n="U" oldref="8">Spacing</paragraph>
-<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the document text and the top edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_FOOTER_CB_DYNSPACING" id="bm_id3152933" localize="false"/><paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="4" l10n="U" oldref="34">Use dynamic spacing</paragraph>
-<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_FOOTER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting and allows the footer to expand into the area between the footer and document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_HEIGHT" id="bm_id3150495" localize="false"/><paragraph role="heading" id="hd_id3154821" xml-lang="en-US" level="3" l10n="U" oldref="12">Height</paragraph>
-<paragraph role="paragraph" id="par_id3125865" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_HEIGHT">Enter the height you want for the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN" id="bm_id3153968" localize="false"/><paragraph role="heading" id="hd_id3150742" xml-lang="en-US" level="3" l10n="U" oldref="14">AutoFit height</paragraph>
-<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN">Automatically adjusts the height of the footer to fit the content you enter.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_FOOTER:BTN_EXTRAS" id="bm_id3147084" localize="false"/><paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="2" l10n="U" oldref="23">More</paragraph>
-<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_FOOTER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FOOTER_EDIT" id="bm_id3145787" localize="false"/><paragraph role="heading" id="hd_id3157892" xml-lang="en-US" level="2" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="CALC">Edit
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN" id="bm_id3149457" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="3" l10n="U"
+ oldref="16">Left margin</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156434" role="paragraph" l10n="U" oldref="17"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN" id="bm_id3153360" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154073" role="heading" level="3" l10n="U"
+ oldref="18">Right margin</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154224" role="paragraph" l10n="U" oldref="19"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST" id="bm_id3154123" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154140" role="heading" level="3" l10n="U" oldref="8">Spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="9"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the document text and the top edge of the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING" id="bm_id3152933" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158409" role="heading" level="4" l10n="U"
+ oldref="34">Use dynamic spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="35"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_FOOTER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting and allows the footer to expand into the area between the footer and document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT" id="bm_id3150495" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154821" role="heading" level="3" l10n="U"
+ oldref="12">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3125865" role="paragraph" l10n="U" oldref="13"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_HEIGHT">Enter the height you want for the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN" id="bm_id3153968" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150742" role="heading" level="3" l10n="U"
+ oldref="14">AutoFit height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145744" role="paragraph" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN">Automatically adjusts the height of the footer to fit the content you enter.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS" id="bm_id3147084" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149807" role="heading" level="2" l10n="U"
+ oldref="23">More</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_FOOTER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FOOTER_EDIT" id="bm_id3145787" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157892" role="heading" level="2" l10n="U"
+ oldref="26"><switchinline select="appl"><caseinline select="CALC">Edit
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SC_FOOTER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit footer text.">Add or edit footer text.</link>
+ <paragraph xml-lang="en-US" id="par_id0609200910255518" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Add or edit footer text.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_SC_FOOTER_EDIT"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" name="Add or edit footer text.">Add or edit footer text.</link>
</caseinline></switchinline></ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="C"><link href="text/swriter/01/04230000.xhp" name="Footers">Footers</link></paragraph>
-<paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
-<paragraph role="paragraph" id="par_id3154189" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
-<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3151112" role="paragraph" l10n="C"><link href="text/swriter/01/04230000.xhp" name="Footers">Footers</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155411" role="paragraph" l10n="C"><link href="text/shared/00/00000003.xhp#metrik" name="Changing measurement units">Changing measurement units</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154189" role="paragraph" l10n="C"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="C"><link href="text/shared/01/05030600.xhp" name="Backgrounds">Backgrounds</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05050000.xhp b/helpcontent2/source/text/shared/01/05050000.xhp
index 52ff1dda9b..e726cc306d 100644
--- a/helpcontent2/source/text/shared/01/05050000.xhp
+++ b/helpcontent2/source/text/shared/01/05050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05050000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,38 +27,49 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0105050000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Change Case</title>
<filename>/text/shared/01/05050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-17T14:40:09">converted from old format - fpe
-dedr: fixed #i30332#
-UFI: changed name, see spec Format Menu in Writer
-dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<section id="grossklein">
<bookmark xml-lang="en-US" branch="hid/.uno:TransliterateMenu" id="bm_id668355" localize="false"/>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05050000.xhp" name="Case/Characters">Change Case</link></paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Changes the case of the selected characters, or if the cursor is in a word, changes the case of all of the characters in the word.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Changes the case of characters in the selection. If the cursor is within a word and no text is selected, then the word is the selection.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#grossklein"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_UPPER" id="bm_id5342659" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToUpper" id="bm_id3149205" localize="false"/>
-<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="2" l10n="U" oldref="3">Uppercase</paragraph>
-<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:ChangeCaseToUpper">Changes the selected western characters to capital letters</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_SENTENCE" id="bm_id7402005" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToSentenceCase" id="bm_id3149347" localize="false"/>
+<paragraph role="heading" id="hd_id3147572" xml-lang="en-US" level="2" l10n="U" oldref="5">Sentence case</paragraph>
+<paragraph role="paragraph" id="par_id3150694" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Changes the first letter of the selected western characters to an uppercase character.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_LOWER" id="bm_id7402004" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToLower" id="bm_id3149346" localize="false"/>
-<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Lowercase</paragraph>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:ChangeCaseToLower">Changes the selected western characters to lowercase letters.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">lowercase</paragraph>
+<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:ChangeCaseToLower">Changes the selected western characters to lowercase characters.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_UPPER" id="bm_id5342659" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToUpper" id="bm_id3149205" localize="false"/>
+<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="2" l10n="U" oldref="3">UPPERCASE</paragraph>
+<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:ChangeCaseToUpper">Changes the selected western characters to uppercase characters.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_CAPITALIZE" id="bm_id7402014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToTitleCase" id="bm_id3149316" localize="false"/>
+<paragraph role="heading" id="hd_id3147511" xml-lang="en-US" level="2" l10n="U" oldref="5">Capitalize Every Word</paragraph>
+<paragraph role="paragraph" id="par_id3150613" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Changes the first character of every word of the selected western characters to an uppercase character.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_TOGGLE" id="bm_id7402024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToToggleCase" id="bm_id3149326" localize="false"/>
+<paragraph role="heading" id="hd_id3147521" xml-lang="en-US" level="2" l10n="U" oldref="5">tOGGLE cASE</paragraph>
+<paragraph role="paragraph" id="par_id3150623" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Toggles case of all selected western characters.</ahelp></paragraph>
+
<embed href="text/shared/00/00000007.xhp#asia"/>
<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_HALFWIDTH" id="bm_id203258" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToHalfWidth" id="bm_id3154288" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05060000.xhp b/helpcontent2/source/text/shared/01/05060000.xhp
index ba72b6f498..8b63a74cbd 100644
--- a/helpcontent2/source/text/shared/01/05060000.xhp
+++ b/helpcontent2/source/text/shared/01/05060000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05060000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,23 +63,23 @@
<paragraph role="listitem" id="par_id3154838" xml-lang="en-US" l10n="U" oldref="15">Enter the text that you want to use as a pronunciation guide in the <emph>Ruby text</emph> box.</paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_1" id="bm_id3149031" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_2" id="bm_id3153209" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_3" id="bm_id3156082" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_4" id="bm_id3148981" localize="false"/><paragraph role="heading" id="hd_id3150793" xml-lang="en-US" level="2" l10n="U" oldref="3">Base text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1" id="bm_id3149031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2" id="bm_id3153209" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3" id="bm_id3156082" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4" id="bm_id3148981" localize="false"/><paragraph role="heading" id="hd_id3150793" xml-lang="en-US" level="2" l10n="U" oldref="3">Base text</paragraph>
<paragraph role="paragraph" id="par_id3154155" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX_EDIT_RID_SVXDLG_RUBY_ED_LEFT_4">Displays the base text that you selected in the current file. If you want, you can modify the base text by entering new text here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_1" id="bm_id3154821" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_2" id="bm_id3153180" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_3" id="bm_id3149767" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_4" id="bm_id3152922" localize="false"/><paragraph role="heading" id="hd_id3145154" xml-lang="en-US" level="2" l10n="U" oldref="5">Ruby text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1" id="bm_id3154821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2" id="bm_id3153180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3" id="bm_id3149767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4" id="bm_id3152922" localize="false"/><paragraph role="heading" id="hd_id3145154" xml-lang="en-US" level="2" l10n="U" oldref="5">Ruby text</paragraph>
<paragraph role="paragraph" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_EDIT_RID_SVXDLG_RUBY_ED_RIGHT_4">Enter the text that you want to use as a pronunciation guide for the base text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_RUBY_LB_ADJUST" id="bm_id3146874" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="7">Alignment</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST" id="bm_id3146874" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="7">Alignment</paragraph>
<paragraph role="paragraph" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_RUBY_LB_ADJUST">Select the horizontal alignment for the Ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_RUBY_LB_POSITION" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="16">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="16">Position</paragraph>
<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_RUBY_LB_POSITION">Select where you want to place the ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_RUBY_LB_CHAR_STYLE" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="9">Character Style for ruby text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE" id="bm_id3143231" localize="false"/><paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="2" l10n="U" oldref="9">Character Style for ruby text</paragraph>
<paragraph role="paragraph" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_RUBY_LB_CHAR_STYLE">Select a character style for the ruby text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_RUBY_PB_STYLIST" id="bm_id3154123" localize="false"/><paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="2" l10n="U" oldref="11">Styles and Formatting<comment>UFI: renamed??</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST" id="bm_id3154123" localize="false"/><paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="2" l10n="U" oldref="11">Styles and Formatting<comment>UFI: renamed??</comment></paragraph>
<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_RUBY_PB_STYLIST">Opens the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05140000.xhp" name="Styles">Styles and Formatting window</link>
</caseinline><defaultinline>Styles and Formatting window</defaultinline></switchinline> where you can select a character style for the ruby text.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05070000.xhp b/helpcontent2/source/text/shared/01/05070000.xhp
index 06a1493731..c0c5781fd4 100644
--- a/helpcontent2/source/text/shared/01/05070000.xhp
+++ b/helpcontent2/source/text/shared/01/05070000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05070000.xhp,v $
- * $Revision: 1.9.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070100.xhp b/helpcontent2/source/text/shared/01/05070100.xhp
index ff703c3add..f4119e69d5 100644
--- a/helpcontent2/source/text/shared/01/05070100.xhp
+++ b/helpcontent2/source/text/shared/01/05070100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05070100.xhp,v $
- * $Revision: 1.7.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070200.xhp b/helpcontent2/source/text/shared/01/05070200.xhp
index 705964ad62..930753a381 100644
--- a/helpcontent2/source/text/shared/01/05070200.xhp
+++ b/helpcontent2/source/text/shared/01/05070200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05070200.xhp,v $
- * $Revision: 1.7.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070300.xhp b/helpcontent2/source/text/shared/01/05070300.xhp
index 1b2b4e3f9d..80a8309c59 100644
--- a/helpcontent2/source/text/shared/01/05070300.xhp
+++ b/helpcontent2/source/text/shared/01/05070300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05070300.xhp,v $
- * $Revision: 1.7.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070400.xhp b/helpcontent2/source/text/shared/01/05070400.xhp
index d95e717a2b..3f14088596 100644
--- a/helpcontent2/source/text/shared/01/05070400.xhp
+++ b/helpcontent2/source/text/shared/01/05070400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05070400.xhp,v $
- * $Revision: 1.6.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070500.xhp b/helpcontent2/source/text/shared/01/05070500.xhp
index 1df4ae8113..f3d71e2ee4 100644
--- a/helpcontent2/source/text/shared/01/05070500.xhp
+++ b/helpcontent2/source/text/shared/01/05070500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05070500.xhp,v $
- * $Revision: 1.6.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05070600.xhp b/helpcontent2/source/text/shared/01/05070600.xhp
index 3db52f6ce6..2d0e64adc9 100644
--- a/helpcontent2/source/text/shared/01/05070600.xhp
+++ b/helpcontent2/source/text/shared/01/05070600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05070600.xhp,v $
- * $Revision: 1.7.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080000.xhp b/helpcontent2/source/text/shared/01/05080000.xhp
index 74800da30f..5eaa355824 100755
--- a/helpcontent2/source/text/shared/01/05080000.xhp
+++ b/helpcontent2/source/text/shared/01/05080000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05080000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080100.xhp b/helpcontent2/source/text/shared/01/05080100.xhp
index 5b2d7a6f39..1057bceb51 100644
--- a/helpcontent2/source/text/shared/01/05080100.xhp
+++ b/helpcontent2/source/text/shared/01/05080100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05080100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080200.xhp b/helpcontent2/source/text/shared/01/05080200.xhp
index b90606d3c2..d0ca499d07 100644
--- a/helpcontent2/source/text/shared/01/05080200.xhp
+++ b/helpcontent2/source/text/shared/01/05080200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05080200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080300.xhp b/helpcontent2/source/text/shared/01/05080300.xhp
index 1a5691367b..6bda92690c 100644
--- a/helpcontent2/source/text/shared/01/05080300.xhp
+++ b/helpcontent2/source/text/shared/01/05080300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05080300.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05080400.xhp b/helpcontent2/source/text/shared/01/05080400.xhp
index 5d9bc5c861..3304b2f797 100644
--- a/helpcontent2/source/text/shared/01/05080400.xhp
+++ b/helpcontent2/source/text/shared/01/05080400.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05080400.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05090000.xhp b/helpcontent2/source/text/shared/01/05090000.xhp
index 600e744f8a..bba07b8c0a 100755
--- a/helpcontent2/source/text/shared/01/05090000.xhp
+++ b/helpcontent2/source/text/shared/01/05090000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05090000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05100000.xhp b/helpcontent2/source/text/shared/01/05100000.xhp
index 665176c12c..4dca5ec674 100755
--- a/helpcontent2/source/text/shared/01/05100000.xhp
+++ b/helpcontent2/source/text/shared/01/05100000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05100000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05100100.xhp b/helpcontent2/source/text/shared/01/05100100.xhp
index 24f10ba262..ad7ba427df 100644
--- a/helpcontent2/source/text/shared/01/05100100.xhp
+++ b/helpcontent2/source/text/shared/01/05100100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
diff --git a/helpcontent2/source/text/shared/01/05100200.xhp b/helpcontent2/source/text/shared/01/05100200.xhp
index 0461b8cef1..c800efc2c6 100644
--- a/helpcontent2/source/text/shared/01/05100200.xhp
+++ b/helpcontent2/source/text/shared/01/05100200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
@@ -72,17 +69,17 @@
</section>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT" id="bm_id3154507" localize="false"/>
+<!-- removed HID SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT -->
<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"/>
+<!-- removed HID SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ -->
<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"/>
+<!-- removed HID SW_CHECKBOX_DLG_SPLIT_CB_PROP -->
<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"/>
+<!-- removed HID SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT -->
<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>
diff --git a/helpcontent2/source/text/shared/01/05100500.xhp b/helpcontent2/source/text/shared/01/05100500.xhp
index 346c369bf8..070cf01fd7 100644
--- a/helpcontent2/source/text/shared/01/05100500.xhp
+++ b/helpcontent2/source/text/shared/01/05100500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
diff --git a/helpcontent2/source/text/shared/01/05100600.xhp b/helpcontent2/source/text/shared/01/05100600.xhp
index b9a090e6e3..e15d1d1d28 100644
--- a/helpcontent2/source/text/shared/01/05100600.xhp
+++ b/helpcontent2/source/text/shared/01/05100600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
diff --git a/helpcontent2/source/text/shared/01/05100700.xhp b/helpcontent2/source/text/shared/01/05100700.xhp
index 7fa2e119f5..aff2221327 100644
--- a/helpcontent2/source/text/shared/01/05100700.xhp
+++ b/helpcontent2/source/text/shared/01/05100700.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
diff --git a/helpcontent2/source/text/shared/01/05110000.xhp b/helpcontent2/source/text/shared/01/05110000.xhp
index e58be3c355..feb0ba4bbe 100755
--- a/helpcontent2/source/text/shared/01/05110000.xhp
+++ b/helpcontent2/source/text/shared/01/05110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110100.xhp b/helpcontent2/source/text/shared/01/05110100.xhp
index b98581bf39..43b253b32c 100644
--- a/helpcontent2/source/text/shared/01/05110100.xhp
+++ b/helpcontent2/source/text/shared/01/05110100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110200.xhp b/helpcontent2/source/text/shared/01/05110200.xhp
index bb5c51e29c..c3581a2090 100644
--- a/helpcontent2/source/text/shared/01/05110200.xhp
+++ b/helpcontent2/source/text/shared/01/05110200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110200.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110300.xhp b/helpcontent2/source/text/shared/01/05110300.xhp
index 9c8fa4440d..750c865a79 100644
--- a/helpcontent2/source/text/shared/01/05110300.xhp
+++ b/helpcontent2/source/text/shared/01/05110300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110300.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110400.xhp b/helpcontent2/source/text/shared/01/05110400.xhp
index 900fd058e9..9886e8069e 100644
--- a/helpcontent2/source/text/shared/01/05110400.xhp
+++ b/helpcontent2/source/text/shared/01/05110400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110400.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110500.xhp b/helpcontent2/source/text/shared/01/05110500.xhp
index 12750938ec..614d1cfba7 100644
--- a/helpcontent2/source/text/shared/01/05110500.xhp
+++ b/helpcontent2/source/text/shared/01/05110500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110500.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110600m.xhp b/helpcontent2/source/text/shared/01/05110600m.xhp
index 5846a241ac..4969c12662 100644
--- a/helpcontent2/source/text/shared/01/05110600m.xhp
+++ b/helpcontent2/source/text/shared/01/05110600m.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
@@ -61,7 +58,7 @@
<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 id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/01/05110700.xhp b/helpcontent2/source/text/shared/01/05110700.xhp
index 4d23fb2c98..5f963baed9 100644
--- a/helpcontent2/source/text/shared/01/05110700.xhp
+++ b/helpcontent2/source/text/shared/01/05110700.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110700.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05110800.xhp b/helpcontent2/source/text/shared/01/05110800.xhp
index 50d79f9be1..1313cbd28c 100644
--- a/helpcontent2/source/text/shared/01/05110800.xhp
+++ b/helpcontent2/source/text/shared/01/05110800.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110800.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120000.xhp b/helpcontent2/source/text/shared/01/05120000.xhp
index 49589ba0cf..befa57e665 100755
--- a/helpcontent2/source/text/shared/01/05120000.xhp
+++ b/helpcontent2/source/text/shared/01/05120000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05120000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120100.xhp b/helpcontent2/source/text/shared/01/05120100.xhp
index a030f28f7b..b3046c5a3d 100644
--- a/helpcontent2/source/text/shared/01/05120100.xhp
+++ b/helpcontent2/source/text/shared/01/05120100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05120100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120200.xhp b/helpcontent2/source/text/shared/01/05120200.xhp
index b0472a9fd2..aa766ff8a2 100644
--- a/helpcontent2/source/text/shared/01/05120200.xhp
+++ b/helpcontent2/source/text/shared/01/05120200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05120200.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120300.xhp b/helpcontent2/source/text/shared/01/05120300.xhp
index 23a1d9524b..c3cafc87f1 100644
--- a/helpcontent2/source/text/shared/01/05120300.xhp
+++ b/helpcontent2/source/text/shared/01/05120300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05120300.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05120600.xhp b/helpcontent2/source/text/shared/01/05120600.xhp
index a7d0233c12..ab826963e2 100644
--- a/helpcontent2/source/text/shared/01/05120600.xhp
+++ b/helpcontent2/source/text/shared/01/05120600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
@@ -61,7 +58,7 @@
<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 id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/01/05140100.xhp b/helpcontent2/source/text/shared/01/05140100.xhp
index f92450ab67..228d5630e3 100644
--- a/helpcontent2/source/text/shared/01/05140100.xhp
+++ b/helpcontent2/source/text/shared/01/05140100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05140100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_STYLE_NEW_BY_EXAMPLE" id="bm_id7425973" localize="false"/><!-- HID added by script -->
<bookmark branch="hid/.uno:StyleNewByExample" xml-lang="en-US" id="bm_id3152942"/><paragraph role="heading" level="1" id="hd_id3152823" l10n="U" xml-lang="en-US" oldref="1">Create Style</paragraph>
<comment>This command is a Styl_ist icon</comment>
- <bookmark branch="hid/SFX2:COMBOBOX:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL" xml-lang="en-US" id="bm_id3155069"/><paragraph role="heading" level="2" id="hd_id3152790" l10n="U" xml-lang="en-US" oldref="4">Style name</paragraph>
+ <bookmark branch="hid/sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL" xml-lang="en-US" id="bm_id3155069"/><paragraph role="heading" level="2" id="hd_id3152790" l10n="U" xml-lang="en-US" oldref="4">Style name</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155599" xml-lang="en-US" oldref="5"><ahelp hid="SFX2:COMBOBOX:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL" visibility="visible">Enter a name for the new Style.</ahelp></paragraph>
<paragraph role="heading" level="3" id="hd_id3154682" l10n="U" xml-lang="en-US" oldref="6">List of Custom Styles</paragraph>
<paragraph role="paragraph" id="par_id3154894" l10n="U" xml-lang="en-US" oldref="7">Lists the user-defined styles that are attached to the current document.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05150101.xhp b/helpcontent2/source/text/shared/01/05150101.xhp
index 68a2e32360..62eaca0bb9 100755
--- a/helpcontent2/source/text/shared/01/05150101.xhp
+++ b/helpcontent2/source/text/shared/01/05150101.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05150101.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
<paragraph role="heading" level="1" id="hd_id3154841" l10n="U" xml-lang="en-US" oldref="1">Add AutoFormat</paragraph>
- <bookmark branch="hid/SW:EDIT:DLG_SWDLG_STRINPUT:ED_INPUT" xml-lang="en-US" id="bm_id3150278"/><paragraph role="heading" level="2" id="hd_id3154812" l10n="U" xml-lang="en-US" oldref="2">Name</paragraph>
+ <bookmark branch="hid/sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT" xml-lang="en-US" id="bm_id3150278"/><paragraph role="heading" level="2" id="hd_id3154812" l10n="U" xml-lang="en-US" oldref="2">Name</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153391" xml-lang="en-US" oldref="3"><ahelp visibility="visible" hid="SW:EDIT:DLG_SWDLG_STRINPUT:ED_INPUT">Enter a name for the new AutoFormat, and then click<emph> OK</emph>.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05190000.xhp b/helpcontent2/source/text/shared/01/05190000.xhp
index 53ac8d994b..92f607da09 100644
--- a/helpcontent2/source/text/shared/01/05190000.xhp
+++ b/helpcontent2/source/text/shared/01/05190000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05190000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
</caseinline><defaultinline>The name is also displayed in the Status Bar when you select the object.</defaultinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_NAME_OBJECT_NAME" id="bm_id3154422" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SD_NAMEDIALOG_OBJECT" id="bm_id3154186" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME" id="bm_id8149052" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME" id="bm_id8149052" localize="false"/>
<paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_SD_NAMEDIALOG_OBJECT">Enter a name for the selected object. The name will be visible in the Navigator.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05190100.xhp b/helpcontent2/source/text/shared/01/05190100.xhp
index 6da9f0be4c..1e56eff311 100644
--- a/helpcontent2/source/text/shared/01/05190100.xhp
+++ b/helpcontent2/source/text/shared/01/05190100.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 05190100.xhp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,17 +31,16 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0105190100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Description</title>
-<filename>/text/shared/01/05190100.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0105190100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Description</title>
+ <filename>/text/shared/01/05190100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147366"><bookmark_value>objects;titles and descriptions</bookmark_value>
-<bookmark_value>descriptions for objects</bookmark_value>
-<bookmark_value>titles;objects</bookmark_value>
+ <bookmark_value>descriptions for objects</bookmark_value>
+ <bookmark_value>titles;objects</bookmark_value>
</bookmark><comment>mw made one index entry out of two "objects;" entries and made "descriptions;" a one level entry</comment>
<bookmark xml-lang="en-US" branch="hid/SID_TITLE_DESCRIPTION_OBJECT" id="bm_id267952" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_TITLE_DESCRIPTION" id="bm_id2231513" localize="false"/>
@@ -54,9 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00040502.xhp#descript"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE" id="bm_id6154362" localize="false"/><paragraph role="heading" id="hd_id2576982" xml-lang="en-US" level="2" l10n="NEW">Title</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE" id="bm_id6154362" localize="false"/><paragraph role="heading" id="hd_id2576982" xml-lang="en-US" level="2" l10n="NEW">Title</paragraph>
<paragraph role="paragraph" id="par_id1283608" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a title text. This short name is visible as an alternative tag in HTML format. Accessibility tools can read this text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC" id="bm_id6189764" localize="false"/><paragraph role="heading" id="hd_id8173467" xml-lang="en-US" level="2" l10n="NEW">Description</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC" id="bm_id6189764" localize="false"/><paragraph role="heading" id="hd_id8173467" xml-lang="en-US" level="2" l10n="NEW">Description</paragraph>
<paragraph role="paragraph" id="par_id693685" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a description text. The long description text can be entered to describe a complex object or group of objects to users with screen reader software. The description is visible as an alternative tag for accessibility tools.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05200000.xhp b/helpcontent2/source/text/shared/01/05200000.xhp
index cf62cb9f9c..a38f5dca8b 100644
--- a/helpcontent2/source/text/shared/01/05200000.xhp
+++ b/helpcontent2/source/text/shared/01/05200000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05200000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05200100.xhp b/helpcontent2/source/text/shared/01/05200100.xhp
index 9d9f736321..9f30da787a 100644
--- a/helpcontent2/source/text/shared/01/05200100.xhp
+++ b/helpcontent2/source/text/shared/01/05200100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05200100.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,23 +50,23 @@
<paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="2" l10n="U" oldref="3">Line properties</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_LINE_STYLE" id="bm_id3568890" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:XLineStyle" id="bm_id3148520" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_LINE_STYLE" id="bm_id3154863" localize="false"/><paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="3" l10n="U" oldref="5">Styles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE" id="bm_id3154863" localize="false"/><paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="3" l10n="U" oldref="5">Styles</paragraph>
<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="CHG" oldref="6"><variable id="stiltext"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_LINE_STYLE">Select the line style that you want to use.</ahelp>
</variable></paragraph>
<embed href="text/shared/00/00000004.xhp#sylistil"/>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_LINE_COLOR" id="bm_id367227" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:XLineColor" id="bm_id3151234" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_COLOR" id="bm_id3156136" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="3" l10n="U" oldref="7">Colors</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR" id="bm_id3156136" localize="false"/><paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="3" l10n="U" oldref="7">Colors</paragraph>
<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="8"><variable id="farbetext"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_COLOR">Select a color for the line.</ahelp>
</variable></paragraph>
<embed href="text/shared/00/00000004.xhp#sylifarbe"/>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_LINE_WIDTH" id="bm_id4880880" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:LineWidth" id="bm_id3149750" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="3" l10n="U" oldref="9">Widths</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="3" l10n="U" oldref="9">Widths</paragraph>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="CHG" oldref="10"><variable id="breitetext"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH">Select the width for the line. You can append a measurement unit. A zero line width results in a hairline with a width of one pixel of the output medium.</ahelp>
</variable></paragraph>
<embed href="text/shared/00/00000004.xhp#sylibreite"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT" id="bm_id3154983" localize="false"/><paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="3" l10n="U" oldref="11">Transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT" id="bm_id3154983" localize="false"/><paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="3" l10n="U" oldref="11">Transparency</paragraph>
<paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT">Enter the transparency of the line, where 100% corresponds to completely transparent and 0% to completely opaque. </ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="WRITER">
</caseinline><caseinline select="DRAW">
@@ -77,26 +74,26 @@
</caseinline><defaultinline>The <emph>Line</emph> tab of the <emph>Data Series</emph> dialog is only available if you select an XY <emph>Chart type</emph>.</defaultinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3153331" xml-lang="en-US" level="2" l10n="U" oldref="23">Icon</paragraph>
<paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="24">Set the options for the data point symbols in your chart.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MENUBUTTON:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP" id="bm_id3154047" localize="false"/><paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="25">Select</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP" id="bm_id3154047" localize="false"/><paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="25">Select</paragraph>
<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:MENUBUTTON:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP">Select the symbol style that you want to use in your chart.</ahelp> If you select <emph>Automatic</emph>, $[officename] uses the default symbols for the selected chart type.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH" id="bm_id3146848" localize="false"/><paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="27">Width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH" id="bm_id3146848" localize="false"/><paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="27">Width</paragraph>
<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH">Enter a width for the symbol.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="29">Height</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="29">Height</paragraph>
<paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT">Enter a height for the symbol.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO" id="bm_id3148686" localize="false"/><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep ratio</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO" id="bm_id3148686" localize="false"/><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep ratio</paragraph>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO">Maintains the proportions of the symbol when you enter a new height or width value.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154579" xml-lang="en-US" level="2" l10n="U" oldref="13">Arrow styles</paragraph>
<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="14">You can add arrowheads to one end, or both ends of the selected line. To add a custom arrow style to the list, select the arrow in your document, and then click on the <link href="text/shared/01/05200300.xhp" name="Arrow Styles"><emph>Arrow Styles</emph></link> tab of this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_START_STYLE" id="bm_id3155922" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINE:LB_END_STYLE" id="bm_id3144422" localize="false"/><paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="3" l10n="U" oldref="15">Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE" id="bm_id3155922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE" id="bm_id3144422" localize="false"/><paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="3" l10n="U" oldref="15">Style</paragraph>
<paragraph role="paragraph" id="par_id3146794" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINE:LB_END_STYLE">Select the arrowhead that you want to apply to the selected line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH" id="bm_id3153896" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH" id="bm_id3159414" localize="false"/><paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="3" l10n="U" oldref="17">Width</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH" id="bm_id3153896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH" id="bm_id3159414" localize="false"/><paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="3" l10n="U" oldref="17">Width</paragraph>
<paragraph role="paragraph" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH">Enter a width for the arrowhead.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_LINE:TSB_CENTER_START" id="bm_id3161657" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_LINE:TSB_CENTER_END" id="bm_id3150358" localize="false"/><paragraph role="heading" id="hd_id3154935" xml-lang="en-US" level="3" l10n="U" oldref="19">Center</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START" id="bm_id3161657" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END" id="bm_id3150358" localize="false"/><paragraph role="heading" id="hd_id3154935" xml-lang="en-US" level="3" l10n="U" oldref="19">Center</paragraph>
<paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_LINE:TSB_CENTER_END">Places the center of the arrowhead(s) on the endpoint(s) of the selected line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE" id="bm_id3154138" localize="false"/><paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="21">Synchronize ends</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE" id="bm_id3154138" localize="false"/><paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="21">Synchronize ends</paragraph>
<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE">Automatically updates both arrowhead settings when you enter a different width, select a different arrowhead style,or center an arrowhead.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/05200200.xhp b/helpcontent2/source/text/shared/01/05200200.xhp
index 48ff35bc75..ad25a37e0e 100755
--- a/helpcontent2/source/text/shared/01/05200200.xhp
+++ b/helpcontent2/source/text/shared/01/05200200.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 05200200.xhp,v $
- * $Revision: 1.6.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0105200200xml" indexer="include">
<title id="tit" xml-lang="en-US">Line Styles</title>
@@ -50,41 +47,41 @@
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES" id="bm_id3147212" localize="false"/>
<paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="3" l10n="U" oldref="15">Line style</paragraph>
<paragraph role="paragraph" id="par_id3146807" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_LINESTYLES">Select the style of line that you want to create.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_TYPE_1" id="bm_id3151097" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_TYPE_2" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1" id="bm_id3151097" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2" id="bm_id3152895" localize="false"/>
<paragraph role="heading" id="hd_id3149948" xml-lang="en-US" level="3" l10n="U" oldref="5">Type</paragraph>
<paragraph role="paragraph" id="par_id3149031" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_TYPE_2">Select the combination of dashes and dots that you want.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_LINE_DEF_NUM_FLD_1" id="bm_id3146067" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_LINE_DEF_NUM_FLD_2" id="bm_id3154230" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1" id="bm_id3146067" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2" id="bm_id3154230" localize="false"/>
<paragraph role="heading" id="hd_id3148731" xml-lang="en-US" level="3" l10n="U" oldref="7">Number</paragraph>
<paragraph role="paragraph" id="par_id3155351" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_LINE_DEF_NUM_FLD_2">Enter the number of times that you want a dot or a dash to appear in a sequence.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_1" id="bm_id3153935" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_2" id="bm_id3149283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1" id="bm_id3153935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2" id="bm_id3149283" localize="false"/>
<paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="3" l10n="U" oldref="9">Length</paragraph>
<paragraph role="paragraph" id="par_id3149640" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_2">Enter the length of the dash.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_DISTANCE" id="bm_id3156414" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE" id="bm_id3156414" localize="false"/>
<paragraph role="heading" id="hd_id3093440" xml-lang="en-US" level="3" l10n="U" oldref="11">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_LINE_DEF_MTR_FLD_DISTANCE">Enter the amount of space that you want to leave between dots or dashes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE" id="bm_id3147250" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE" id="bm_id3147250" localize="false"/>
<paragraph role="heading" id="hd_id3155805" xml-lang="en-US" level="3" l10n="U" oldref="13">Fit to line width</paragraph>
<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE">Automatically adjusts the entries relative to the length of the line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_ADD" id="bm_id3152551" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD" id="bm_id3152551" localize="false"/>
<paragraph role="heading" id="hd_id3155355" xml-lang="en-US" level="2" l10n="U" oldref="17">Add</paragraph>
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_ADD">Creates a new line style using the current settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_NAME_EDT_STRING" id="bm_id3145313" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_NAME:EDT_STRING" id="bm_id3145313" localize="false"/>
<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="19">Name</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_EDIT_RID_SVXDLG_NAME_EDT_STRING">Enter a name for the new line style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY" id="bm_id3147011" localize="false"/>
+<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="">Enter a name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_SAVE" id="bm_id3149579" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE" id="bm_id3149579" localize="false"/>
<paragraph role="heading" id="hd_id3148642" xml-lang="en-US" level="2" l10n="U" oldref="25">Save line style table</paragraph>
<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_SAVE">Saves the current list of line styles, so that you can load it again later.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05200300.xhp b/helpcontent2/source/text/shared/01/05200300.xhp
index 8255f66301..0fbf0b1679 100755
--- a/helpcontent2/source/text/shared/01/05200300.xhp
+++ b/helpcontent2/source/text/shared/01/05200300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05200300.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,23 +48,23 @@
</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>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_LINEEND_DEF:EDT_NAME" id="bm_id3152426" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME" id="bm_id3152426" localize="false"/>
<paragraph role="heading" id="hd_id3155552" xml-lang="en-US" level="3" l10n="U" oldref="7">Title</paragraph>
<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXPAGE_LINEEND_DEF:EDT_NAME">Displays the name of the selected arrow style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS" id="bm_id3153578" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS" id="bm_id3153578" localize="false"/>
<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Arrow style</paragraph>
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS">Choose a predefined arrow style symbol from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_ADD" id="bm_id3153346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD" id="bm_id3153346" localize="false"/>
<paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="2" l10n="U" oldref="11">Add</paragraph>
<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_ADD">To define a custom arrow style, select a drawing object in the document, and then click here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE" id="bm_id3150772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE" id="bm_id3150772" localize="false"/>
<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="17">Save Arrow Styles</paragraph>
<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE">Saves the current list of arrow styles, so that you can load it later.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05210000.xhp b/helpcontent2/source/text/shared/01/05210000.xhp
index 23575bc0aa..7100af7ec8 100644
--- a/helpcontent2/source/text/shared/01/05210000.xhp
+++ b/helpcontent2/source/text/shared/01/05210000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05210100.xhp b/helpcontent2/source/text/shared/01/05210100.xhp
index 45a6cdc49c..02f9aeff10 100644
--- a/helpcontent2/source/text/shared/01/05210100.xhp
+++ b/helpcontent2/source/text/shared/01/05210100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210100.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,10 +63,10 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="CHG" oldref="55">List boxes on the <emph>Drawing Object Properties</emph> toolbar:</paragraph>
<embed href="text/shared/00/00000004.xhp#syflaechenstil"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_FILL_OFF" id="bm_id3152552" localize="false"/>
+<!-- removed HID SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_FILL_OFF -->
<paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="3" l10n="U" oldref="5">None</paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_FILL_OFF">Does not apply a fill to the selected object. If the object contains a fill, the fill is removed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLOR" id="bm_id3159234" localize="false"/>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLOR -->
<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="8">Color</paragraph>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLOR">Fills the selected object with the color that you click in the list.</ahelp></paragraph>
<switch select="appl">
@@ -80,73 +77,73 @@
<paragraph role="note" id="par_id9695730" xml-lang="en-US" l10n="NEW">To add a color to the list, choose <link href="text/shared/optionen/01010500.xhp" name="Format - Area"><emph>Format - Area</emph></link>, click the <emph>Colors</emph> tab, and then click <emph>Edit</emph>.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_GRADIENT" id="bm_id3153349" localize="false"/>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_GRADIENT -->
<paragraph role="heading" id="hd_id3144438" xml-lang="en-US" level="3" l10n="U" oldref="10">Gradient</paragraph>
<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_GRADIENT">Fills the selected object with the gradient that you click in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_HATCH" id="bm_id3148643" localize="false"/>
+<!-- removed HID SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_HATCH -->
<paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="12">Hatching</paragraph>
<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_AREA_RBT_HATCH">Fills the selected object with the hatching pattern that you click in the list. To apply a background color to the hatching pattern, select the <emph>Background color</emph> box, and then click a color in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_BITMAP" id="bm_id3146848" localize="false"/>
+<!-- removed HID SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_BITMAP -->
<paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="14">Bitmap</paragraph>
<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_BITMAP">Fills the selected object with the bitmap pattern that you click in the list. To add a bitmap to the list, open this dialog in %PRODUCTNAME Draw, click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_COLOR" id="bm_id3149244" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_GRADIENT" id="bm_id3145085" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_HATCHING" id="bm_id3144510" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_BITMAP" id="bm_id3161458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR" id="bm_id3149244" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT" id="bm_id3145085" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING" id="bm_id3144510" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP" id="bm_id3161458" localize="false"/>
<paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="3" l10n="U" oldref="16">Area Fill</paragraph>
<paragraph role="paragraph" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_AREA:LB_BITMAP">Click the fill that you want to apply to the selected object.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="2" l10n="U" oldref="20">Increments (Gradients)</paragraph>
<paragraph role="paragraph" id="par_id3144423" xml-lang="en-US" l10n="U" oldref="21">Set the number of steps for blending the two end colors of a gradient.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STEPCOUNT" id="bm_id3154923" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT" id="bm_id3154923" localize="false"/>
<paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="22">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STEPCOUNT">Automatically determines the number of steps for blending the two end colors of the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT" id="bm_id3153525" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT" id="bm_id3153525" localize="false"/>
<paragraph role="heading" id="hd_id3154388" xml-lang="en-US" level="3" l10n="U" oldref="24">Increment</paragraph>
<paragraph role="paragraph" id="par_id3150360" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT">Enter the number of steps for blending the two end colors of the gradient.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="2" l10n="U" oldref="31">Size (Bitmaps)</paragraph>
<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="32">Specify the dimensions of the bitmap.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_SCALE" id="bm_id3154153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE" id="bm_id3154153" localize="false"/>
<paragraph role="heading" id="hd_id3154068" xml-lang="en-US" level="3" l10n="U" oldref="33">Relative</paragraph>
<paragraph role="paragraph" id="par_id3125865" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_SCALE">Rescales the bitmap relative to the size of the selected object by the percentage values that you enter in the <emph>Width</emph> and <emph>Height</emph> boxes . Clear this checkbox to resize the selected object with the measurements that you enter in the <emph>Width</emph> and <emph>Height</emph> boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_ORIGINAL" id="bm_id3150740" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL" id="bm_id3150740" localize="false"/>
<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="35">Original</paragraph>
<paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_ORIGINAL">Retains the original size of the bitmap when filling the selected object. To resize the bitmap, clear this checkbox, and then click <emph>Relative</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE" id="bm_id3157320" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE" id="bm_id3157320" localize="false"/>
<paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="3" l10n="U" oldref="37">Width</paragraph>
<paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE">Enter a width for the bitmap.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE" id="bm_id3150650" localize="false"/>
<paragraph role="heading" id="hd_id3156281" xml-lang="en-US" level="3" l10n="U" oldref="39">Height</paragraph>
<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE">Enter a height for the bitmap.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148673" xml-lang="en-US" level="2" l10n="U" oldref="41">Position (Bitmaps)</paragraph>
<paragraph role="paragraph" id="par_id3154821" xml-lang="en-US" l10n="U" oldref="42">Click in the position grid to specify the offset for tiling the bitmap.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET" id="bm_id3153367" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET" id="bm_id3153367" localize="false"/>
<paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="3" l10n="U" oldref="43">X Offset</paragraph>
<paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET">Enter the horizontal offset for tiling the bitmap.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET" id="bm_id3150439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET" id="bm_id3150439" localize="false"/>
<paragraph role="heading" id="hd_id3149985" xml-lang="en-US" level="3" l10n="U" oldref="45">Y Offset</paragraph>
<paragraph role="paragraph" id="par_id3148559" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET">Enter the vertical offset for tiling the bitmap.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_TILE" id="bm_id3147213" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE" id="bm_id3147213" localize="false"/>
<paragraph role="heading" id="hd_id3156060" xml-lang="en-US" level="3" l10n="U" oldref="27">Tile</paragraph>
<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_TILE">Tiles the bitmap to fill the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STRETCH" id="bm_id3155746" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH" id="bm_id3155746" localize="false"/>
<paragraph role="heading" id="hd_id3150334" xml-lang="en-US" level="3" l10n="U" oldref="29">AutoFit</paragraph>
<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_AREA:TSB_STRETCH">Stretches the bitmap to fill the selected object. To use this feature, clear the <emph>Tile </emph>box.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148555" xml-lang="en-US" level="2" l10n="U" oldref="47">Offset</paragraph>
<paragraph role="paragraph" id="par_id3155412" xml-lang="en-US" l10n="U" oldref="48">Specify the offset for tiling the bitmap in terms of rows and columns.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_ROW" id="bm_id3150012" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW" id="bm_id3150012" localize="false"/>
<paragraph role="heading" id="hd_id3151115" xml-lang="en-US" level="3" l10n="U" oldref="49">Row</paragraph>
<paragraph role="paragraph" id="par_id3155369" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_ROW">Horizontally offsets the original bitmap relative to the bitmap tiles by the amount that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLUMN" id="bm_id3147478" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN" id="bm_id3147478" localize="false"/>
<paragraph role="heading" id="hd_id3144442" xml-lang="en-US" level="3" l10n="U" oldref="51">Column</paragraph>
<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_AREA:RBT_COLUMN">Vertically offsets the original bitmap relative to the bitmap tiles by the amount that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_OFFSET" id="bm_id3156441" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET" id="bm_id3156441" localize="false"/>
<paragraph role="heading" id="hd_id3150684" xml-lang="en-US" level="3" l10n="U" oldref="53">Percent</paragraph>
<paragraph role="paragraph" id="par_id3155314" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_AREA:MTR_FLD_OFFSET">Enter the percentage to offset the rows or columns.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152887" xml-lang="en-US" level="2" l10n="U" oldref="59">Background Color (Hatching)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_AREA:CB_HATCHBCKGRD" id="bm_id3163713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD" id="bm_id3163713" localize="false"/>
<paragraph role="heading" id="hd_id3153364" xml-lang="en-US" level="3" l10n="U" oldref="61">Background color</paragraph>
<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_AREA:CB_HATCHBCKGRD">Applies a background color to the hatching pattern. Select this checkbox, and then click a color in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR" id="bm_id3150103" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR" id="bm_id3150103" localize="false"/>
<paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="3" l10n="U" oldref="63">List of colors</paragraph>
<paragraph role="paragraph" id="par_id3157309" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR">Click the color that you want to use as a background for the selected hatching pattern.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05210200.xhp b/helpcontent2/source/text/shared/01/05210200.xhp
index cf965a771b..957e420b52 100755
--- a/helpcontent2/source/text/shared/01/05210200.xhp
+++ b/helpcontent2/source/text/shared/01/05210200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
<embed href="text/shared/00/00040502.xhp#farben"/>
</section>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="Tools - Options - $[officename] - Colors">Tools - Options - $[officename] - Colors</link></paragraph>
+<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010500.xhp" name="$[officename] - Colors">$[officename] - Colors</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05210300.xhp b/helpcontent2/source/text/shared/01/05210300.xhp
index 4db7de5d5f..193cebb906 100755
--- a/helpcontent2/source/text/shared/01/05210300.xhp
+++ b/helpcontent2/source/text/shared/01/05210300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210300.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,61 +32,69 @@
<meta>
-<topic id="textshared0105210300xml" indexer="include">
-<title id="tit" xml-lang="en-US">Gradients</title>
-<filename>/text/shared/01/05210300.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="farbverlaeufe">
+ <topic id="textshared0105210300xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Gradients</title>
+ <filename>/text/shared/01/05210300.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="farbverlaeufe">
<bookmark xml-lang="en-US" branch="hid/HID_AREA_GRADIENT" id="bm_id3149991" localize="false"/>
-<paragraph role="heading" id="hd_id3145356" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05210300.xhp" name="Gradients">Gradients</link></paragraph>
-<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"/>
-</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>
-<paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES">Lists the available gradients. Click the gradient that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_X" id="bm_id3154422" localize="false"/>
-<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="3" l10n="U" oldref="5">Center X</paragraph>
-<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_X">Enter the horizontal offset for the gradient, where 0% corresponds to the current horizontal location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y" id="bm_id3152801" localize="false"/>
-<paragraph role="heading" id="hd_id3157896" xml-lang="en-US" level="3" l10n="U" oldref="7">Center Y</paragraph>
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y">Enter the vertical offset for the gradient, where 0% corresponds to the current vertical location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_ANGLE" id="bm_id3147089" localize="false"/>
-<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="9">Angle</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_ANGLE">Enter a rotation angle for the selected gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_BORDER" id="bm_id3148621" localize="false"/>
-<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="11">Border</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_BORDER">Enter the amount by which you want to adjust the area of the endpoint color on the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="3" l10n="U" oldref="35">From</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM" id="bm_id3145383" localize="false"/>
-<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM">Select a color for the beginning point of the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM" id="bm_id3163803" localize="false"/>
-<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM">Enter the intensity for the color in the <emph>From </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="3" l10n="U" oldref="36">To</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_TO" id="bm_id3150085" localize="false"/>
-<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_TO">Select a color for the endpoint of the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO" id="bm_id3153127" localize="false"/>
-<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO">Enter the intensity for the color in the <emph>To </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENTS" id="bm_id3159116" localize="false"/>
-<paragraph role="heading" id="hd_id3155830" xml-lang="en-US" level="3" l10n="U" oldref="15">Gradients</paragraph>
-<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENTS">Select the type of gradient that you want to apply or create.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_ADD" id="bm_id3155180" localize="false"/>
-<paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="17">Add</paragraph>
-<paragraph role="paragraph" id="par_id3145416" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_ADD">Adds a custom gradient to the current list. Specify the properties of your gradient, and then click this button</ahelp></paragraph>
-<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>
-<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>
-<paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_LOAD">Load a different list of gradients.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_SAVE" id="bm_id3145609" localize="false"/>
-<paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="2" l10n="U" oldref="33">Save Gradients List</paragraph>
-<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_SAVE">Saves the current list of gradients, so that you can load it later.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3145356" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05210300.xhp" name="Gradients">Gradients</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154812" role="paragraph" 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"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES" id="bm_id3153089" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148983" role="heading" level="2" l10n="U" oldref="3">Type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148440" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES">Select the gradient that you want to apply.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X" id="bm_id3154422" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="2" l10n="U" oldref="5">Center X</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153114" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_X">Enter the horizontal offset for the gradient, where 0% corresponds to the current horizontal location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y" id="bm_id3152801" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157896" role="heading" level="2" l10n="U" oldref="7">Center Y</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154751" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y">Enter the vertical offset for the gradient, where 0% corresponds to the current vertical location of the endpoint color in the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE" id="bm_id3147089" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U" oldref="9">Angle</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_ANGLE">Enter a rotation angle for the selected gradient.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER" id="bm_id3148621" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149827" role="heading" level="2" l10n="U"
+ oldref="11">Border</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_BORDER">Enter the amount by which you want to adjust the area of the endpoint color on the gradient. The endpoint color is the color that is selected in the <emph>To</emph> box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152551" role="heading" level="2" l10n="U"
+ oldref="35">From</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM" id="bm_id3145383" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153527" role="paragraph" l10n="U" oldref="23"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM">Select a color for the beginning point of the gradient.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM" id="bm_id3163803" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149398" role="paragraph" l10n="U" oldref="25"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM">Enter the intensity for the color in the <emph>From </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149903" role="heading" level="2" l10n="U"
+ oldref="36">To</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO" id="bm_id3150085" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3159269" role="paragraph" l10n="U" oldref="27"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_COLOR_TO">Select a color for the endpoint of the gradient.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO" id="bm_id3153127" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="U" oldref="29"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO">Enter the intensity for the color in the <emph>To </emph>box, where 0% corresponds to black, and 100 % to the selected color.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS" id="bm_id3159116" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155830" role="heading" level="2" l10n="U"
+ oldref="15">Gradients</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157909" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENTS">Select the type of gradient that you want to apply or create.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD" id="bm_id3155180" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150669" role="heading" level="2" l10n="U"
+ oldref="17">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145416" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_ADD">Adds a custom gradient to the current list. Specify the properties of your gradient, and then click this button</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY" id="bm_id3153543" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150772" role="heading" level="2" l10n="U"
+ oldref="19">Modify</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph" 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>
+ <embed href="text/shared/00/00000001.xhp#loeschen"/>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD" id="bm_id3146848" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155341" role="heading" level="2" l10n="U"
+ oldref="31">Load Gradients List</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145085" role="paragraph" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_LOAD">Load a different list of gradients.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE" id="bm_id3145609" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148943" role="heading" level="2" l10n="U"
+ oldref="33">Save Gradients List</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3161459" role="paragraph" l10n="U" oldref="34"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_SAVE">Saves the current list of gradients, so that you can load it later.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05210400.xhp b/helpcontent2/source/text/shared/01/05210400.xhp
index e8401f946e..ca58813287 100755
--- a/helpcontent2/source/text/shared/01/05210400.xhp
+++ b/helpcontent2/source/text/shared/01/05210400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210400.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,38 +52,38 @@
</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>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE" id="bm_id3155392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE" id="bm_id3155392" localize="false"/>
<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="3" l10n="U" oldref="5">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3147010" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE">Enter the amount of space that you want to have between the hatch lines.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE" id="bm_id3154289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE" id="bm_id3154289" localize="false"/>
<paragraph role="heading" id="hd_id3155355" xml-lang="en-US" level="3" l10n="U" oldref="7">Angle</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE">Enter the rotation angle for the hatch lines, or click a position in the angle grid.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPHATCH_CTRL" id="bm_id3150355" localize="false"/>
<paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="3" l10n="U" oldref="9">Angle grid</paragraph>
<paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TPHATCH_CTRL">Click a position in the grid to define the rotation angle for the hatch lines.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_TYPE" id="bm_id3154898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE" id="bm_id3154898" localize="false"/>
<paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="U" oldref="21">Line type</paragraph>
<paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_TYPE">Select the type of hatch lines that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_COLOR" id="bm_id3154307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR" id="bm_id3154307" localize="false"/>
<paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="23">Line color</paragraph>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_LINE_COLOR">Select the color of the hatch lines.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159147" xml-lang="en-US" level="2" l10n="U" oldref="11">Hatches List</paragraph>
<paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="12">Lists the available hatching patterns. You can also modify or create your own hatching pattern. To save the list, click the <emph>Save Hatches List</emph> button. To display a different list, click the <emph>Load Hatches List</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_HATCHINGS" id="bm_id3153699" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS" id="bm_id3153699" localize="false"/>
<paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="3" l10n="U" oldref="13">Hatches list</paragraph>
<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HATCH:LB_HATCHINGS">Lists the available hatching patterns. Click the hatching pattern that you want to apply, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_ADD" id="bm_id3155389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD" id="bm_id3155389" localize="false"/>
<paragraph role="heading" id="hd_id3153823" xml-lang="en-US" level="3" l10n="U" oldref="15">Add</paragraph>
<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_ADD">Adds a custom hatching pattern to the current list. Specify the properties of your hatching pattern, and then click this button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_MODIFY" id="bm_id3146848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_LOAD">Loads a different list of hatching patterns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_SAVE" id="bm_id3156435" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE" id="bm_id3156435" localize="false"/>
<paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="2" l10n="U" oldref="27">Save Hatches List</paragraph>
<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_SAVE">Saves the current list of hatching patterns, so that you can load it later.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05210500.xhp b/helpcontent2/source/text/shared/01/05210500.xhp
index ff9361dbaa..ce3cab0747 100755
--- a/helpcontent2/source/text/shared/01/05210500.xhp
+++ b/helpcontent2/source/text/shared/01/05210500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210500.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,30 +56,30 @@
<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>
<paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="5">Grid</paragraph>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="6">To enable this editor, select the <emph>Blank</emph> bitmap in the bitmap list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_COLOR" id="bm_id3154824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR" id="bm_id3154824" localize="false"/>
<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="17">Foreground color</paragraph>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_COLOR">Select a foreground color, and then click in the grid to add a pixel to the pattern.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR" id="bm_id3156347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR" id="bm_id3156347" localize="false"/>
<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="19">Background color</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR">Select a background color for your bitmap pattern.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BITMAPS" id="bm_id3159256" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS" id="bm_id3159256" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="7">Bitmap Pattern</paragraph>
<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BITMAP:LB_BITMAPS">Select a bitmap in the list, and then click <emph>OK</emph> to apply the pattern to the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_ADD" id="bm_id3152910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD" id="bm_id3152910" localize="false"/>
<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2" l10n="U" oldref="9">Add</paragraph>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_ADD">Adds a bitmap that you created in the <emph>Pattern Editor </emph>to the current list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_MODIFY" id="bm_id3148992" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY" id="bm_id3148992" localize="false"/>
<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="11">Modify</paragraph>
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_MODIFY">Replaces a bitmap that you created in the <emph>Pattern Editor</emph> with the current bitmap 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_BITMAP:BTN_IMPORT" id="bm_id3152945" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_LOAD">Loads a different list of bitmaps.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_SAVE" id="bm_id3161458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE" id="bm_id3161458" localize="false"/>
<paragraph role="heading" id="hd_id3151246" xml-lang="en-US" level="2" l10n="U" oldref="23">Save Bitmap List</paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_SAVE">Saves the current list of bitmaps, so that you can load it later.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05210600.xhp b/helpcontent2/source/text/shared/01/05210600.xhp
index cbc32f0b83..e8aa7cc8e1 100644
--- a/helpcontent2/source/text/shared/01/05210600.xhp
+++ b/helpcontent2/source/text/shared/01/05210600.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210600.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,19 +55,19 @@
</section>
<paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="4">Set the properties of the shadow that you want to apply.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW" id="bm_id3166411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW" id="bm_id3166411" localize="false"/>
<paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="5">Use shadow</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW">Adds a shadow to the selected drawing object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPSHADOW_CTRL" id="bm_id3145315" localize="false"/>
<paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="3" l10n="U" oldref="7">Position</paragraph>
<paragraph role="paragraph" id="par_id3146138" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_TPSHADOW_CTRL">Click where you want to cast the shadow.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE" id="bm_id3150085" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE" id="bm_id3150085" localize="false"/>
<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="3" l10n="U" oldref="9">Distance</paragraph>
<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE">Enter the distance that you want the shadow to be offset from the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR" id="bm_id3155420" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR" id="bm_id3155420" localize="false"/>
<paragraph role="heading" id="hd_id3150276" xml-lang="en-US" level="3" l10n="U" oldref="11">Color</paragraph>
<paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR">Select a color for the shadow.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT" id="bm_id3155180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT" id="bm_id3155180" localize="false"/>
<paragraph role="heading" id="hd_id3148992" xml-lang="en-US" level="3" l10n="U" oldref="13">Transparency</paragraph>
<paragraph role="paragraph" id="par_id3148642" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT">Enter a percentage from 0% (opaque) to 100% (transparent) to specify the transparency of the shadow.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/05210700.xhp b/helpcontent2/source/text/shared/01/05210700.xhp
index a2f4a0a86a..b3270015fd 100755
--- a/helpcontent2/source/text/shared/01/05210700.xhp
+++ b/helpcontent2/source/text/shared/01/05210700.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05210700.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,37 +52,37 @@
</section>
<paragraph role="heading" id="hd_id3152363" xml-lang="en-US" level="2" l10n="U" oldref="30">Transparency mode</paragraph>
<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US" l10n="U" oldref="3">Specify the type of transparency that you want to apply.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF" id="bm_id3093440" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF" id="bm_id3093440" localize="false"/>
<paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="3" l10n="U" oldref="4">No transparency</paragraph>
<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF">Turns off color transparency.</ahelp> This is the default setting.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR" id="bm_id3153049" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR" id="bm_id3153049" localize="false"/>
<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="3" l10n="U" oldref="6">Transparency</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR">Turns on color transparency. Select this option, and then enter a number in the box, where 0% is fully opaque and 100% is fully transparent.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT" id="bm_id3143267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT" id="bm_id3143267" localize="false"/>
<paragraph role="heading" id="hd_id3155941" xml-lang="en-US" level="3" l10n="U" oldref="14">Transparency spin button</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT">Adjusts the transparency of the current fill color. Enter a number between 0% (opaque) and 100% (transparent).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT" id="bm_id3149177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT" id="bm_id3149177" localize="false"/>
<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="11">Gradient</paragraph>
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT">Applies a transparency gradient to the current fill color. Select this option, and then set the gradient properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES" id="bm_id3109847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES" id="bm_id3109847" localize="false"/>
<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="17">Type</paragraph>
<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES">Select the type of transparency gradient that you want to apply.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X" id="bm_id3154514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X" id="bm_id3154514" localize="false"/>
<paragraph role="heading" id="hd_id3145317" xml-lang="en-US" level="3" l10n="U" oldref="19">Center X</paragraph>
<paragraph role="paragraph" id="par_id3155583" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X">Enter the horizontal offset for the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y" id="bm_id3155628" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y" id="bm_id3155628" localize="false"/>
<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="3" l10n="U" oldref="21">Center Y</paragraph>
<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y">Enter the vertical offset for the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE" id="bm_id3159115" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE" id="bm_id3159115" localize="false"/>
<paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="3" l10n="U" oldref="23">Angle</paragraph>
<paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE">Enter a rotation angle for the gradient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER" id="bm_id3159147" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER" id="bm_id3159147" localize="false"/>
<paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="25">Border</paragraph>
<paragraph role="paragraph" id="par_id3149784" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER">Enter the amount by which you want to adjust the transparent area of the gradient. The default value is 0%.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE" id="bm_id3149763" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE" id="bm_id3149763" localize="false"/>
<paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="26">Start value</paragraph>
<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE">Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100% is fully transparent.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE" id="bm_id3159157" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE" id="bm_id3159157" localize="false"/>
<paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="3" l10n="U" oldref="28">End value</paragraph>
<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE">Enter a transparency value for the endpoint of the gradient, where 0% is fully opaque and 100% is fully transparent.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2" l10n="U" oldref="9">Preview</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05220000.xhp b/helpcontent2/source/text/shared/01/05220000.xhp
index 5c653382fa..85e54043b8 100644
--- a/helpcontent2/source/text/shared/01/05220000.xhp
+++ b/helpcontent2/source/text/shared/01/05220000.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05220000.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,74 +29,80 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105220000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Text</title>
-<filename>/text/shared/01/05220000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T12:00:57">UFI: some changes to fix #i32887#</lastedited>
-</history>
-</meta>
-<body>
-<section id="text">
+ <topic id="textshared0105220000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Text</title>
+ <filename>/text/shared/01/05220000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="text">
<bookmark xml-lang="en-US" branch="index" id="bm_id3146856"><bookmark_value>text; text/draw objects</bookmark_value>
-<bookmark_value>draw objects; text in</bookmark_value>
-<bookmark_value>frames; text fitting to frames</bookmark_value>
+ <bookmark_value>draw objects; text in</bookmark_value>
+ <bookmark_value>frames; text fitting to frames</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_TEXTATTR_DLG" id="bm_id463689" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TextAttributes" id="bm_id3160463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_TEXTATTR" id="bm_id3153514" localize="false"/>
-<paragraph role="heading" id="hd_id3146856" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05220000.xhp" name="Text">Text</link></paragraph>
-<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_PAGE_TEXTATTR">Sets the layout and anchoring properties for text in the selected drawing or text object.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#text"/>
-</section>
-<paragraph role="paragraph" id="par_id3154794" xml-lang="en-US" l10n="U" oldref="4">The text is positioned relative to the edges of the drawing or text object.</paragraph>
-<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="2" l10n="U" oldref="5">Text</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_WIDTH" id="bm_id3154230" localize="false"/>
-<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="3" l10n="U" oldref="7">Fit width to text</paragraph>
-<paragraph role="paragraph" id="par_id3145629" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_WIDTH">Expands the width of the object to the width of the text, if the object is smaller than the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_HEIGHT" id="bm_id3146109" localize="false"/>
-<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="3" l10n="U" oldref="9">Fit height to text</paragraph>
-<paragraph role="paragraph" id="par_id3149640" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_HEIGHT">Expands the height of the object to the height of the text, if the object is smaller than the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FIT_TO_SIZE" id="bm_id3150144" localize="false"/>
-<paragraph role="heading" id="hd_id3152867" xml-lang="en-US" level="3" l10n="U" oldref="11">Fit to frame</paragraph>
-<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FIT_TO_SIZE">Resizes the text to fit the entire area of the drawing or text object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_CONTOUR" id="bm_id3155942" localize="false"/>
-<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Adjust to contour</paragraph>
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_CONTOUR">Adapts the text flow so that it match the contours of the selected drawing object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_TEXTATTR_TSB_WORDWRAP_TEXT" id="bm_id8065736" localize="false"/>
-<paragraph role="heading" id="par_idN10705" xml-lang="en-US" level="3" l10n="NEW">Word wrap text in shape</paragraph>
-<paragraph role="paragraph" id="par_idN10709" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Wraps the text that you add after double-clicking a custom shape to fit inside the shape.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_SIZE" id="bm_id8341929" localize="false"/>
-<paragraph role="heading" id="par_idN10720" xml-lang="en-US" level="3" l10n="NEW">Resize shape to fit text</paragraph>
-<paragraph role="paragraph" id="par_idN10724" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resizes a custom shape to fit the text that you enter after double-clicking the shape.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="2" l10n="CHG" oldref="13">Spacing to borders</paragraph>
-<paragraph role="paragraph" id="par_id3151265" xml-lang="en-US" l10n="U" oldref="14">Specify the amount of space to leave between the edges of the drawing or text object and the borders of the text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_LEFT" id="bm_id3149812" localize="false"/>
-<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="15">Left</paragraph>
-<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_LEFT">Enter the amount of space to leave between the left edge of the drawing or text object and the left border of the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_RIGHT" id="bm_id3143271" localize="false"/>
-<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="3" l10n="U" oldref="17">Right</paragraph>
-<paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_RIGHT">Enter the amount of space to leave between the right edge of the drawing or text object and the right border of the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_TOP" id="bm_id3145227" localize="false"/>
-<paragraph role="heading" id="hd_id3148926" xml-lang="en-US" level="3" l10n="U" oldref="19">Top</paragraph>
-<paragraph role="paragraph" id="par_id3157808" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_TOP">Enter the amount of space to leave between the top edge of the drawing or text object and the upper border of the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM" id="bm_id3150130" localize="false"/>
-<paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="21">Bottom</paragraph>
-<paragraph role="paragraph" id="par_id3159342" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM">Enter the amount of space to leave between the bottom edge of the drawing or text object and the lower border of the text.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149192" xml-lang="en-US" level="2" l10n="U" oldref="23">Text anchor</paragraph>
-<paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="24">Set the anchor type and the anchor position.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146856" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05220000.xhp" name="Text">Text</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150279" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_PAGE_TEXTATTR">Sets the layout and anchoring properties for text in the selected drawing or text object.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040502.xhp#text"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3154794" role="paragraph" l10n="U" oldref="4">The text is positioned relative to the edges of the drawing or text object.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149031" role="heading" level="2" l10n="U" oldref="5">Text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH" id="bm_id3154230" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150445" role="heading" level="3" l10n="U" oldref="7">Fit width to text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145629" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_WIDTH">Expands the width of the object to the width of the text, if the object is smaller than the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT" id="bm_id3146109" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="3" l10n="U" oldref="9">Fit height to text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149640" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_AUTOGROW_HEIGHT">Expands the height of the object to the height of the text, if the object is smaller than the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE" id="bm_id3150144" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152867" role="heading" level="3" l10n="U"
+ oldref="11">Fit to frame</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147834" role="paragraph" l10n="U" oldref="12"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FIT_TO_SIZE">Resizes the text to fit the entire area of the drawing or text object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR" id="bm_id3155942" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155892" role="heading" level="3" l10n="CHG"
+ oldref="29">Adjust to contour</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153577" role="paragraph" l10n="U" oldref="30"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_CONTOUR">Adapts the text flow so that it matches the contours of the selected drawing object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT" id="bm_id8065736" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10705" role="heading" level="3" l10n="NEW">Word wrap text in shape</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10709" role="paragraph" l10n="NEW"><ahelp hid=".">Wraps the text that you add after double-clicking a custom shape to fit inside the shape.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE" id="bm_id8341929" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10720" role="heading" level="3" l10n="NEW">Resize shape to fit text</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10724" role="paragraph" l10n="NEW"><ahelp hid=".">Resizes a custom shape to fit the text that you enter after double-clicking the shape.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154288" role="heading" level="2" l10n="CHG"
+ oldref="13">Spacing to borders</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151265" role="paragraph" l10n="U" oldref="14">Specify the amount of space to leave between the edges of the drawing or text object and the borders of the text.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT" id="bm_id3149812" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150443" role="heading" level="3" l10n="U"
+ oldref="15">Left</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_LEFT">Enter the amount of space to leave between the left edge of the drawing or text object and the left border of the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT" id="bm_id3143271" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155419" role="heading" level="3" l10n="U"
+ oldref="17">Right</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155388" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_RIGHT">Enter the amount of space to leave between the right edge of the drawing or text object and the right border of the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP" id="bm_id3145227" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148926" role="heading" level="3" l10n="U"
+ oldref="19">Top</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157808" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_TOP">Enter the amount of space to leave between the top edge of the drawing or text object and the upper border of the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM" id="bm_id3150130" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149237" role="heading" level="3" l10n="U"
+ oldref="21">Bottom</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159342" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM">Enter the amount of space to leave between the bottom edge of the drawing or text object and the lower border of the text.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149192" role="heading" level="2" l10n="U"
+ oldref="23">Text anchor</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155179" role="paragraph" l10n="U" oldref="24">Set the anchor type and the anchor position.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TEXTATTR_CTL_POSITION" id="bm_id3149955" localize="false"/>
-<paragraph role="heading" id="hd_id3154381" xml-lang="en-US" level="3" l10n="U" oldref="25">Graphic field</paragraph>
-<paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="HID_TEXTATTR_CTL_POSITION">Click where you want to place the anchor for the text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH" id="bm_id3149763" localize="false"/>
-<paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="27">Full width</paragraph>
-<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH">Anchors the text to the full width of the drawing or text object.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3154381" role="heading" level="3" l10n="U"
+ oldref="25">Graphic field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155504" role="paragraph" l10n="U" oldref="26"><ahelp hid="HID_TEXTATTR_CTL_POSITION">Click where you want to place the anchor for the text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH" id="bm_id3149763" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155323" role="heading" level="3" l10n="U"
+ oldref="27">Full width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH">Anchors the text to the full width of the drawing or text object.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05230000.xhp b/helpcontent2/source/text/shared/01/05230000.xhp
index cd68112345..dd8dce0fa6 100644
--- a/helpcontent2/source/text/shared/01/05230000.xhp
+++ b/helpcontent2/source/text/shared/01/05230000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05230000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05230100.xhp b/helpcontent2/source/text/shared/01/05230100.xhp
index f9864906d0..d7d0f270cf 100755
--- a/helpcontent2/source/text/shared/01/05230100.xhp
+++ b/helpcontent2/source/text/shared/01/05230100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05230100.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,10 +58,10 @@
</section>
<paragraph role="heading" id="hd_id3158405" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="4">Specify the location of the selected object on the page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_X" id="bm_id3154184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X" id="bm_id3154184" localize="false"/>
<paragraph role="heading" id="hd_id3157896" xml-lang="en-US" level="3" l10n="U" oldref="5">Position X</paragraph>
<paragraph role="paragraph" id="par_id3155616" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_X">Enter the horizontal distance that you want to move the object relative to the base point selected in the grid.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_Y" id="bm_id3155805" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y" id="bm_id3155805" localize="false"/>
<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="7">Position Y</paragraph>
<paragraph role="paragraph" id="par_id3147373" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_Y">Enter the vertical distance that you want to move the object relative to the base point selected in the grid.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPPOSITION_CTRL" id="bm_id3155338" localize="false"/>
@@ -72,45 +69,45 @@
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TPPOSITION_CTRL">Click a base point in the grid, and then enter the amount that you want to shift the object relative to the base point that you selected in the <emph>Position Y</emph> and <emph>Position X</emph> boxes. The base points correspond to the selection handles on an object.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155942" xml-lang="en-US" level="2" l10n="U" oldref="19">Size</paragraph>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="20">Specify the amount by which you want to resize the selected object with respect to the selected base point .</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_WIDTH" id="bm_id3150693" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH" id="bm_id3150693" localize="false"/>
<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="21">Width</paragraph>
<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_WIDTH">Enter a width for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_HEIGHT" id="bm_id3166410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT" id="bm_id3166410" localize="false"/>
<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="23">Height</paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_HEIGHT">Enter a height for the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE" id="bm_id3156327" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE" id="bm_id3156327" localize="false"/>
<paragraph role="heading" id="hd_id3149796" xml-lang="en-US" level="3" l10n="U" oldref="25">Keep ratio</paragraph>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE">Maintains proportions when you resize the selected object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPSIZE_CTRL" id="bm_id3153665" localize="false"/>
<paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="3" l10n="U" oldref="29">Base point</paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="HID_TPSIZE_CTRL">Click a base point in the grid, and then enter the new size dimensions for the selected object in the <emph>Width</emph> and <emph>Height</emph> boxes.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148990" xml-lang="en-US" level="2" l10n="U" oldref="17">Protect</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_POSPROTECT" id="bm_id3153717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT" id="bm_id3153717" localize="false"/>
<paragraph role="heading" id="hd_id3153698" xml-lang="en-US" level="3" l10n="U" oldref="37">Position</paragraph>
<paragraph role="paragraph" id="par_id3149784" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_POSPROTECT">Prevents changes to the position or the size of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_SIZEPROTECT" id="bm_id3155434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT" id="bm_id3155434" localize="false"/>
<paragraph role="heading" id="hd_id3153254" xml-lang="en-US" level="3" l10n="U" oldref="27">Size</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_SIZEPROTECT">Prevents you from resizing the object.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149275" xml-lang="en-US" level="2" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="WRITER">Anchoring
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">Set the anchoring options for the selected object.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ANCHOR" id="bm_id3147303" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR" id="bm_id3147303" localize="false"/>
<paragraph role="heading" id="hd_id3151246" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Anchor
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ANCHOR"><switchinline select="appl"><caseinline select="WRITER">Select the type of anchor for the selected object.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ORIENT" id="bm_id3156434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT" id="bm_id3156434" localize="false"/>
<paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">Position
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_POSITION_SIZE_LB_ORIENT"><switchinline select="appl"><caseinline select="WRITER">Specifies the position of the anchor in relation to the character height.
</caseinline></switchinline></ahelp></paragraph>
<paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="2" l10n="U" oldref="31">Adapt</paragraph>
<paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="32">Resizes text in a drawing object with respect to the borders of the selected object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_WIDTH" id="bm_id3150290" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH" id="bm_id3150290" localize="false"/>
<paragraph role="heading" id="hd_id3151042" xml-lang="en-US" level="3" l10n="U" oldref="33">Fit width to text</paragraph>
<paragraph role="paragraph" id="par_id3159151" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_WIDTH">Resizes the text to fit the width of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_HEIGHT" id="bm_id3154909" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT" id="bm_id3154909" localize="false"/>
<paragraph role="heading" id="hd_id3145746" xml-lang="en-US" level="3" l10n="U" oldref="35">Fit height to text</paragraph>
<paragraph role="paragraph" id="par_id3154068" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_HEIGHT">Resizes the text to fit the height of the selected object.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/05230300.xhp b/helpcontent2/source/text/shared/01/05230300.xhp
index 0406863806..9e0ed30ba3 100644
--- a/helpcontent2/source/text/shared/01/05230300.xhp
+++ b/helpcontent2/source/text/shared/01/05230300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05230300.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,10 +51,10 @@
<paragraph role="paragraph" id="par_id3150902" xml-lang="en-US" l10n="U" oldref="4">The selected object is rotated around a pivot point that you specify. The default pivot point is at the center of the object.</paragraph>
<paragraph role="note" id="par_id3153528" xml-lang="en-US" l10n="U" oldref="17">If you set a pivot point too far outside of the object boundaries, the object could be rotated off of the page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X" id="bm_id3109848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X" id="bm_id3109848" localize="false"/>
<paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="5">X Position</paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X">Enter the horizontal distance from the left edge of the page to the pivot point.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y" id="bm_id3159158" localize="false"/>
<paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="7">Y Position</paragraph>
<paragraph role="paragraph" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y">Enter the vertical distance from the top edge of the page to the pivot point.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPROTATION_CTRL1" id="bm_id3148491" localize="false"/>
@@ -65,7 +62,7 @@
<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_TPROTATION_CTRL1">Click where you want to place the pivot point.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146847" xml-lang="en-US" level="2" l10n="U" oldref="11">Rotation angle</paragraph>
<paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="12">Specify the number of degrees that you want to rotate the selected object, or click in the rotation grid.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE" id="bm_id3149785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE" id="bm_id3149785" localize="false"/>
<paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="3" l10n="U" oldref="13">Angle</paragraph>
<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE">Enter the number of degrees that you want to rotate the selected object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPROTATION_CTRL2" id="bm_id3154380" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05230400.xhp b/helpcontent2/source/text/shared/01/05230400.xhp
index 4bf3fab054..2beb827703 100755
--- a/helpcontent2/source/text/shared/01/05230400.xhp
+++ b/helpcontent2/source/text/shared/01/05230400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05230400.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,12 +55,12 @@
</section>
<paragraph role="heading" id="hd_id3154497" xml-lang="en-US" level="2" l10n="U" oldref="3">Corner Radius</paragraph>
<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="4">You can only round the corners of a rectangular object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS" id="bm_id3156042" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS" id="bm_id3156042" localize="false"/>
<paragraph role="heading" id="hd_id3153935" xml-lang="en-US" level="3" l10n="U" oldref="5">Radius</paragraph>
<paragraph role="paragraph" id="par_id3147373" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS">Enter the radius of the circle that you want to use to round the corners.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="7">Slant</paragraph>
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="8">Slants the selected object along an axis that you specify.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE" id="bm_id3154318" localize="false"/>
<paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="9">Angle</paragraph>
<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE">Enter the angle of the slant axis.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05230500.xhp b/helpcontent2/source/text/shared/01/05230500.xhp
index 4a817f60ac..571d82c9bf 100644
--- a/helpcontent2/source/text/shared/01/05230500.xhp
+++ b/helpcontent2/source/text/shared/01/05230500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05230500.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,23 +59,23 @@
<paragraph role="note" id="par_id368358" xml-lang="en-US" l10n="NEW">These callouts are a legacy of the first versions of %PRODUCTNAME. You must customize a toolbar or menu to insert these callouts. The newer custom shape callouts offer more features, for example a Callouts toolbar
<image id="img_id3154508" src="res/commandimagelist/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
</image> where you can select the shape.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_WINKEL" id="bm_id3153551" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL" id="bm_id3153551" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_CAPTION_CTL_TYPE" id="bm_id3149999" localize="false"/>
<paragraph role="heading" id="hd_id3151330" xml-lang="en-US" level="2" l10n="U" oldref="3">Callout Styles</paragraph>
<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_CAPTION_CTL_TYPE">Click the <emph>Callout</emph> style that you want to apply to the selected callout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND" id="bm_id3152425" localize="false"/>
<paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="2" l10n="U" oldref="5">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND">Enter the amount of space that you want to leave between the end of the callout line, and the callout box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ" id="bm_id3147043" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ANSATZ" id="bm_id3153394" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL" id="bm_id3153527" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ" id="bm_id3147043" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ" id="bm_id3153394" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL" id="bm_id3153527" localize="false"/>
<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="7">Extension</paragraph>
<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL">Select where you want to extend the callout line from, in relation to the callout box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE" id="bm_id3146958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE" id="bm_id3146958" localize="false"/>
<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="2" l10n="U" oldref="9">Length</paragraph>
<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE">Enter the length of the callout line segment that extends from the callout box to the inflection point of the line.</ahelp></paragraph>
<paragraph role="note" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="11">The <emph>Length </emph>box is only available if you select the <emph>Angled connector line</emph> callout style, and leave the <emph>Optimal </emph>checkbox cleared.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE" id="bm_id3153332" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE" id="bm_id3153332" localize="false"/>
<paragraph role="heading" id="hd_id3149820" xml-lang="en-US" level="2" l10n="U" oldref="12">Optimal</paragraph>
<paragraph role="paragraph" id="par_id3147210" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE">Click here to display a single-angled line in an optimal way.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05240000.xhp b/helpcontent2/source/text/shared/01/05240000.xhp
index 09418257f4..004887e564 100755
--- a/helpcontent2/source/text/shared/01/05240000.xhp
+++ b/helpcontent2/source/text/shared/01/05240000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05240000.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05240100.xhp b/helpcontent2/source/text/shared/01/05240100.xhp
index 922d923565..75c8c82689 100644
--- a/helpcontent2/source/text/shared/01/05240100.xhp
+++ b/helpcontent2/source/text/shared/01/05240100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05240100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05240200.xhp b/helpcontent2/source/text/shared/01/05240200.xhp
index e36ef0b426..c942837ef2 100644
--- a/helpcontent2/source/text/shared/01/05240200.xhp
+++ b/helpcontent2/source/text/shared/01/05240200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05240200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250000.xhp b/helpcontent2/source/text/shared/01/05250000.xhp
index 7ddaebbf37..5a3d1ad0ef 100644
--- a/helpcontent2/source/text/shared/01/05250000.xhp
+++ b/helpcontent2/source/text/shared/01/05250000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05250000.xhp,v $
- * $Revision: 1.14.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250100.xhp b/helpcontent2/source/text/shared/01/05250100.xhp
index 59f4307a90..1c47f86ede 100644
--- a/helpcontent2/source/text/shared/01/05250100.xhp
+++ b/helpcontent2/source/text/shared/01/05250100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05250100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250200.xhp b/helpcontent2/source/text/shared/01/05250200.xhp
index 0afbc37a22..b3647305de 100644
--- a/helpcontent2/source/text/shared/01/05250200.xhp
+++ b/helpcontent2/source/text/shared/01/05250200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05250200.xhp,v $
- * $Revision: 1.11.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250300.xhp b/helpcontent2/source/text/shared/01/05250300.xhp
index 5b047c24b5..02fe555c4e 100644
--- a/helpcontent2/source/text/shared/01/05250300.xhp
+++ b/helpcontent2/source/text/shared/01/05250300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05250300.xhp,v $
- * $Revision: 1.11.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250400.xhp b/helpcontent2/source/text/shared/01/05250400.xhp
index 53346b830f..523ad0a6fe 100644
--- a/helpcontent2/source/text/shared/01/05250400.xhp
+++ b/helpcontent2/source/text/shared/01/05250400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05250400.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250500.xhp b/helpcontent2/source/text/shared/01/05250500.xhp
index 93adb88a0f..42753d4e5e 100644
--- a/helpcontent2/source/text/shared/01/05250500.xhp
+++ b/helpcontent2/source/text/shared/01/05250500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05250500.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05250600.xhp b/helpcontent2/source/text/shared/01/05250600.xhp
index ab7f9d1d8e..e36801fd18 100644
--- a/helpcontent2/source/text/shared/01/05250600.xhp
+++ b/helpcontent2/source/text/shared/01/05250600.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05250600.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260000.xhp b/helpcontent2/source/text/shared/01/05260000.xhp
index b8ac5f557c..c645d02155 100644
--- a/helpcontent2/source/text/shared/01/05260000.xhp
+++ b/helpcontent2/source/text/shared/01/05260000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05260000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260100.xhp b/helpcontent2/source/text/shared/01/05260100.xhp
index 153fe8a358..a60ec64928 100644
--- a/helpcontent2/source/text/shared/01/05260100.xhp
+++ b/helpcontent2/source/text/shared/01/05260100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05260100.xhp,v $
- * $Revision: 1.7.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260200.xhp b/helpcontent2/source/text/shared/01/05260200.xhp
index 41d868ce68..03f9a9fbf2 100644
--- a/helpcontent2/source/text/shared/01/05260200.xhp
+++ b/helpcontent2/source/text/shared/01/05260200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05260200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260300.xhp b/helpcontent2/source/text/shared/01/05260300.xhp
index dc6e8953ac..e6fc4bd8d5 100644
--- a/helpcontent2/source/text/shared/01/05260300.xhp
+++ b/helpcontent2/source/text/shared/01/05260300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05260300.xhp,v $
- * $Revision: 1.7.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260400.xhp b/helpcontent2/source/text/shared/01/05260400.xhp
index 295f7a8f23..f4c93e7be4 100644
--- a/helpcontent2/source/text/shared/01/05260400.xhp
+++ b/helpcontent2/source/text/shared/01/05260400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05260400.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260500.xhp b/helpcontent2/source/text/shared/01/05260500.xhp
index 1517d5a868..df4e4b878d 100644
--- a/helpcontent2/source/text/shared/01/05260500.xhp
+++ b/helpcontent2/source/text/shared/01/05260500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05260500.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05260600.xhp b/helpcontent2/source/text/shared/01/05260600.xhp
index 09df8c907c..69cd76f7a1 100644
--- a/helpcontent2/source/text/shared/01/05260600.xhp
+++ b/helpcontent2/source/text/shared/01/05260600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05260600.xhp,v $
- * $Revision: 1.6.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05270000.xhp b/helpcontent2/source/text/shared/01/05270000.xhp
index 540c9e29c9..183f7aaac4 100644
--- a/helpcontent2/source/text/shared/01/05270000.xhp
+++ b/helpcontent2/source/text/shared/01/05270000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05270000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05280000.xhp b/helpcontent2/source/text/shared/01/05280000.xhp
index 9c3d9b361e..ebf48f9388 100644
--- a/helpcontent2/source/text/shared/01/05280000.xhp
+++ b/helpcontent2/source/text/shared/01/05280000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05280000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@ UFI: exclude from indexing</lastedited>
<section id="fontwork">
<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK" id="bm_id8473091" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FontWork" id="bm_id3155620" localize="false"/>
-<paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="1" l10n="U" oldref="51"><link href="text/shared/01/05280000.xhp" name="FontWork">Fontwork Dialog (Previous Version)</link></paragraph>
+<paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="1" l10n="U" oldref="51"><variable id="fntwrk"><link href="text/shared/01/05280000.xhp" name="FontWork">Fontwork Dialog (Previous Version)</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid=".uno:FontWork">Edits Fontwork effects of the selected object that has been created with the previous Fontwork dialog.</ahelp><comment>UFI: this old dialog is still available to edit old docs containing old Fontwork objects. See "Fontwork_ui" spec doc.</comment></paragraph>
<paragraph role="note" id="par_id3155934" xml-lang="en-US" l10n="CHG" oldref="53">This <emph>Fontwork</emph> dialog is only available for Fontwork in old Writer text documents that were created prior to %PRODUCTNAME %PRODUCTVERSION. You must first call <emph>Tools - Customize</emph> to add a menu command or an icon to open this dialog.<comment>UFI: the command is in Customize dialog at Format-Fontwork</comment></paragraph>
</section>
@@ -208,7 +205,7 @@ UFI: exclude from indexing</lastedited>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE" id="bm_id3155600" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE" id="bm_id3155600" localize="false"/>
<paragraph role="paragraph" id="par_id3157844" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE">Enter the amount of space that you want to leave between the text baseline and the base of the individual characters.</ahelp></paragraph>
<table id="tbl_id3156180">
<tablerow>
@@ -223,7 +220,7 @@ UFI: exclude from indexing</lastedited>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART" id="bm_id3148496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART" id="bm_id3148496" localize="false"/>
<paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART">Enter the amount of space to leave between the beginning of the text baseline, and the beginning of the text.</ahelp></paragraph>
<table id="tbl_id3156322">
<tablerow>
@@ -313,7 +310,7 @@ UFI: exclude from indexing</lastedited>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X" id="bm_id3150980" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X" id="bm_id3150980" localize="false"/>
<paragraph role="heading" id="hd_id3156537" xml-lang="en-US" level="3" l10n="U" oldref="45">Horizontal Distance</paragraph>
<paragraph role="paragraph" id="par_id3151049" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X">Enter the horizontal distance between the text characters and the edge of the shadow.</ahelp></paragraph>
<table id="tbl_id3145764">
@@ -329,7 +326,7 @@ UFI: exclude from indexing</lastedited>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y" id="bm_id3148873" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y" id="bm_id3148873" localize="false"/>
<paragraph role="heading" id="hd_id3149450" xml-lang="en-US" level="3" l10n="U" oldref="47">Vertical Distance</paragraph>
<paragraph role="paragraph" id="par_id3153704" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y">Enter the vertical distance between the text characters and the edge of the shadow.</ahelp></paragraph>
<table id="tbl_id3149966">
@@ -345,7 +342,7 @@ UFI: exclude from indexing</lastedited>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR" id="bm_id3155111" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR" id="bm_id3155111" localize="false"/>
<paragraph role="heading" id="hd_id3149209" xml-lang="en-US" level="3" l10n="U" oldref="49">Shadow Color</paragraph>
<paragraph role="paragraph" id="par_id3148681" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR">Select a color for the text shadow.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/05290000.xhp b/helpcontent2/source/text/shared/01/05290000.xhp
index 48e221403f..89f235e2dd 100755
--- a/helpcontent2/source/text/shared/01/05290000.xhp
+++ b/helpcontent2/source/text/shared/01/05290000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05290000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05290100.xhp b/helpcontent2/source/text/shared/01/05290100.xhp
index a13e59e31f..8120205622 100644
--- a/helpcontent2/source/text/shared/01/05290100.xhp
+++ b/helpcontent2/source/text/shared/01/05290100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05290100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
<body>
- <bookmark branch="hid/FN_TOOL_GROUP" xml-lang="en-US" id="bm_id3149987"/><bookmark xml-lang="en-US" branch="hid/SID_GROUP" id="bm_id9823810" localize="false"/><!-- HID added by script -->
+ <!-- removed HID FN_TOOL_GROUP --><bookmark xml-lang="en-US" branch="hid/SID_GROUP" id="bm_id9823810" localize="false"/><!-- HID added by script -->
<bookmark branch="hid/.uno:FormatGroup" xml-lang="en-US" id="bm_id3150502"/><paragraph id="hd_id3152823" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/01/05290100.xhp" name="Group">Group</link></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154689" xml-lang="en-US" oldref="2"><variable id="gruppierentext"><ahelp hid=".uno:FormatGroup" visibility="visible">Groups the selected objects, so that they can be moved as a single object.</ahelp></variable></paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/shared/01/05290200.xhp b/helpcontent2/source/text/shared/01/05290200.xhp
index f21307882d..5fd4ee33d5 100644
--- a/helpcontent2/source/text/shared/01/05290200.xhp
+++ b/helpcontent2/source/text/shared/01/05290200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05290200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
<body>
- <bookmark branch="hid/FN_TOOL_UNGROUP" xml-lang="en-US" id="bm_id3152952"/><bookmark xml-lang="en-US" branch="hid/SID_UNGROUP" id="bm_id2549758" localize="false"/><!-- HID added by script -->
+ <!-- removed HID FN_TOOL_UNGROUP --><bookmark xml-lang="en-US" branch="hid/SID_UNGROUP" id="bm_id2549758" localize="false"/><!-- HID added by script -->
<bookmark branch="hid/.uno:FormatUngroup" xml-lang="en-US" id="bm_id3155577"/><paragraph id="hd_id3159217" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/01/05290200.xhp" name="Ungroup">Ungroup</link></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3156116" xml-lang="en-US" oldref="2"><variable id="aufhebentext"><ahelp hid=".uno:FormatUngroup" visibility="visible">Breaks apart the selected group into individual objects.</ahelp></variable></paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/shared/01/05290300.xhp b/helpcontent2/source/text/shared/01/05290300.xhp
index 2fd1ae72fa..fe40555c91 100644
--- a/helpcontent2/source/text/shared/01/05290300.xhp
+++ b/helpcontent2/source/text/shared/01/05290300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05290300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05290400.xhp b/helpcontent2/source/text/shared/01/05290400.xhp
index 87005edffc..8c1da71715 100644
--- a/helpcontent2/source/text/shared/01/05290400.xhp
+++ b/helpcontent2/source/text/shared/01/05290400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05290400.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05320000.xhp b/helpcontent2/source/text/shared/01/05320000.xhp
index 5fa5f2a754..73b90bef08 100644
--- a/helpcontent2/source/text/shared/01/05320000.xhp
+++ b/helpcontent2/source/text/shared/01/05320000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05320000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<section id="lauftext">
-<bookmark xml-lang="en-US" branch="hid/SVX:TABPAGE:RID_SVXPAGE_TEXTANIMATION" id="bm_id3147477" localize="false"/><paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05320000.xhp" name="Text Animation">Text Animation</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TabPage:RID_SVXPAGE_TEXTANIMATION" id="bm_id3147477" localize="false"/><paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05320000.xhp" name="Text Animation">Text Animation</link></paragraph>
<paragraph role="paragraph" id="par_id3154788" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:TABPAGE:RID_SVXPAGE_TEXTANIMATION">Adds an animation effect to the text in the selected drawing object.</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -52,9 +49,9 @@
</section>
<paragraph role="heading" id="hd_id3152821" xml-lang="en-US" level="2" l10n="U" oldref="4">Text animation effects</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="15">Select the effect that you want to apply, and then set the properties of the effect.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3158405" xml-lang="en-US" level="3" l10n="U" oldref="5">Effects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT" id="bm_id3149205" localize="false"/><paragraph role="heading" id="hd_id3158405" xml-lang="en-US" level="3" l10n="U" oldref="5">Effects</paragraph>
<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT">Select the animation effect that you want to apply to the text in the selected drawing object. To remove an animation effect, select <emph>No Effect</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT" id="bm_id3152801" localize="false"/><paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="3" l10n="U" oldref="6">To the Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT" id="bm_id3152801" localize="false"/><paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="3" l10n="U" oldref="6">To the Left</paragraph>
<paragraph role="paragraph" id="par_id3152867" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT">Scrolls text from right to left.</ahelp></paragraph>
<table id="tbl_id3147291">
<tablerow>
@@ -68,7 +65,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT" id="bm_id3145072" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="20">To the Right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT" id="bm_id3145072" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="3" l10n="U" oldref="20">To the Right</paragraph>
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT">Scrolls text from left to right.</ahelp></paragraph>
<table id="tbl_id3163802">
<tablerow>
@@ -82,7 +79,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_UP" id="bm_id3146138" localize="false"/><paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="23">To the Top</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP" id="bm_id3146138" localize="false"/><paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="23">To the Top</paragraph>
<paragraph role="paragraph" id="par_id3145416" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_UP">Scrolls text from bottom to top.</ahelp></paragraph>
<table id="tbl_id3147573">
<tablerow>
@@ -96,7 +93,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN" id="bm_id3150944" localize="false"/><paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="26">To the Bottom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN" id="bm_id3150944" localize="false"/><paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="26">To the Bottom</paragraph>
<paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN">Scrolls text from top to bottom.</ahelp></paragraph>
<table id="tbl_id3155583">
<tablerow>
@@ -111,27 +108,27 @@
</tablerow>
</table>
<paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="2" l10n="U" oldref="45">Properties</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE" id="bm_id3151056" localize="false"/><paragraph role="heading" id="hd_id3156434" xml-lang="en-US" level="3" l10n="U" oldref="7">Start Inside</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE" id="bm_id3151056" localize="false"/><paragraph role="heading" id="hd_id3156434" xml-lang="en-US" level="3" l10n="U" oldref="7">Start Inside</paragraph>
<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE">Text is visible and inside the drawing object when the effect is applied.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE" id="bm_id3151108" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Text visible when exiting<comment>i60202</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE" id="bm_id3151108" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="CHG" oldref="8">Text visible when exiting<comment>i60202</comment></paragraph>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE">Text remains visible after the effect is applied.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155738" xml-lang="en-US" level="2" l10n="U" oldref="9">Animation effects</paragraph>
<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="33">Set the looping options for the animation effect.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS" id="bm_id3144434" localize="false"/><paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="3" l10n="U" oldref="10">Continuous</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS" id="bm_id3144434" localize="false"/><paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="3" l10n="U" oldref="10">Continuous</paragraph>
<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS">Plays the animation effect continuously. To specify the number of times to play the effect, clear this checkbox, and enter a number in the <emph>Continuous</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT" id="bm_id3154821" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="39">Continuous box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT" id="bm_id3154821" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="39">Continuous box</paragraph>
<paragraph role="paragraph" id="par_id3154068" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT">Enter the number of times that you want the animation effect to repeat.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="2" l10n="U" oldref="13">Increment</paragraph>
<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="37">Specify the increment value for scrolling the text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL" id="bm_id3152803" localize="false"/><paragraph role="heading" id="hd_id3150870" xml-lang="en-US" level="3" l10n="U" oldref="14">Pixels</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL" id="bm_id3152803" localize="false"/><paragraph role="heading" id="hd_id3150870" xml-lang="en-US" level="3" l10n="U" oldref="14">Pixels</paragraph>
<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL">Measures increment value in pixels.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT" id="bm_id3152936" localize="false"/><paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="3" l10n="U" oldref="43">Increment box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT" id="bm_id3152936" localize="false"/><paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="3" l10n="U" oldref="43">Increment box</paragraph>
<paragraph role="paragraph" id="par_id3150495" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT">Enter the number of increments by which to scroll the text.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="2" l10n="U" oldref="11">Delay</paragraph>
<paragraph role="paragraph" id="par_id3148560" xml-lang="en-US" l10n="U" oldref="35">Specify the amount time to wait before repeating the effect.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO" id="bm_id3147352" localize="false"/><paragraph role="heading" id="hd_id3153370" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO" id="bm_id3147352" localize="false"/><paragraph role="heading" id="hd_id3153370" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO">$[officename] automatically determines the amount of time to wait before repeating the effect. To manually assign the delay period, clear this checkbox, and then enter a value in the<emph> Automatic</emph> box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY" id="bm_id3153952" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="41">Automatic box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY" id="bm_id3153952" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="41">Automatic box</paragraph>
<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY">Enter the amount of time to wait before repeating the effect.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340100.xhp b/helpcontent2/source/text/shared/01/05340100.xhp
index 4049929f3e..49b3dd622d 100644
--- a/helpcontent2/source/text/shared/01/05340100.xhp
+++ b/helpcontent2/source/text/shared/01/05340100.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,42 +27,36 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Row Height</title>
-<filename>/text/shared/01/05340100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T12:09:22">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/><!-- HID added by script -->
+ <topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Row Height</title>
+ <filename>/text/shared/01/05340100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:RowHeight" id="bm_id3150146" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ROWHEIGHT" id="bm_id3149987" localize="false"/>
-<paragraph role="heading" id="hd_id3154400" xml-lang="en-US" level="1" l10n="U" oldref="1">Row Height</paragraph>
-<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="U" oldref="2">
-<variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154400" role="heading" level="1" l10n="U" oldref="1">Row Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" l10n="U" oldref="2"><variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl">
-<caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider.
+ <paragraph xml-lang="en-US" id="par_id3150756" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider.
</caseinline></switchinline></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SC_METRICFIELD_RID_SCDLG_ROW_MAN_ED_VALUE" id="bm_id3146946" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE" id="bm_id3083278" localize="false"/>
-<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="2" l10n="U" oldref="3">Height</paragraph>
-<paragraph role="paragraph" id="par_id3144750" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_ROW_MAN_BTN_DEFVAL" id="bm_id3154840" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD" id="bm_id3150445" localize="false"/>
-<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="5"><switchinline select="appl">
-<caseinline select="CALC">Default value
-</caseinline><defaultinline>Automatic</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Automatically adjusts the row height based on the current font.</ahelp></paragraph>
-</body>
-</helpdocument>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/sc:MetricField:RID_SCDLG_ROW_MAN:ED_VALUE" id="bm_id3146946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE" id="bm_id3083278" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149962" role="heading" level="2" l10n="U" oldref="3">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144750" role="paragraph" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_ROW_MAN:BTN_DEFVAL" id="bm_id3154840" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD" id="bm_id3150445" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154926" role="heading" level="2" l10n="CHG"
+ oldref="5">Default value</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154894" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Adjusts the row height to the size based on the default template. Existing contents may be shown vertically cropped. The height no longer increases automatically when you enter larger contents.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05340200.xhp b/helpcontent2/source/text/shared/01/05340200.xhp
index 2e9896040a..cffac33e67 100644
--- a/helpcontent2/source/text/shared/01/05340200.xhp
+++ b/helpcontent2/source/text/shared/01/05340200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,9 +47,9 @@
<embed href="text/shared/00/00040503.xhp#fosb"/>
</section>
<paragraph l10n="U" role="paragraph" id="par_id3152821" xml-lang="en-US" oldref="7">You can also change the width of a column by dragging the divider beside the column header.<switchinline select="appl"> <caseinline select="CALC"> To fit the column width to the cell contents, double-click the divider.</caseinline> </switchinline></paragraph>
- <bookmark branch="hid/SC:METRICFIELD:RID_SCDLG_COL_MAN:ED_VALUE" xml-lang="en-US" id="bm_id3154984"/><bookmark branch="hid/DBACCESS_METRICFIELD_DLG_COLWIDTH_MF_VALUE" xml-lang="en-US" id="bm_id3153346"/><paragraph role="heading" level="2" id="hd_id3149346" l10n="U" xml-lang="en-US" oldref="3">Width</paragraph>
+ <bookmark branch="hid/sc:MetricField:RID_SCDLG_COL_MAN:ED_VALUE" xml-lang="en-US" id="bm_id3154984"/><bookmark branch="hid/dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE" xml-lang="en-US" id="bm_id3153346"/><paragraph role="heading" level="2" id="hd_id3149346" l10n="U" xml-lang="en-US" oldref="3">Width</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147576" xml-lang="en-US" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_COLWIDTH_MF_VALUE" visibility="visible">Enter the column width that you want to use.</ahelp></paragraph>
- <bookmark branch="hid/SC:CHECKBOX:RID_SCDLG_COL_MAN:BTN_DEFVAL" xml-lang="en-US" id="bm_id3155392"/><bookmark branch="hid/DBACCESS_CHECKBOX_DLG_COLWIDTH_CB_STANDARD" xml-lang="en-US" id="bm_id3157959"/><paragraph id="hd_id3148621" role="heading" level="2" oldref="5" l10n="U" xml-lang="en-US"><switchinline select="appl"> <caseinline select="CALC">Default value</caseinline> <defaultinline>Automatic</defaultinline> </switchinline></paragraph>
+ <bookmark branch="hid/sc:CheckBox:RID_SCDLG_COL_MAN:BTN_DEFVAL" xml-lang="en-US" id="bm_id3155392"/><bookmark branch="hid/dbaccess:CheckBox:DLG_COLWIDTH:CB_STANDARD" xml-lang="en-US" id="bm_id3157959"/><paragraph id="hd_id3148621" role="heading" level="2" oldref="5" l10n="U" xml-lang="en-US"><switchinline select="appl"> <caseinline select="CALC">Default value</caseinline> <defaultinline>Automatic</defaultinline> </switchinline></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147008" xml-lang="en-US" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_COLWIDTH_CB_STANDARD" visibility="visible">Automatically adjusts the column width based on the current font.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340300.xhp b/helpcontent2/source/text/shared/01/05340300.xhp
index d5988cb0a3..1e2980f14c 100644
--- a/helpcontent2/source/text/shared/01/05340300.xhp
+++ b/helpcontent2/source/text/shared/01/05340300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340300.xhp,v $
- * $Revision: 1.11.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
<section id="howtoget">
<embed href="text/shared/00/00040503.xhp#fozelaus"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN" id="bm_id3152821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN" id="bm_id3152821" localize="false"/>
<paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="3" l10n="U" oldref="54">Horizontal</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN">Select the horizontal alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146109" xml-lang="en-US" level="3" l10n="U" oldref="56">Default</paragraph>
@@ -80,10 +77,10 @@
<embed href="text/shared/00/00040502.xhp#syblocksatz"/>
<paragraph role="heading" id="par_idN1079C" xml-lang="en-US" level="3" l10n="NEW">Filled</paragraph>
<paragraph role="paragraph" id="par_idN107A0" xml-lang="en-US" l10n="NEW">Repeats the cell contents (number and text) until the visible area of the cell is filled. This feature does not work on text that contains line breaks.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="3" l10n="U" oldref="41">Indent</paragraph>
<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT">Indents from the left edge of the cell by the amount that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN" id="bm_id3153332" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN" id="bm_id3153332" localize="false"/>
<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="3" l10n="U" oldref="66">Vertical</paragraph>
<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Select the vertical alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146848" xml-lang="en-US" level="3" l10n="U" oldref="68">Default</paragraph>
@@ -116,7 +113,7 @@
</switch>
<bookmark xml-lang="en-US" branch="hid/HID_ALIGNMENT_CTR_DIAL" id="bm_id3151044" localize="false"/>
<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_ALIGNMENT_CTR_DIAL">Click in the dial to set the text orientation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES" id="bm_id3155742" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES" id="bm_id3155742" localize="false"/>
<paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="U" oldref="45">Angle</paragraph>
<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES">Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_ALIGNMENT_CTR_BORDER_LOCK" id="bm_id3125865" localize="false"/>
@@ -136,24 +133,24 @@
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"><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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="85">This checkbox is only available if Asian language support is enabled and the text direction is set to vertical. <ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL">Aligns Asian characters one below the other in the selected cell(s). If the cell contains more than one line of text, the lines are converted to text columns that are arranged from right to left. Western characters in the converted text are rotated 90 degrees to the right. Asian characters are not rotated.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="U" oldref="43">Text flow</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="44">Determine the text flow in a cell.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
<paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="CHG" oldref="3">Wrap text automatically</paragraph>
<paragraph role="paragraph" id="par_id3148555" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_ALIGNMENT:BTN_WRAP">Wraps text onto another line at the cell border. The number of lines depends on the width of the cell.</ahelp> To enter a manual line break, press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter in the cell.<comment>conditional switches inside AVIS do not work</comment></paragraph>
<embed href="text/shared/guide/breaking_lines.xhp#breaking_lines"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH" id="bm_id3155415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"><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>
diff --git a/helpcontent2/source/text/shared/01/05340400.xhp b/helpcontent2/source/text/shared/01/05340400.xhp
index a581e64c5c..09b643ac0d 100644
--- a/helpcontent2/source/text/shared/01/05340400.xhp
+++ b/helpcontent2/source/text/shared/01/05340400.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 05340400.xhp,v $
- * $Revision: 1.12.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -56,9 +53,10 @@
<embed href="text/shared/guide/database_main.xhp#database_main"/>
<paragraph role="note" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="51">You cannot use the data source browser on a database table that is open in Design view.</paragraph>
<paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="8">Data source browser</paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_TLB_TREELISTBOX">The commands for the data source browser are found on the <link href="text/shared/01/05340400.xhp" name="Database Bar">Table Data bar</link> and in <link href="text/shared/01/05340400.xhp" name="context menus">context menus</link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">The commands for the data source browser are found on the <link href="text/shared/01/05340400.xhp" name="Database Bar">Table Data bar</link> and in <link href="text/shared/01/05340400.xhp" name="context menus">context menus</link>.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="3" l10n="U" oldref="12">Selecting records</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="34">To select a record in a database table, click the row header, or click a row header, and then use the Up or Down arrow keys.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CTL_TABBROWSER" id="bm_id6056703" localize="false"/><paragraph role="paragraph" id="par_id7812433001" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select database records. Drag-and-drop rows or cells to the document to insert contents. Drag-and-drop column headers to insert fields.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="13">The following table describes how to select individual elements in the data source browser:</paragraph>
<table id="tbl_id3149795">
<tablerow>
@@ -139,7 +137,8 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151173" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_TLB_TREELISTBOX">Go to the first record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_FIRST" id="bm_id3152821005" localize="false"/>
+<paragraph role="paragraph" id="par_id3151173" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the first record in the table.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
@@ -152,12 +151,14 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153280" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_TLB_TREELISTBOX">Go to the previous record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_PREV" id="bm_id3152821002" localize="false"/>
+<paragraph role="paragraph" id="par_id3153280" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".">Go to the previous record in the table.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="heading" id="hd_id3153053" xml-lang="en-US" level="3" l10n="U" oldref="39">Record number</paragraph>
-<paragraph role="paragraph" id="par_id3155851" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_TLB_TREELISTBOX">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_ABSOLUTE" id="bm_id3152821001" localize="false"/>
+<paragraph role="paragraph" id="par_id3155851" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid=".">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3157876" xml-lang="en-US" level="3" l10n="U" oldref="41">Next record</paragraph>
<table id="tbl_id3148880">
<tablerow>
@@ -167,7 +168,8 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3166414" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="HID_TLB_TREELISTBOX">Go to the next record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEXT" id="bm_id3152821003" localize="false"/>
+<paragraph role="paragraph" id="par_id3166414" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid=".">Go to the next record in the table.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
@@ -180,7 +182,8 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147175" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_TLB_TREELISTBOX">Go to the last record in the table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_LAST" id="bm_id3152821004" localize="false"/>
+<paragraph role="paragraph" id="par_id3147175" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid=".">Go to the last record in the table.</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
@@ -193,12 +196,14 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146913" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="HID_TLB_TREELISTBOX">Inserts a new record into the current table.</ahelp>To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_TRAVEL_NEW" id="bm_id3152821006" localize="false"/>
+<paragraph role="paragraph" id="par_id3146913" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid=".">Inserts a new record into the current table.</ahelp> To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="heading" id="hd_id3150656" xml-lang="en-US" level="3" l10n="U" oldref="47">Number of records</paragraph>
-<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="U" oldref="48">The Form Navigation bar also displays information about the number of records in the current table. For example, "Record 7 of 9(2)" indicates that two records (2) are selected in a table containing 9 records, and that the cursor is in record number 7.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_GRID_NUMBEROFRECORDS" id="bm_id3152821013" localize="false"/>
+<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid=".">Displays the number of records. For example, "Record 7 of 9(2)" indicates that two records (2) are selected in a table containing 9 records, and that the cursor is in record number 7.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151357" xml-lang="en-US" level="3" l10n="U" oldref="26">Organizing tables</paragraph>
<paragraph role="paragraph" id="par_id3153357" xml-lang="en-US" l10n="U" oldref="28">To access the commands for formatting the table, right-click a column header, or a row header.</paragraph>
<paragraph role="heading" id="hd_id3148405" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/05340402.xhp" name="Table Format">Table Format</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05340402.xhp b/helpcontent2/source/text/shared/01/05340402.xhp
index 2974e9f606..bb53f596cd 100755
--- a/helpcontent2/source/text/shared/01/05340402.xhp
+++ b/helpcontent2/source/text/shared/01/05340402.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340402.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340404.xhp b/helpcontent2/source/text/shared/01/05340404.xhp
index 5159716369..c350dd6909 100755
--- a/helpcontent2/source/text/shared/01/05340404.xhp
+++ b/helpcontent2/source/text/shared/01/05340404.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340404.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340405.xhp b/helpcontent2/source/text/shared/01/05340405.xhp
index 8c1f6b452e..69cccabe46 100755
--- a/helpcontent2/source/text/shared/01/05340405.xhp
+++ b/helpcontent2/source/text/shared/01/05340405.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340405.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340500.xhp b/helpcontent2/source/text/shared/01/05340500.xhp
index 25fa4514c2..4b1d3394f0 100755
--- a/helpcontent2/source/text/shared/01/05340500.xhp
+++ b/helpcontent2/source/text/shared/01/05340500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340500.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05340600.xhp b/helpcontent2/source/text/shared/01/05340600.xhp
index fc27a4975e..bba3c9745e 100755
--- a/helpcontent2/source/text/shared/01/05340600.xhp
+++ b/helpcontent2/source/text/shared/01/05340600.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340600.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05350000.xhp b/helpcontent2/source/text/shared/01/05350000.xhp
index 513c390133..575dd4999a 100644
--- a/helpcontent2/source/text/shared/01/05350000.xhp
+++ b/helpcontent2/source/text/shared/01/05350000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05350000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/05350200.xhp b/helpcontent2/source/text/shared/01/05350200.xhp
index a3944cef26..930c3e5a8f 100644
--- a/helpcontent2/source/text/shared/01/05350200.xhp
+++ b/helpcontent2/source/text/shared/01/05350200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05350200.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<section id="geometrie">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_GEO" id="bm_id3149783" localize="false"/><paragraph role="heading" id="hd_id3149551" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350200.xhp" name="Geometry">Geometry</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO" id="bm_id3149783" localize="false"/><paragraph role="heading" id="hd_id3149551" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350200.xhp" name="Geometry">Geometry</link></paragraph>
<paragraph role="paragraph" id="par_id3150008" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_GEO">Adjusts the shape of the selected 3D object. You can only modify the shape of a 3D object that was created by converting a 2D object. To convert a 2D object to 3D, select the object, right-click, and then choose <emph>Convert - To 3D</emph>, or <emph>Convert - To 3D Rotation Object</emph>.</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -52,23 +49,23 @@
</section>
<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="4">Geometry</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="5">Define the shape properties for the selected 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL" id="bm_id3151111" localize="false"/><paragraph role="heading" id="hd_id3149812" xml-lang="en-US" level="3" l10n="U" oldref="12">Rounded edges</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL" id="bm_id3151111" localize="false"/><paragraph role="heading" id="hd_id3149812" xml-lang="en-US" level="3" l10n="U" oldref="12">Rounded edges</paragraph>
<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL">Enter the amount by which you want to round the corners of the selected 3D object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_BACKSCALE" id="bm_id3154381" localize="false"/><paragraph role="heading" id="hd_id3155585" xml-lang="en-US" level="3" l10n="U" oldref="14">Scaled depth</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE" id="bm_id3154381" localize="false"/><paragraph role="heading" id="hd_id3155585" xml-lang="en-US" level="3" l10n="U" oldref="14">Scaled depth</paragraph>
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_BACKSCALE">Enter the amount by which to increase or decrease the area of the front side of the selected 3D object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_END_ANGLE" id="bm_id3153127" localize="false"/><paragraph role="heading" id="hd_id3150466" xml-lang="en-US" level="3" l10n="U" oldref="16">Rotation angle</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE" id="bm_id3153127" localize="false"/><paragraph role="heading" id="hd_id3150466" xml-lang="en-US" level="3" l10n="U" oldref="16">Rotation angle</paragraph>
<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_END_ANGLE">Enter the angle in degrees to rotate the selected 3D rotation object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DEPTH" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="18">Depth</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="18">Depth</paragraph>
<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DEPTH">Enter the extrusion depth for the selected 3D object. This option is not valid for 3D rotation objects.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159343" xml-lang="en-US" level="2" l10n="U" oldref="6">Segments</paragraph>
<paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="7">You can change the number of segments that are used to draw a 3D rotation object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_HORIZONTAL" id="bm_id3159167" localize="false"/><paragraph role="heading" id="hd_id3152909" xml-lang="en-US" level="3" l10n="U" oldref="8">Horizontal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL" id="bm_id3159167" localize="false"/><paragraph role="heading" id="hd_id3152909" xml-lang="en-US" level="3" l10n="U" oldref="8">Horizontal</paragraph>
<paragraph role="paragraph" id="par_id3150943" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_HORIZONTAL">Enter the number of horizontal segments to use in the selected 3D rotation object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_VERTICAL" id="bm_id3150977" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="3" l10n="U" oldref="10">Vertical</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL" id="bm_id3150977" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="3" l10n="U" oldref="10">Vertical</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_VERTICAL">Enter the number of vertical segments to use in the selected 3D rotation object</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153626" xml-lang="en-US" level="2" l10n="U" oldref="20">Normals</paragraph>
<paragraph role="paragraph" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="21">Allows you to modify the rendering style of the 3D surface.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ" id="bm_id3154280" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="22">Object-Specific</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ" id="bm_id3154280" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="22">Object-Specific</paragraph>
<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ">Renders the 3D surface according to the shape of the object. For example, a circular shape is rendered with a spherical surface.</ahelp></paragraph>
<table id="tbl_id3145068">
<tablerow>
@@ -82,7 +79,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT" id="bm_id3158408" localize="false"/><paragraph role="heading" id="hd_id3153797" xml-lang="en-US" level="3" l10n="U" oldref="25">Flat</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT" id="bm_id3158408" localize="false"/><paragraph role="heading" id="hd_id3153797" xml-lang="en-US" level="3" l10n="U" oldref="25">Flat</paragraph>
<paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT">Renders the 3D surface as polygons.</ahelp></paragraph>
<table id="tbl_id3149169">
<tablerow>
@@ -96,7 +93,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE" id="bm_id3152933" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="28">Spherical</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE" id="bm_id3152933" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="28">Spherical</paragraph>
<paragraph role="paragraph" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE">Renders a smooth 3D surface.</ahelp></paragraph>
<table id="tbl_id3148744">
<tablerow>
@@ -110,7 +107,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT" id="bm_id3147354" localize="false"/><paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="3" l10n="U" oldref="31">Invert Normals</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT" id="bm_id3147354" localize="false"/><paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="3" l10n="U" oldref="31">Invert Normals</paragraph>
<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT">Inverts the light source.</ahelp></paragraph>
<table id="tbl_id3154149">
<tablerow>
@@ -124,7 +121,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING" id="bm_id3147295" localize="false"/><paragraph role="heading" id="hd_id3152417" xml-lang="en-US" level="3" l10n="U" oldref="34">Double-sided Illumination</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING" id="bm_id3147295" localize="false"/><paragraph role="heading" id="hd_id3152417" xml-lang="en-US" level="3" l10n="U" oldref="34">Double-sided Illumination</paragraph>
<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING">Lights the object from the outside and the inside. To use an ambient light source, click this button, and then click the <emph>Invert Normals</emph> button.</ahelp></paragraph>
<table id="tbl_id3145261">
<tablerow>
@@ -138,7 +135,7 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED" id="bm_id3153516" localize="false"/><paragraph role="heading" id="hd_id3153190" xml-lang="en-US" level="3" l10n="U" oldref="37">Double-Sided</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED" id="bm_id3153516" localize="false"/><paragraph role="heading" id="hd_id3153190" xml-lang="en-US" level="3" l10n="U" oldref="37">Double-Sided</paragraph>
<paragraph role="paragraph" id="par_id3154692" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED">Closes the shape of a 3D object that was created by extruding a freeform line (<emph>Convert - To 3D</emph>).</ahelp></paragraph>
<table id="tbl_id3147441">
<tablerow>
diff --git a/helpcontent2/source/text/shared/01/05350300.xhp b/helpcontent2/source/text/shared/01/05350300.xhp
index c2a03aca2c..596e98e028 100644
--- a/helpcontent2/source/text/shared/01/05350300.xhp
+++ b/helpcontent2/source/text/shared/01/05350300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05350300.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<section id="darstellung">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_REPRESENTATION" id="bm_id3156053" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION" id="bm_id3156053" localize="false"/>
<paragraph role="heading" id="hd_id3148919" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350300.xhp" name="Shading">Shading</link></paragraph>
<paragraph role="paragraph" id="par_id3150008" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_REPRESENTATION">Sets the shading and shadow options for the selected 3D object.</ahelp></paragraph>
</section>
@@ -53,10 +50,10 @@
</section>
<paragraph role="heading" id="hd_id3109847" xml-lang="en-US" level="2" l10n="U" oldref="4">Shading</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="5">Specify the type of shading to apply to the selected 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXFLOAT_3D:LB_SHADEMODE" id="bm_id3150772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE" id="bm_id3150772" localize="false"/>
<paragraph role="heading" id="hd_id3147276" xml-lang="en-US" level="3" l10n="U" oldref="6">Mode</paragraph>
<paragraph role="paragraph" id="par_id3155583" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:LISTBOX:RID_SVXFLOAT_3D:LB_SHADEMODE">Select the shading method that you want to use. Flat shading assigns a single color to a single polygon on the surface of the object. Gouraud shading blends colors across the polygons. Phong shading averages the color of each pixel based on the pixels that surround it, and requires the most processing power.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_SHADOW_3D" id="bm_id3149820" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D" id="bm_id3149820" localize="false"/>
<paragraph role="heading" id="hd_id3150466" xml-lang="en-US" level="2" l10n="U" oldref="8">Shadow</paragraph>
<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_SHADOW_3D">Adds or removes a shadow from the selected 3D object.</ahelp></paragraph>
<table id="tbl_id3159399">
@@ -72,15 +69,15 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_SLANT" id="bm_id3149165" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT" id="bm_id3149165" localize="false"/>
<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="3" l10n="U" oldref="11">Surface angle</paragraph>
<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_SLANT">Enter an angle from 0 to 90 degrees for casting the shadow.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154905" xml-lang="en-US" level="2" l10n="U" oldref="13">Camera</paragraph>
<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="14">Set the camera options for the selected 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DISTANCE" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE" id="bm_id3154758" localize="false"/>
<paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="3" l10n="U" oldref="15">Distance</paragraph>
<paragraph role="paragraph" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_DISTANCE">Enter the distance to leave between the camera and the center of the selected object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH" id="bm_id3145068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH" id="bm_id3145068" localize="false"/>
<paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="3" l10n="U" oldref="17">Focal length</paragraph>
<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH">Enter the focal length of the camera, where a small value corresponds to a "fisheye" lens, and a large value to a telephoto lens.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05350400.xhp b/helpcontent2/source/text/shared/01/05350400.xhp
index d395f6d91a..9688a07b1c 100644
--- a/helpcontent2/source/text/shared/01/05350400.xhp
+++ b/helpcontent2/source/text/shared/01/05350400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05350400.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<section id="beleuchtung">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT" id="bm_id3147273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT" id="bm_id3147273" localize="false"/>
<paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350400.xhp" name="Illumination">Illumination</link></paragraph>
<paragraph role="paragraph" id="par_id3149741" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT">Define the light source for the selected 3D object.</ahelp></paragraph>
</section>
@@ -53,14 +50,14 @@
</section>
<paragraph role="heading" id="hd_id3154984" xml-lang="en-US" level="2" l10n="U" oldref="4">Illumination</paragraph>
<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="5">Specify the light source for the object, as well as the color of the light source and of the ambient light. You can define up to eight different light sources.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_1" id="bm_id3149177" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_2" id="bm_id3143267" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_3" id="bm_id3145071" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_4" id="bm_id3155355" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_5" id="bm_id3147088" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_6" id="bm_id3149095" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_7" id="bm_id3150506" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_8" id="bm_id3149182" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1" id="bm_id3149177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2" id="bm_id3143267" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3" id="bm_id3145071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4" id="bm_id3155355" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5" id="bm_id3147088" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7" id="bm_id3150506" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8" id="bm_id3149182" localize="false"/>
<paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="U" oldref="6">Light source</paragraph>
<paragraph role="paragraph" id="par_id3149149" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_8">Click twice to turn the light source on, and then select a color for the light from the list. If you want, you can also set the color of the surrounding light, by selecting a color from the <emph>Ambient light</emph> box.</ahelp> You can also press the Spacebar to turn the light source on or off. </paragraph>
<table id="tbl_id3150355">
@@ -89,18 +86,18 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXFLOAT_3D:LB_LIGHT_1" id="bm_id3159400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1" id="bm_id3159400" localize="false"/>
<paragraph role="heading" id="hd_id3159166" xml-lang="en-US" level="3" l10n="U" oldref="10">Color Selection</paragraph>
<paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:LISTBOX:RID_SVXFLOAT_3D:LB_LIGHT_1">Select a color for the current light source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR" id="bm_id3153349" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR" id="bm_id3153349" localize="false"/>
<paragraph role="heading" id="hd_id3149955" xml-lang="en-US" level="3" l10n="U" oldref="12"><link href="text/shared/optionen/01010501.xhp" name="Select Color in the color dialog">Select Color in the color dialog</link></paragraph>
<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
<embed href="text/shared/00/00000406.xhp#farbdial"/>
<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="13">Ambient light</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT" id="bm_id3149655" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT" id="bm_id3149655" localize="false"/>
<paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="15">Color Selection</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:LISTBOX:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT">Select a color for the ambient light.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR" id="bm_id3154923" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR" id="bm_id3154923" localize="false"/>
<paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="3" l10n="U" oldref="17"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
<embed href="text/shared/00/00000406.xhp#farbdial"/>
diff --git a/helpcontent2/source/text/shared/01/05350500.xhp b/helpcontent2/source/text/shared/01/05350500.xhp
index d539b1b29b..268686c0a5 100644
--- a/helpcontent2/source/text/shared/01/05350500.xhp
+++ b/helpcontent2/source/text/shared/01/05350500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05350500.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<section id="texturen">
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE" id="bm_id3148410" localize="false"/>
+<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 (Mac: Shift+Command), and then drag an image onto the selected 3D object.</ahelp></paragraph>
</section>
@@ -55,7 +52,7 @@
<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="5">Sets the texture properties.</paragraph>
<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="6">Type</paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="7">Set the color properties of the texture.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE" id="bm_id3166461" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE" id="bm_id3166461" localize="false"/>
<paragraph role="heading" id="hd_id3150775" xml-lang="en-US" level="3" l10n="U" oldref="8">Black &amp; White</paragraph>
<paragraph role="paragraph" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE">Converts the texture to black and white.</ahelp></paragraph>
<table id="tbl_id3149149">
@@ -71,7 +68,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_COLOR" id="bm_id3150130" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR" id="bm_id3150130" localize="false"/>
<paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="3" l10n="U" oldref="11">Color</paragraph>
<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_COLOR">Converts the texture to color.</ahelp></paragraph>
<table id="tbl_id3155261">
@@ -89,7 +86,7 @@
<paragraph role="heading" id="hd_id3155342" xml-lang="en-US" level="3" l10n="U" oldref="14">Mode</paragraph>
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="15">Show or hide shading.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_REPLACE" id="bm_id3154905" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE" id="bm_id3154905" localize="false"/>
<paragraph role="heading" id="hd_id3149191" xml-lang="en-US" level="3" l10n="U" oldref="16">Only Texture</paragraph>
<paragraph role="paragraph" id="par_id3148564" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_REPLACE">Applies the texture without shading.</ahelp></paragraph>
<table id="tbl_id3147532">
@@ -105,7 +102,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_MODULATE" id="bm_id3151106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE" id="bm_id3151106" localize="false"/>
<paragraph role="heading" id="hd_id3150541" xml-lang="en-US" level="3" l10n="U" oldref="19">Texture and Shading</paragraph>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_MODULATE">Applies the texture with shading. To define the shading options for the texture, click the <emph>Shading</emph> button in this dialog.</ahelp></paragraph>
<table id="tbl_id3151210">
@@ -123,7 +120,7 @@
<paragraph role="heading" id="hd_id3148672" xml-lang="en-US" level="3" l10n="U" oldref="22">Projection X</paragraph>
<paragraph role="paragraph" id="par_id3148677" xml-lang="en-US" l10n="U" oldref="23">Set the options for displaying the texture.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X" id="bm_id3151041" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X" id="bm_id3151041" localize="false"/>
<paragraph role="heading" id="hd_id3148453" xml-lang="en-US" level="3" l10n="U" oldref="24">Object-specific</paragraph>
<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X">Automatically adjusts the texture based on the shape and size of the object.</ahelp></paragraph>
<table id="tbl_id3143231">
@@ -139,7 +136,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X" id="bm_id3149560" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X" id="bm_id3149560" localize="false"/>
<paragraph role="heading" id="hd_id3147300" xml-lang="en-US" level="3" l10n="U" oldref="27">Parallel</paragraph>
<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X">Applies the texture parallel to the horizontal axis.</ahelp></paragraph>
<table id="tbl_id3154145">
@@ -155,7 +152,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X" id="bm_id3144440" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X" id="bm_id3144440" localize="false"/>
<paragraph role="heading" id="hd_id3148577" xml-lang="en-US" level="3" l10n="U" oldref="30">Circular</paragraph>
<paragraph role="paragraph" id="par_id3152418" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X">Wraps the horizontal axis of the texture pattern around a sphere.</ahelp></paragraph>
<table id="tbl_id3159196">
@@ -173,7 +170,7 @@
<paragraph role="heading" id="hd_id3154129" xml-lang="en-US" level="3" l10n="U" oldref="33">Projection Y</paragraph>
<paragraph role="paragraph" id="par_id3152878" xml-lang="en-US" l10n="U" oldref="34">Click the respective buttons to define the texture for the object Y axis.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y" id="bm_id3145113" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y" id="bm_id3145113" localize="false"/>
<paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="3" l10n="U" oldref="35">Object-specific</paragraph>
<paragraph role="paragraph" id="par_id3153095" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y">Automatically adjusts the texture based on the shape and size of the object.</ahelp></paragraph>
<table id="tbl_id3150684">
@@ -189,7 +186,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y" id="bm_id3145799" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y" id="bm_id3145799" localize="false"/>
<paragraph role="heading" id="hd_id3148775" xml-lang="en-US" level="3" l10n="U" oldref="38">Parallel</paragraph>
<paragraph role="paragraph" id="par_id3145730" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y">Applies the texture parallel to the vertical axis.</ahelp></paragraph>
<table id="tbl_id3149909">
@@ -205,7 +202,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y" id="bm_id3154096" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y" id="bm_id3154096" localize="false"/>
<paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="3" l10n="U" oldref="41">Circular</paragraph>
<paragraph role="paragraph" id="par_id3159348" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y">Wraps the vertical axis of the texture pattern around a sphere.</ahelp></paragraph>
<table id="tbl_id3144764">
@@ -223,7 +220,7 @@
<paragraph role="heading" id="hd_id3149581" xml-lang="en-US" level="3" l10n="U" oldref="44">Filter</paragraph>
<paragraph role="paragraph" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="45">Filters out some of the 'noise' that can occur when you apply a texture to a 3D object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_FILTER" id="bm_id3155085" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER" id="bm_id3155085" localize="false"/>
<paragraph role="heading" id="hd_id3151319" xml-lang="en-US" level="3" l10n="U" oldref="46">Filtering On/Off</paragraph>
<paragraph role="paragraph" id="par_id3151038" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_FILTER">Blurs the texture slightly to remove unwanted speckles.</ahelp></paragraph>
<table id="tbl_id3148833">
diff --git a/helpcontent2/source/text/shared/01/05350600.xhp b/helpcontent2/source/text/shared/01/05350600.xhp
index 6c302c874b..7f959d161a 100644
--- a/helpcontent2/source/text/shared/01/05350600.xhp
+++ b/helpcontent2/source/text/shared/01/05350600.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05350600.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<section id="material">
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_MATERIAL" id="bm_id3155182" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL" id="bm_id3155182" localize="false"/>
<paragraph role="heading" id="hd_id3154349" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350600.xhp" name="Material">Material</link></paragraph>
<paragraph role="paragraph" id="par_id3160463" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_MATERIAL">Changes the coloring of the selected 3D object.</ahelp></paragraph>
</section>
@@ -53,33 +50,33 @@
</section>
<paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="2" l10n="U" oldref="4">Material</paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="29">Assigns a predefined color scheme or lets you create your own color scheme.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_FAVORITES" id="bm_id3149205" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES" id="bm_id3149205" localize="false"/>
<paragraph role="heading" id="hd_id3154497" xml-lang="en-US" level="3" l10n="U" oldref="9">Favorites</paragraph>
<paragraph role="paragraph" id="par_id3153303" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_FAVORITES">Select a predefined color scheme, or select <emph>User-defined</emph> to define a custom color scheme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_COLOR" id="bm_id3150710" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR" id="bm_id3150710" localize="false"/>
<paragraph role="heading" id="hd_id3093440" xml-lang="en-US" level="3" l10n="U" oldref="16">Object color</paragraph>
<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_COLOR">Select the color that you want to apply to the object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_MAT_COLOR" id="bm_id3151226" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR" id="bm_id3151226" localize="false"/>
<paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="3" l10n="U" oldref="18"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
<embed href="text/shared/00/00000406.xhp#farbdial"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_EMISSION" id="bm_id3157864" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION" id="bm_id3157864" localize="false"/>
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="19">Illumination color</paragraph>
<paragraph role="paragraph" id="par_id3159234" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_EMISSION">Select the color to illuminate the object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_EMISSION_COLOR" id="bm_id3143268" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR" id="bm_id3143268" localize="false"/>
<paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="3" l10n="U" oldref="21"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
<embed href="text/shared/00/00000406.xhp#farbdial"/>
<paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="2" l10n="U" oldref="22">Specular</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="23">Sets the light reflection properties for the selected object.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_SPECULAR" id="bm_id3145383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR" id="bm_id3145383" localize="false"/>
<paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="3" l10n="U" oldref="24">Color</paragraph>
<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX_LISTBOX_RID_SVXFLOAT_3D_LB_MAT_SPECULAR">Select the color that you want the object to reflect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXFLOAT_3D_BTN_SPECULAR_COLOR" id="bm_id3147243" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR" id="bm_id3147243" localize="false"/>
<paragraph role="heading" id="hd_id3152996" xml-lang="en-US" level="3" l10n="U" oldref="26"><link href="text/shared/optionen/01010501.xhp" name="Select Color Through the Color Dialog">Select Color Through the Color Dialog</link></paragraph>
<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
<embed href="text/shared/00/00000406.xhp#farbdial"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXFLOAT_3D_MTR_MAT_SPECULAR_INTENSITY" id="bm_id3149276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY" id="bm_id3149276" localize="false"/>
<paragraph role="heading" id="hd_id3152909" xml-lang="en-US" level="3" l10n="U" oldref="27">Intensity</paragraph>
<paragraph role="paragraph" id="par_id3159256" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXFLOAT_3D_MTR_MAT_SPECULAR_INTENSITY">Enter the intensity of the specular effect.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05360000.xhp b/helpcontent2/source/text/shared/01/05360000.xhp
index 8c21260d0a..6bab74b31a 100644
--- a/helpcontent2/source/text/shared/01/05360000.xhp
+++ b/helpcontent2/source/text/shared/01/05360000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05360000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,36 +52,36 @@
<paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="3">Objects are distributed with respect to the outermost objects in the selection.</paragraph>
<paragraph role="heading" id="hd_id3149811" xml-lang="en-US" level="2" l10n="U" oldref="4">Horizontally</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="5">Specify the horizontal distribution for the selected objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE" id="bm_id3154381" localize="false"/>
<paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="6">None</paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE">Does not distribute the objects horizontally.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT" id="bm_id3156156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT" id="bm_id3156156" localize="false"/>
<paragraph role="heading" id="hd_id3148990" xml-lang="en-US" level="3" l10n="U" oldref="8">Left</paragraph>
<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT">Distributes the selected objects, so that the left edges of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER" id="bm_id3149903" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER" id="bm_id3149903" localize="false"/>
<paragraph role="heading" id="hd_id3150130" xml-lang="en-US" level="3" l10n="U" oldref="10">Center</paragraph>
<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER">Distributes the selected objects, so that the horizontal centers of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE" id="bm_id3149235" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE" id="bm_id3149235" localize="false"/>
<paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="3" l10n="U" oldref="12">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE">Distributes the selected objects horizontally, so that the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT" id="bm_id3156152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT" id="bm_id3156152" localize="false"/>
<paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="3" l10n="U" oldref="14">Right</paragraph>
<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT">Distributes the selected objects, so that the right edges of the objects are evenly spaced from one another.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150245" xml-lang="en-US" level="2" l10n="U" oldref="16">Vertically</paragraph>
<paragraph role="paragraph" id="par_id3155321" xml-lang="en-US" l10n="U" oldref="17">Specify the vertical distribution for the selected objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE" id="bm_id3151384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE" id="bm_id3151384" localize="false"/>
<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="3" l10n="U" oldref="18">None</paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE">Does not distribute the objects vertically.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP" id="bm_id3145068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP" id="bm_id3145068" localize="false"/>
<paragraph role="heading" id="hd_id3153626" xml-lang="en-US" level="3" l10n="U" oldref="20">Top</paragraph>
<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP">Distributes the selected objects, so that the top edges of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER" id="bm_id3154758" localize="false"/>
<paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="22">Center</paragraph>
<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER">Distributes the selected objects, so that the vertical centers of the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE" id="bm_id3152772" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE" id="bm_id3152772" localize="false"/>
<paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="24">Spacing</paragraph>
<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE">Distributes the selected objects vertically, so that the objects are evenly spaced from one another.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM" id="bm_id3153778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM" id="bm_id3153778" localize="false"/>
<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="26">Bottom</paragraph>
<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM">Distributes the selected objects, so that the bottom edges of the objects are evenly spaced from one another.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05990000.xhp b/helpcontent2/source/text/shared/01/05990000.xhp
index 897a4b0acb..468829f762 100644
--- a/helpcontent2/source/text/shared/01/05990000.xhp
+++ b/helpcontent2/source/text/shared/01/05990000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05990000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06010000.xhp b/helpcontent2/source/text/shared/01/06010000.xhp
index e0f179ee50..9554adb5df 100644
--- a/helpcontent2/source/text/shared/01/06010000.xhp
+++ b/helpcontent2/source/text/shared/01/06010000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06010000.xhp,v $
- * $Revision: 1.13.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,85 +29,95 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Spelling and Grammar</title>
-<filename>/text/shared/01/06010000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="rechtschreibung">
+ <topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Spelling and Grammar</title>
+ <filename>/text/shared/01/06010000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="rechtschreibung">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149047"><bookmark_value>dictionaries; spellcheck</bookmark_value>
-<bookmark_value>spellcheck; dialog</bookmark_value>
-<bookmark_value>languages; spellcheck</bookmark_value>
+ <bookmark_value>spellcheck; dialog</bookmark_value>
+ <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"/>
<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>
+<paragraph xml-lang="en-US" id="hd_id3153882" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and Grammar</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154682" role="paragraph" 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"/>
-</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>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD" id="bm_id3149416" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_SUGGESTION" id="bm_id9300210" localize="false"/>
-<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">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"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_AUTOCORR" id="bm_id9182103" localize="false"/>
-<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="52"><switchinline select="appl"><caseinline select="WRITER">AutoCorrect
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
+ </section>
+ <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+ <paragraph xml-lang="en-US" id="par_idN1064B" role="paragraph" 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 xml-lang="en-US" id="par_id3166445" role="paragraph" 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 xml-lang="en-US" id="par_id1022200801300654" role="paragraph" 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/cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR" id="bm_id1024200804045685" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200801354366" role="paragraph" 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/cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD" id="bm_id756859" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="2" l10n="CHG"
+ oldref="6">Not in dictionary</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" 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>
+<!-- removed HID SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION" id="bm_id9300210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149885" role="heading" level="2" l10n="U"
+ oldref="10">Suggestions</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" 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/cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE" id="bm_id3150822" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="2" l10n="CHG"
+ oldref="12">Text Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144422" role="paragraph" 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"/>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR" id="bm_id9182103" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2" l10n="U"
+ oldref="52"><switchinline select="appl"><caseinline select="WRITER">AutoCorrect
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153798" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR">Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacements table.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3153798" role="paragraph" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR">Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacements table.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS" id="bm_id3157960" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_OPTIONS" id="bm_id9094821" localize="false"/>
-<paragraph role="heading" id="hd_id3151382" xml-lang="en-US" level="2" l10n="U" oldref="56">Options</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS">Opens a dialog, where you can select the user-defined dictionaries, and set the rules for the spellchecking.</ahelp><comment>UFI: dialog has no name at all in 680m104</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD" id="bm_id3150767" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT" id="bm_id5068819" localize="false"/>
-<paragraph role="heading" id="hd_id3153353" xml-lang="en-US" level="2" l10n="U" oldref="24">Add</paragraph>
-<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD">Adds the unknown word to a user-defined dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE" id="bm_id3147228" localize="false"/>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS" id="bm_id9094821" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151382" role="heading" level="2" l10n="U"
+ oldref="56">Options</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="57"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS">Opens a dialog, where you can select the user-defined dictionaries, and set the rules for the spellchecking.</ahelp><comment>UFI: dialog has no name at all in 680m104</comment></paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD -->
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT" id="bm_id5068819" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153353" role="heading" level="2" l10n="U"
+ oldref="24">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD">Adds the unknown word to a user-defined dictionary.</ahelp></paragraph>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE -->
<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><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"/>
+<paragraph xml-lang="en-US" id="hd_id3155994" role="heading" level="2" l10n="CHG"
+ oldref="22">Ignore Once</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148920" role="paragraph" 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 xml-lang="en-US" id="par_idN107CB" role="note" 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/HID_SPLDLG_BUTTON_IGNORERULE" id="bm_id1024200804072166" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1024200804091149" role="paragraph" 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>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL -->
<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>
-<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL">Skips all occurrences of the unknown word in the entire document and continues with the spellcheck.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE" id="bm_id3152884" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150740" role="heading" level="2" l10n="CHG"
+ oldref="20">Ignore All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145318" role="paragraph" l10n="U" oldref="21"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL">Skips all occurrences of the unknown word in the entire document and continues with the spellcheck.</ahelp></paragraph>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE -->
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_CHANGE" id="bm_id2069765" localize="false"/>
-<paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Change</paragraph>
-<paragraph role="paragraph" id="par_id3148559" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE">Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL" id="bm_id3157895" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153056" role="heading" level="2" l10n="CHG"
+ oldref="18">Change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148559" role="paragraph" l10n="CHG" oldref="19"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE">Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced.</ahelp></paragraph>
+<!-- removed HID SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL -->
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_CHANGEALL" id="bm_id9187902" localize="false"/>
-<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Change All</paragraph>
-<paragraph role="paragraph" id="par_id3144446" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL">Replaces all occurrences of the unknown word with the current suggestion.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_UNDO" id="bm_id9617297" localize="false"/>
-<paragraph role="heading" id="par_idN10850" xml-lang="en-US" level="2" l10n="NEW">Undo</paragraph>
-<paragraph role="paragraph" id="par_idN10854" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to undo the last step of your spellcheck session. Click again to undo the previous step, and so on.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="C"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2" l10n="CHG"
+ oldref="16">Change All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144446" role="paragraph" l10n="CHG" oldref="17"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL">Replaces all occurrences of the unknown word with the current suggestion.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO" id="bm_id9617297" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10850" role="heading" level="2" l10n="NEW">Undo</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10854" role="paragraph" l10n="CHG"><ahelp hid=".">Click to undo the last change in the current sentence. Click again to undo the previous change in the same sentence.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+ <paragraph xml-lang="en-US" id="par_id3147426" role="paragraph" l10n="C"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06010101.xhp b/helpcontent2/source/text/shared/01/06010101.xhp
index 0176de2df2..564704e5e1 100755
--- a/helpcontent2/source/text/shared/01/06010101.xhp
+++ b/helpcontent2/source/text/shared/01/06010101.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06010101.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06010500.xhp b/helpcontent2/source/text/shared/01/06010500.xhp
index 1d423b3c6b..4fe28d170b 100755
--- a/helpcontent2/source/text/shared/01/06010500.xhp
+++ b/helpcontent2/source/text/shared/01/06010500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06010500.xhp,v $
- * $Revision: 1.7.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06010600.xhp b/helpcontent2/source/text/shared/01/06010600.xhp
index ecb63b58b6..e07b9fd5a6 100755
--- a/helpcontent2/source/text/shared/01/06010600.xhp
+++ b/helpcontent2/source/text/shared/01/06010600.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06010600.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -30,43 +27,43 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0106010600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Chinese Translation</title>
+<title id="tit" xml-lang="en-US">Chinese Conversion</title>
<filename>/text/shared/01/06010600.xhp</filename>
</topic>
<history>
-<created date="2004-07-21T12:24:22">UFI: Chinese Translation dialog</created>
+<created date="2004-07-21T12:24:22">UFI: former Chinese Translation dialog, issue 58212</created>
<lastedited date="2004-12-16T12:54:32">DEDR: reviewed</lastedited>
</history>
</meta>
<body>
<section id="chinese">
<bookmark xml-lang="en-US" branch="index" id="bm_id49745"><bookmark_value>Chinese writing systems</bookmark_value>
-<bookmark_value>simplified Chinese;translating to traditional Chinese</bookmark_value>
-<bookmark_value>traditional Chinese;translating to simplified chinese</bookmark_value>
+<bookmark_value>simplified Chinese;conversion to traditional Chinese</bookmark_value>
+<bookmark_value>traditional Chinese;conversion to simplified Chinese</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_CHINESE_CONVERSION" id="bm_id9033860" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChineseConversion" id="bm_id2549516" localize="false"/>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Translation</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is translated.</ahelp> You can only use this command if you enable Asian language support in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Conversion</link></paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is converted.</ahelp> You can only use this command if you enable Asian language support in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#chinese"/>
</section>
-<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Translation direction</paragraph>
-<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the translation direction.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Conversion direction</paragraph>
+<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the conversion direction.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Traditional Chinese to Simplified Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates traditional Chinese text characters to simplified Chinese text characters. Click <emph>OK</emph> to translate the selected text. If no text is selected, the whole document is translated.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts traditional Chinese text characters to simplified Chinese text characters. Click <emph>OK</emph> to convert the selected text. If no text is selected, the whole document is converted.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10580" xml-lang="en-US" level="3" l10n="NEW">Simplified Chinese to Traditional Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates simplified Chinese text characters to traditional Chinese text characters. Click <emph>OK</emph> to translate the selected text. If no text is selected, the whole document is translated.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts simplified Chinese text characters to traditional Chinese text characters. Click <emph>OK</emph> to convert the selected text. If no text is selected, the whole document is converted.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1058E" xml-lang="en-US" level="2" l10n="NEW">Common terms</paragraph>
<paragraph role="paragraph" id="par_idN10592" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Common terms are words that have the same meaning in traditional and simplified Chinese but are written with different characters.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Translate Common Terms</paragraph>
-<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates words with two or more characters that are in the list of common terms. After the list is scanned, the remaining text is translated character by character.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Convert Common Terms</paragraph>
+<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts words with two or more characters that are in the list of common terms. After the list is scanned, the remaining text is converted character by character.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3" l10n="NEW">Edit terms</paragraph>
-<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/06010601.xhp">Edit Dictionary</link> dialog where you can edit the list of translation terms.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/06010601.xhp">Edit Dictionary</link> dialog where you can edit the list of conversion terms.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06010601.xhp b/helpcontent2/source/text/shared/01/06010601.xhp
index 941ac96e9a..c550a1ccb0 100755
--- a/helpcontent2/source/text/shared/01/06010601.xhp
+++ b/helpcontent2/source/text/shared/01/06010601.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06010601.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,15 +44,15 @@
<bookmark_value>dictionaries;common terms in simplified and traditional chinese</bookmark_value>
</bookmark>
<paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1" l10n="NEW">Edit Dictionary</paragraph>
-<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Edit the <link href="text/shared/01/06010600.xhp">Chinese translation</link> terms.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Edit the <link href="text/shared/01/06010600.xhp">Chinese conversion</link> terms.</ahelp></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#chineseedit"/>
</section>
-<paragraph role="note" id="par_idN10566" xml-lang="en-US" l10n="NEW">You can use this dialog to edit, to add, or to delete entries from the translation dictionary. The file path name for the translation dictionary is user/wordbook/commonterms.ctd. You cannot delete the default entries in this file.</paragraph>
+<paragraph role="note" id="par_idN10566" xml-lang="en-US" l10n="NEW">You can use this dialog to edit, to add, or to delete entries from the conversion dictionary. The file path name for the conversion dictionary is user/wordbook/commonterms.ctd. You cannot delete the default entries in this file.</paragraph>
<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2" l10n="NEW">Traditional Chinese to Simplified Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates traditional Chinese to simplified Chinese.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts traditional Chinese to simplified Chinese.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10570" xml-lang="en-US" level="2" l10n="NEW">Simplified Chinese to Traditional Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates simplified Chinese to traditional Chinese.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts simplified Chinese to traditional Chinese.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10577" xml-lang="en-US" level="2" l10n="NEW">Reverse Mapping</paragraph>
<paragraph role="paragraph" id="par_idN1057B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Automatically adds the reverse mapping direction to the list for each modification that you enter.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Term</paragraph>
@@ -65,7 +62,7 @@
<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Property</paragraph>
<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines the class of the selected term.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the term to the translation dictionary. If the term is already in the dictionary, the new term receives precedence.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the term to the conversion dictionary. If the term is already in the dictionary, the new term receives precedence.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">Modify</paragraph>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the modified entry to the database file.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06020000.xhp b/helpcontent2/source/text/shared/01/06020000.xhp
index 691850e5e4..ba393a72b6 100644
--- a/helpcontent2/source/text/shared/01/06020000.xhp
+++ b/helpcontent2/source/text/shared/01/06020000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06020000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textshared0106020000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Thesaurus</title>
@@ -48,32 +44,36 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ThesaurusDialog" id="bm_id3085157" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_THESAURUS" id="bm_id1644684" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Thesaurus" id="bm_id3152427" localize="false"/><paragraph role="heading" id="hd_id3146946" xml-lang="en-US" level="1" l10n="U" oldref="1">Thesaurus</paragraph>
-<paragraph role="paragraph" id="par_id3147366" xml-lang="en-US" l10n="U" oldref="2"><variable id="thesaurustxt"><ahelp hid=".uno:Thesaurus">Replaces the current word with a synonym, or a related term.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147366" xml-lang="en-US" l10n="U" oldref="2"><variable id="thesaurustxt"><ahelp hid=".uno:Thesaurus">Opens a dialog box to replace the current word with a synonym, or a related term.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#thesaurus"/>
+<embed href="text/shared/00/00000406.xhp#thesaurus"/>
</section>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
</case>
</switch>
<paragraph role="warning" id="par_id3154184" xml-lang="en-US" l10n="U" oldref="19">Thesaurus support is not available for all languages.</paragraph>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="3">Variations</paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4">Lists the current word and the suggested replacement word.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_WORD" id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="5">Word</paragraph>
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_WORD">Displays the current selection, or the word that contains the cursor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_MEAN" id="bm_id3153346" localize="false"/><paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="7">Meaning</paragraph>
-<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_MEAN">Select the meaning that matches the context of the current word, and then select a word in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_THESAURUS:ED_REPL" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace</paragraph>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:EDIT:RID_SVXDLG_THESAURUS:ED_REPL">Displays a suggested replacement for the current word. You can also type a new word in this box, or click a word in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_SYNON" id="bm_id3147210" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="11">Synonym</paragraph>
-<paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_SYNON">Lists the words associated with the category that you selected in the <emph>Meaning</emph> list. Select the word that you want to use as a replacement, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LOOKUP" id="bm_id3153700" localize="false"/><paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="2" l10n="U" oldref="13">Search</paragraph>
-<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LOOKUP">Searches the thesaurus for the best match of the word selected in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LANGUAGE" id="bm_id3149763" localize="false"/><paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LANGUAGE">Specifies the language to use for the thesaurus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE" id="bm_id3154578" localize="false"/><paragraph role="heading" id="hd_id3151338" xml-lang="en-US" level="3" l10n="U" oldref="17">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE">Select the language that you want to use for the thesaurus, and then click <emph>OK</emph>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD" id="bm_id3155552" localize="false"/>
+<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="5">Current word</paragraph>
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid=".">Displays the current word, or the related term that you selected by double-clicking a line in the Alternatives list. You can also type text directly in this box to look up your text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT" id="bm_id315752" localize="false"/>
+<paragraph role="heading" id="hd_id3647571" xml-lang="en-US" level="3" l10n="U" oldref="5">Arrow left</paragraph>
+<paragraph role="paragraph" id="par_id369233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid=".">Recalls the previous contents of the "Current word" text box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_CT_THES_ALTERNATIVES" id="bm_id3153346" localize="false"/>
+<paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="7">Alternatives</paragraph>
+<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".">Click an entry in the Alternatives list to copy the related term to the "Replace with" text box. Double-click an entry to copy the related term to the "Current word" text box and to look up that term.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_THESAURUS:ED_REPL" id="bm_id3153528" localize="false"/>
+<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace with</paragraph>
+<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".">The word or words in the "Replace with" text box will replace the original word in the document when you click the Replace button. You can also type text directly in this box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE" id="bm_id3149763" localize="false"/>
+<paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">Select a language for the thesaurus.</ahelp> You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06030000.xhp b/helpcontent2/source/text/shared/01/06030000.xhp
index dbeeb6230f..30631b8252 100644
--- a/helpcontent2/source/text/shared/01/06030000.xhp
+++ b/helpcontent2/source/text/shared/01/06030000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -77,36 +74,36 @@
<bookmark xml-lang="en-US" branch="hid/HID_BMPMASK_CTL_PIPETTE" id="bm_id3147010" localize="false"/>
<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="U" oldref="5">Eyedropper color</paragraph>
<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_BMPMASK_CTL_PIPETTE">Displays the color in the selected image that directly underlies the current mouse pointer position. This features only works if the eyedropper tool is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_BMPMASK:BTN_EXEC" id="bm_id3155942" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC" id="bm_id3155942" localize="false"/>
<paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="2" l10n="U" oldref="7">Replace</paragraph>
<paragraph role="paragraph" id="par_id3154983" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_BMPMASK:BTN_EXEC">Replaces the selected source colors in the current image with the colors that you specify in the <emph>Replace with </emph>boxes.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="9">Colors</paragraph>
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="10">Lists the source colors and the replacement colors.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_1" id="bm_id3150977" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_2" id="bm_id3153253" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_3" id="bm_id3146138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_4" id="bm_id3153321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1" id="bm_id3150977" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2" id="bm_id3153253" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3" id="bm_id3146138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4" id="bm_id3153321" localize="false"/>
<paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="3" l10n="U" oldref="11">Source color checkbox</paragraph>
<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_4">Select this checkbox to replace the current <emph>Source color</emph> with the color that you specify in the <emph>Replace with </emph>box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BMPMASK_CTL_QCOL_1" id="bm_id3157909" localize="false"/>
<paragraph role="heading" id="hd_id3159116" xml-lang="en-US" level="3" l10n="U" oldref="13">Source color</paragraph>
<paragraph role="paragraph" id="par_id3149903" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_BMPMASK_CTL_QCOL_1">Displays the color in the selected image that you want to replace. To set the source color, click here, click the eyedropper, and then click a color in the selected image.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_1" id="bm_id3158431" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_2" id="bm_id3146848" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_3" id="bm_id3149516" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_4" id="bm_id3147620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_1" id="bm_id3158431" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_2" id="bm_id3146848" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_3" id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_4" id="bm_id3147620" localize="false"/>
<paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="15">Tolerance</paragraph>
<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_BMPMASK:SP_4">Set the tolerance for replacing a source color in the source image. To replace colors that are similar to the color that you selected, enter a low value. To replace a wider range of colors, enter a higher value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_1" id="bm_id3159256" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_2" id="bm_id3155831" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_3" id="bm_id3156326" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_4" id="bm_id3152350" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_1" id="bm_id3159256" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_2" id="bm_id3155831" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_3" id="bm_id3156326" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_4" id="bm_id3152350" localize="false"/>
<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="17">Replace with</paragraph>
<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_4">Lists the available replacement colors. To modify the current list of colors, deselect the image, choose <emph>Format - Area</emph>, and then click the <emph>Colors</emph> tab.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_TRANS" id="bm_id3149244" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS" id="bm_id3149244" localize="false"/>
<paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="3" l10n="U" oldref="19">Transparency</paragraph>
<paragraph role="paragraph" id="par_id3154905" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_TRANS">Replaces transparent areas in the current image with the color that you select.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_TRANS" id="bm_id3153061" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS" id="bm_id3153061" localize="false"/>
<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="3" l10n="U" oldref="21">Transparency</paragraph>
<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_BMPMASK:LB_TRANS">Select the color to replace the transparent areas in the current image.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/06040000.xhp b/helpcontent2/source/text/shared/01/06040000.xhp
index 24853ba211..04399a3c8f 100644
--- a/helpcontent2/source/text/shared/01/06040000.xhp
+++ b/helpcontent2/source/text/shared/01/06040000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,23 +35,22 @@
<meta>
-<topic id="textshared0106040000xml" indexer="include">
-<title id="tit" xml-lang="en-US">AutoCorrect</title>
-<filename>/text/shared/01/06040000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153391"><bookmark_value>AutoCorrect function; switching on and off in Calc</bookmark_value>
-<bookmark_value>AutoFormat function; switching on and off</bookmark_value>
+ <topic id="textshared0106040000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">AutoCorrect</title>
+ <filename>/text/shared/01/06040000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153391"><bookmark_value>AutoCorrect function;switching on and off</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_AUTO_CORRECT_DLG" id="bm_id1521736" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/>
-<paragraph role="heading" id="hd_id3153391" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoCorrect</paragraph>
-<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/><comment>MW deleted "AutoFormat function;" and changed "AutoCorrect function;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3153391" role="heading" level="1" l10n="U" oldref="1">AutoCorrect</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150838" role="paragraph" l10n="CHG" oldref="2"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp>
</variable></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#autokorr"/>
-</section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#autokorr"/>
+ </section>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
</case>
@@ -60,24 +59,23 @@
<case select="CALC"><embed href="text/scalc/guide/auto_off.xhp#auto_off"/>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="3">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
-<embed href="text/shared/01/06040200.xhp#ersetzung"/>
-<embed href="text/shared/01/06040300.xhp#ausnahmen"/>
-<embed href="text/shared/01/06040100.xhp#optionen"/>
-<embed href="text/shared/01/06040400.xhp#typanf"/>
+<paragraph xml-lang="en-US" id="par_id3147261" role="paragraph" l10n="U" oldref="3">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
+ <embed href="text/shared/01/06040200.xhp#ersetzung"/>
+ <embed href="text/shared/01/06040300.xhp#ausnahmen"/>
+ <embed href="text/shared/01/06040100.xhp#optionen"/>
+ <embed href="text/shared/01/06040400.xhp#typanf"/>
<switch select="appl">
<case select="WRITER"><embed href="text/shared/01/06040600.xhp#worterg"/>
-<embed href="text/shared/01/06040700.xhp#smarttags"/>
+ <embed href="text/shared/01/06040700.xhp#smarttags"/>
</case>
-</switch>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
+</switch><embed href="text/shared/00/00000001.xhp#zurueck"/>
<switch select="appl">
<case select="WRITER">
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
-</section>
+ <paragraph xml-lang="en-US" id="par_id3146137" role="paragraph" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
+ </section>
</case>
</switch>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06040100.xhp b/helpcontent2/source/text/shared/01/06040100.xhp
index 00059a9cc2..699df58428 100644
--- a/helpcontent2/source/text/shared/01/06040100.xhp
+++ b/helpcontent2/source/text/shared/01/06040100.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,255 +29,261 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared0106040100xml" indexer="include">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/01/06040100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="optionen">
+ <topic id="textshared0106040100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Options</title>
+ <filename>/text/shared/01/06040100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="optionen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155620"><bookmark_value>AutoCorrect function; options</bookmark_value>
-<bookmark_value>replacement options</bookmark_value>
-<bookmark_value>words; automatically replacing</bookmark_value>
-<bookmark_value>abbreviation replacement</bookmark_value>
-<bookmark_value>capital letters; AutoCorrect function</bookmark_value>
-<bookmark_value>bold; AutoFormat function</bookmark_value>
-<bookmark_value>underlining; AutoFormat function</bookmark_value>
-<bookmark_value>1/2 replacement</bookmark_value>
-<bookmark_value>spaces; ignoring double</bookmark_value>
-<bookmark_value>numbering; using automatically</bookmark_value>
-<bookmark_value>paragraphs; numbering automatically</bookmark_value>
-<bookmark_value>numbering;paragraphs</bookmark_value>
-<bookmark_value>tables in text; creating automatically</bookmark_value>
-<bookmark_value>titles; formatting automatically</bookmark_value>
-<bookmark_value>empty paragraph removal</bookmark_value>
-<bookmark_value>paragraphs; removing blank ones</bookmark_value>
-<bookmark_value>styles; replacing automatically</bookmark_value>
-<bookmark_value>user-defined styles; automatically replacing</bookmark_value>
-<bookmark_value>bullets; replacing</bookmark_value>
-<bookmark_value>quotation marks; replacing</bookmark_value>
-<bookmark_value>typographical quotes in $[officename] Writer</bookmark_value>
-<bookmark_value>paragraphs; joining</bookmark_value>
-<bookmark_value>joining; paragraphs</bookmark_value>
-</bookmark><comment>removed two bookmarks "automatic..."</comment>
+ <bookmark_value>replacement options</bookmark_value>
+ <bookmark_value>words; automatically replacing</bookmark_value>
+ <bookmark_value>abbreviation replacement</bookmark_value>
+ <bookmark_value>capital letters; AutoCorrect function</bookmark_value>
+ <bookmark_value>bold; AutoFormat function</bookmark_value>
+ <bookmark_value>underlining; AutoFormat function</bookmark_value>
+ <bookmark_value>spaces; ignoring double</bookmark_value>
+ <bookmark_value>numbering; using automatically</bookmark_value>
+ <bookmark_value>paragraphs; numbering automatically</bookmark_value>
+ <bookmark_value>tables in text; creating automatically</bookmark_value>
+ <bookmark_value>titles; formatting automatically</bookmark_value>
+ <bookmark_value>empty paragraph removal</bookmark_value>
+ <bookmark_value>paragraphs; removing blank ones</bookmark_value>
+ <bookmark_value>styles; replacing automatically</bookmark_value>
+ <bookmark_value>user-defined styles; automatically replacing</bookmark_value>
+ <bookmark_value>bullets; replacing</bookmark_value>
+ <bookmark_value>paragraphs; joining</bookmark_value>
+ <bookmark_value>joining; paragraphs</bookmark_value>
+</bookmark><comment>removed two bookmarks "automatic..." and two more entries about quotes and 1/2 replacement</comment><comment>MW removed "numbering;paragraphs"</comment>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_CLB" id="bm_id3148765" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOCORR_OPTIONS" id="bm_id3147527" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFMT_OPTIONS" id="bm_id3149962" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_AUTOFORMAT_CLB" id="bm_id3150999" localize="false"/>
-<paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOFORMAT_CLB">Select the options for automatically correcting errors as you type, and then click <emph>OK</emph>.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3155620" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06040100.xhp" name="Options">Options</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OFAPAGE_AUTOFORMAT_CLB">Select the options for automatically correcting errors as you type, and then click <emph>OK</emph>.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
+ </section>
<switch select="appl">
<case select="WRITER">
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
-<paragraph role="note" id="par_id7547227" xml-lang="en-US" l10n="CHG">When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. <comment>see i72339</comment><comment>Don't use inline switches for notes, tips and warnings. The icon will still show up.</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153124" role="paragraph" l10n="CHG" oldref="32">In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7547227" role="note" l10n="CHG">When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. <comment>see i72339</comment><comment>Don't use inline switches for notes, tips and warnings. The icon will still show up.</comment></paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3154398" xml-lang="en-US" level="3" l10n="U" oldref="3">Use replacement table</paragraph>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="CHG" oldref="4">If you type a letter combination that matches a shortcut in the <link href="text/shared/01/06040200.xhp" name="replacement table">replacement table</link>, the letter combination is replaced with the replacement text.</paragraph>
-<paragraph role="heading" id="hd_id3150144" xml-lang="en-US" level="3" l10n="U" oldref="5">Correct TWo INitial CApitals</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="6">If you type two uppercase letters at the beginning of a "WOrd", the second uppercase letter is automatically replaced with a lowercase letter.</paragraph>
-<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3" l10n="U" oldref="7">Capitalize first letter of every sentence.</paragraph>
-<paragraph role="paragraph" id="par_id3155339" xml-lang="en-US" l10n="U" oldref="8">Capitalizes the first letter of every sentence.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154398" role="heading" level="3" l10n="U" oldref="3">Use replacement table</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="CHG" oldref="4">If you type a letter combination that matches a shortcut in the <link href="text/shared/01/06040200.xhp" name="replacement table">replacement table</link>, the letter combination is replaced with the replacement text.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150144" role="heading" level="3" l10n="U" oldref="5">Correct TWo INitial CApitals</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="6">If you type two uppercase letters at the beginning of a "WOrd", the second uppercase letter is automatically replaced with a lowercase letter.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156426" role="heading" level="3" l10n="U" oldref="7">Capitalize first letter of every sentence.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155339" role="paragraph" l10n="U" oldref="8">Capitalizes the first letter of every sentence.</paragraph>
<switch select="appl">
<case select="CALC">
-<paragraph role="note" id="par_id5240028" xml-lang="en-US" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id5240028" role="note" l10n="NEW">The first letter in a Calc cell will never be capitalized automatically.<comment>see i78661</comment></paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="24">Automatic *bold* and _underline_</paragraph>
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="26">Automatically applies bold formatting to text enclosed by asterisks (*), and underline to text enclosed by underscores ( _ ), for example, *bold*. The asterisks and underscores are not displayed after the formatting is applied.</paragraph>
-<paragraph role="note" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="105">This feature does not work if the formatting characters * or _ are entered with an <link href="text/shared/00/00000005.xhp#IME" name="Input Method Editor">Input Method Editor</link>.</paragraph>
-<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="3" l10n="U" oldref="17">URL Recognition</paragraph>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="18">Automatically creates a hyperlink when you type a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>.</paragraph>
-<paragraph role="heading" id="hd_id3151338" xml-lang="en-US" level="3" l10n="U" oldref="15">Replace 1/2 ... with ½ ...</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="16">Replaces 1/2, 1/4, 3/4 with the corresponding fraction characters.</paragraph>
-<paragraph role="heading" id="hd_id3159400" xml-lang="en-US" level="3" l10n="U" oldref="25">Replace 1st ... with 1^st ...</paragraph>
-<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="27">Displays the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts.</paragraph>
-<paragraph role="heading" id="hd_id3148473" xml-lang="en-US" level="3" l10n="U" oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment>
-<paragraph role="paragraph" id="par_id3144439" xml-lang="en-US" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
-<paragraph role="paragraph" id="par_id87282" xml-lang="en-US" l10n="CHG">Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.</paragraph>
-<table id="tbl_id2444227">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3408612" xml-lang="en-US" l10n="NEW">Text that you type:</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id4362010" xml-lang="en-US" l10n="NEW">Result that you get:</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1432844" xml-lang="en-US" l10n="NEW">A - B (A, space, minus, space, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7553941" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1421246" xml-lang="en-US" l10n="NEW">A -- B (A, space, minus, minus, space, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2305673" xml-lang="en-US" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id8703573" xml-lang="en-US" l10n="NEW">A--B (A, minus, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id6049684" xml-lang="en-US" l10n="CHG">A—B (A, em-dash, B)<br/>(see note below the table)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2219916" xml-lang="en-US" l10n="NEW">A-B (A, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1868037" xml-lang="en-US" l10n="NEW">A-B (unchanged)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id714438" xml-lang="en-US" l10n="NEW">A -B (A, space, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3924985" xml-lang="en-US" l10n="NEW">A -B (unchanged)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1486861" xml-lang="en-US" l10n="NEW">A --B (A, space, minus, minus, B)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id844141" xml-lang="en-US" l10n="NEW">A –B (A, space, en-dash, B)</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3145072" role="heading" level="3" l10n="U"
+ oldref="24">Automatic *bold* and _underline_</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153577" role="paragraph" l10n="CHG" oldref="26">Automatically applies bold formatting to text enclosed by asterisks (*), and underline to text enclosed by underscores ( _ ), for example, *bold*. The asterisks and underscores are not displayed after the formatting is applied.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153127" role="note" l10n="U" oldref="105">This feature does not work if the formatting characters * or _ are entered with an <link href="text/shared/00/00000005.xhp#IME" name="Input Method Editor">Input Method Editor</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150275" role="heading" level="3" l10n="U"
+ oldref="17">URL Recognition</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="18">Automatically creates a hyperlink when you type a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>.</paragraph>
+<comment>UFI: moved "replace 1st" to Localized Options tab page, cws cbosdo01</comment>
+ <paragraph xml-lang="en-US" id="hd_id3148473" role="heading" level="3" l10n="U"
+ oldref="19">Replace Dashes<comment>UFI: changed switches, added table, #61325#</comment></paragraph><comment>UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)</comment>
+<paragraph xml-lang="en-US" id="par_id3144439" role="paragraph" l10n="CHG" oldref="20">Replaces one or two hyphens with a long dash (see the following table).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id87282" role="paragraph" l10n="CHG">Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.</paragraph>
+ <table id="tbl_id2444227">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3408612" role="tablehead" l10n="NEW">Text that you type:</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id4362010" role="tablehead" l10n="NEW">Result that you get:</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1432844" role="tablecontent" l10n="NEW">A - B (A, space, minus, space, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id7553941" role="tablecontent" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1421246" role="tablecontent" l10n="NEW">A -- B (A, space, minus, minus, space, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2305673" role="tablecontent" l10n="NEW">A – B (A, space, en-dash, space, B)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id8703573" role="tablecontent" l10n="NEW">A--B (A, minus, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id6049684" role="tablecontent" l10n="CHG">A—B (A, em-dash, B)<br/>(see note below the table)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2219916" role="tablecontent" l10n="NEW">A-B (A, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1868037" role="tablecontent" l10n="NEW">A-B (unchanged)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id714438" role="tablecontent" l10n="NEW">A -B (A, space, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3924985" role="tablecontent" l10n="NEW">A -B (unchanged)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1486861" role="tablecontent" l10n="NEW">A --B (A, space, minus, minus, B)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id844141" role="tablecontent" l10n="NEW">A –B (A, space, en-dash, B)</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="note" id="par_id1416974" xml-lang="en-US" l10n="NEW">If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.<comment>i71908</comment></paragraph>
-<paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="3" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER">Delete spaces and tabs at beginning and end of paragraph
+ <paragraph xml-lang="en-US" id="par_id1416974" role="note" l10n="NEW">If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.<comment>i71908</comment></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152472" role="heading" level="3" l10n="U"
+ oldref="99"><switchinline select="appl"><caseinline select="WRITER">Delete spaces and tabs at beginning and end of paragraph
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="100"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of a paragraph. To use this option, the <emph>Apply Styles</emph> option must also be selected.
+ <paragraph xml-lang="en-US" id="par_id3156024" role="paragraph" l10n="U" oldref="100"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of a paragraph. To use this option, the <emph>Apply Styles</emph> option must also be selected.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="3" l10n="U" oldref="101"><switchinline select="appl"><caseinline select="WRITER">Delete blanks and tabs at end and start of lines
+ <paragraph xml-lang="en-US" id="hd_id3147303" role="heading" level="3" l10n="U"
+ oldref="101"><switchinline select="appl"><caseinline select="WRITER">Delete blanks and tabs at end and start of lines
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="102"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of each line. To use this option, the <emph>Apply Styles</emph> option must also be selected.
+ <paragraph xml-lang="en-US" id="par_id3150866" role="paragraph" l10n="U" oldref="102"><switchinline select="appl"><caseinline select="WRITER">Removes spaces and tabs at the beginning of each line. To use this option, the <emph>Apply Styles</emph> option must also be selected.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="28">Ignore double spaces</paragraph>
-<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="29">Replaces two or more consecutive spaces with a single space.</paragraph>
-<paragraph role="heading" id="hd_id3145116" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="WRITER">Apply numbering - symbol
+ <paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="3" l10n="U"
+ oldref="28">Ignore double spaces</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" l10n="U" oldref="29">Replaces two or more consecutive spaces with a single space.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145116" role="heading" level="3" l10n="U"
+ oldref="33"><switchinline select="appl"><caseinline select="WRITER">Apply numbering - symbol
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Automatically creates a numbered list when you press Enter at the end of a line that starts with a number followed by a period, a space, and text. If a line starts with a hyphen (-), a plus sign (+), or an asterisk (*), followed by a space, and text, a bulleted list is created when you press Enter.
+ <paragraph xml-lang="en-US" id="par_id3150870" role="paragraph" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="WRITER">Automatically creates a numbered list when you press Enter at the end of a line that starts with a number followed by a period, a space, and text. If a line starts with a hyphen (-), a plus sign (+), or an asterisk (*), followed by a space, and text, a bulleted list is created when you press Enter.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146874" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="appl"><caseinline select="WRITER">To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again.
+ <paragraph xml-lang="en-US" id="par_id3146874" role="paragraph" l10n="U" oldref="92"><switchinline select="appl"><caseinline select="WRITER">To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again.
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="tip" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3145606" role="tip" l10n="U" oldref="77">The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style.</paragraph>
</case>
</switch>
<switch select="appl">
<case select="WRITER">
-<paragraph role="heading" id="hd_id3157962" xml-lang="en-US" level="3" l10n="U" oldref="35">Apply border</paragraph>
-<paragraph role="paragraph" id="par_id3144445" xml-lang="en-US" l10n="U" oldref="36">Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
-<paragraph role="paragraph" id="par_idN10C2E" xml-lang="en-US" l10n="NEW">To delete the created line, click the paragraph above the line, choose <emph>Format - Paragraph - Borders</emph>, delete the bottom border.</paragraph>
-<paragraph role="paragraph" id="par_idN10C35" xml-lang="en-US" l10n="NEW">The following table summarizes the line thickness for the different characters: </paragraph>
-<table id="tbl_id3149985">
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="37">---</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154690" xml-lang="en-US" l10n="U" oldref="38">0.5pt single underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">___</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149266" xml-lang="en-US" l10n="U" oldref="40">1.0pt single underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147580" xml-lang="en-US" l10n="U" oldref="41">===</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145364" xml-lang="en-US" l10n="U" oldref="42">1.1pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148647" xml-lang="en-US" l10n="U" oldref="43">***</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="44">4.5pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="45">~~~</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="46">6.0pt double underline</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="47">###</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="48">9.0pt double underline</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/guide/line_intext.xhp#line_intext"/>
-<embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
+<paragraph xml-lang="en-US" id="hd_id3157962" role="heading" level="3" l10n="U"
+ oldref="35">Apply border</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144445" role="paragraph" l10n="U" oldref="36">Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10C2E" role="paragraph" l10n="NEW">To delete the created line, click the paragraph above the line, choose <emph>Format - Paragraph - Borders</emph>, delete the bottom border.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10C35" role="paragraph" l10n="NEW">The following table summarizes the line thickness for the different characters: </paragraph>
+ <table id="tbl_id3149985">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148576" role="tablecontent" l10n="U" oldref="37">---</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154690" role="tablecontent" l10n="U" oldref="38">0.5pt single underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154472" role="tablecontent" l10n="U" oldref="39">___</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149266" role="tablecontent" l10n="U" oldref="40">1.0pt single underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147580" role="tablecontent" l10n="U" oldref="41">===</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145364" role="tablecontent" l10n="U" oldref="42">1.1pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148647" role="tablecontent" l10n="U" oldref="43">***</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152791" role="tablecontent" l10n="U" oldref="44">4.5pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="tablecontent" l10n="U" oldref="45">~~~</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152885" role="tablecontent" l10n="U" oldref="46">6.0pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145591" role="tablecontent" l10n="U" oldref="47">###</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153188" role="tablecontent" l10n="U" oldref="48">9.0pt double underline</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/guide/line_intext.xhp#line_intext"/>
+ <embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
</case>
</switch>
-<paragraph role="heading" id="hd_id3149064" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="WRITER">Create table
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Creates a table when you press Enter after typing a series of hyphens (-) or tabs separated by plus signs, that is, +------+---+. Plus signs indicate column dividers, while hyphens and tabs indicate the width of a column.
+<paragraph xml-lang="en-US" id="hd_id3149064" role="heading" level="3" l10n="U"
+ oldref="49"><switchinline select="appl"><caseinline select="WRITER">Create table
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147219" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">+-----------------+---------------+------+
+ <paragraph xml-lang="en-US" id="par_id3146119" role="paragraph" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="WRITER">Creates a table when you press Enter after typing a series of hyphens (-) or tabs separated by plus signs, that is, +------+---+. Plus signs indicate column dividers, while hyphens and tabs indicate the width of a column.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3153334" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Apply Styles
+ <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">+-----------------+---------------+------+
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="WRITER">Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter.
+ <paragraph xml-lang="en-US" id="hd_id3153334" role="heading" level="3" l10n="U"
+ oldref="55"><switchinline select="appl"><caseinline select="WRITER">Apply Styles
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="3" l10n="U" oldref="58"><switchinline select="appl"><caseinline select="WRITER">Remove blank paragraphs
-</caseinline></switchinline></paragraph><comment>UFI: test if this also only applies to Default, body and body indented, or to all para styles</comment>
-<paragraph role="paragraph" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoCorrect - Apply</emph>.
+ <paragraph xml-lang="en-US" id="par_id3147396" role="paragraph" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="WRITER">Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3152375" xml-lang="en-US" level="3" l10n="U" oldref="60"><switchinline select="appl"><caseinline select="WRITER">Replace Custom Styles
+ <paragraph xml-lang="en-US" id="hd_id3151075" role="heading" level="3" l10n="U"
+ oldref="58"><switchinline select="appl"><caseinline select="WRITER">Remove blank paragraphs
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156299" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="WRITER">Replaces the custom paragraph styles in the current document with the "Default", the "Text Body", or the "Text Body Indent" paragraph style.
+<paragraph xml-lang="en-US" id="par_id3145728" role="paragraph" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="WRITER">Removes empty paragraphs from the current document when you choose <emph>Format - AutoCorrect - Apply</emph>.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3147045" xml-lang="en-US" level="3" l10n="U" oldref="62"><switchinline select="appl"><caseinline select="WRITER">Replace bullets with
+ <paragraph xml-lang="en-US" id="hd_id3152375" role="heading" level="3" l10n="U"
+ oldref="60"><switchinline select="appl"><caseinline select="WRITER">Replace Custom Styles
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150420" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="WRITER">Converts paragraphs that start with a hyphen (-), a plus sign (+), or an asterisk (*) directly followed by a space or a tab, to bulleted lists. This option only works on paragraphs that are formatted with the "Default", "Text Body", or "Text Body Indent" paragraph styles. To change the bullet style that is used, select this option, and then click <emph>Edit</emph>.
+ <paragraph xml-lang="en-US" id="par_id3156299" role="paragraph" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="WRITER">Replaces the custom paragraph styles in the current document with the "Default", the "Text Body", or the "Text Body Indent" paragraph style.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3154792" xml-lang="en-US" level="3" l10n="U" oldref="64"><switchinline select="appl"><caseinline select="WRITER">Replace standard quotes with custom quotes
+ <paragraph xml-lang="en-US" id="hd_id3147045" role="heading" level="3" l10n="U"
+ oldref="62"><switchinline select="appl"><caseinline select="WRITER">Replace bullets with
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156180" xml-lang="en-US" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="WRITER">Changes quotation marks in the text to the quotation marks that you specify in the <link href="text/shared/01/06040400.xhp" name="Custom Quotes">Custom Quotes</link> tab of this dialog.
+ <paragraph xml-lang="en-US" id="par_id3150420" role="paragraph" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="WRITER">Converts paragraphs that start with a hyphen (-), a plus sign (+), or an asterisk (*) directly followed by a space or a tab, to bulleted lists. This option only works on paragraphs that are formatted with the "Default", "Text Body", or "Text Body Indent" paragraph styles. To change the bullet style that is used, select this option, and then click <emph>Edit</emph>.
</caseinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3151019" xml-lang="en-US" level="3" l10n="U" oldref="66"><switchinline select="appl"><caseinline select="WRITER">Combine single line paragraphs if length greater than ...
+<comment>removed "replace standard quotes..." cws cbosdo01</comment>
+<paragraph xml-lang="en-US" id="hd_id3151019" role="heading" level="3" l10n="U"
+ oldref="66"><switchinline select="appl"><caseinline select="WRITER">Combine single line paragraphs if length greater than ...
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154162" xml-lang="en-US" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="WRITER">Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click <link href="text/swriter/01/05150104.xhp"><emph>Edit</emph></link>.
+ <paragraph xml-lang="en-US" id="par_id3154162" role="paragraph" l10n="U" oldref="67"><switchinline select="appl"><caseinline select="WRITER">Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click <link href="text/swriter/01/05150104.xhp"><emph>Edit</emph></link>.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT" id="bm_id3156334" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT" id="bm_id9193700" localize="false"/>
-<paragraph role="heading" id="hd_id3144749" xml-lang="en-US" level="2" l10n="U" oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT" id="bm_id9193700" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1218200910244459" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Modifies the selected AutoCorrect option.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3144749" role="heading" level="2" l10n="U"
+ oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153841" xml-lang="en-US" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3153841" role="paragraph" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
</caseinline></switchinline></paragraph>
-</body>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06040200.xhp b/helpcontent2/source/text/shared/01/06040200.xhp
index c69588c9e2..c47de3f07a 100644
--- a/helpcontent2/source/text/shared/01/06040200.xhp
+++ b/helpcontent2/source/text/shared/01/06040200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040200.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,20 +63,20 @@
<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="14">You can use the AutoCorrect feature to apply a specific character format to a word or abbreviation. Select the formatted text in your document, open this dialog, clear the <emph>Text only</emph> box, and then enter the text that you want to replace in the<emph> Replace</emph> box.</paragraph>
<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="WRITER">You can also include frames, graphics, and OLE objects in an AutoCorrect entry, so long as they are anchored <emph>as characters</emph> in the text. Select the frame, graphic or OLE object and at least one text character in front of and behind the object. Open this dialog, type a name for this AutoCorrect entry in the <emph>Replace </emph>box, and then click <emph>New</emph>.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT" id="bm_id3156343" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_REPLACE_ED_SHORT" id="bm_id1574449" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT" id="bm_id1574449" localize="false"/>
<paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="3" l10n="U" oldref="5">Replace</paragraph>
<paragraph role="paragraph" id="par_id3147560" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT">Enter the word or abbreviation that you want to replace while you type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE" id="bm_id3154389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_REPLACE_ED_REPLACE" id="bm_id6447340" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE" id="bm_id6447340" localize="false"/>
<paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="3" l10n="U" oldref="7">With:</paragraph>
<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE">Enter the replacement text, graphic, frame, or OLE object that you want to replace the text in the<emph> Replace</emph> box. If you have selected text, a graphic, a frame, or an OLE object in your document, the relevant information is already entered here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY" id="bm_id3150359" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_REPLACE_CB_TEXT_ONLY" id="bm_id8239997" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY" id="bm_id8239997" localize="false"/>
<paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="9">Text only</paragraph>
<paragraph role="paragraph" id="par_id3153379" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY">Saves the entry in the <emph>With</emph> box without formatting. When the replacement is made, the text uses the same format as the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE" id="bm_id3147085" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_NEW_REPLACE" id="bm_id8823511" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE -->
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<embed href="text/shared/00/00000001.xhp#loeschen1"/>
diff --git a/helpcontent2/source/text/shared/01/06040300.xhp b/helpcontent2/source/text/shared/01/06040300.xhp
index 694f729484..8424338076 100644
--- a/helpcontent2/source/text/shared/01/06040300.xhp
+++ b/helpcontent2/source/text/shared/01/06040300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040300.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,31 +52,31 @@
<paragraph role="heading" id="hd_id3149205" xml-lang="en-US" level="2" l10n="U" oldref="15">Replacements and exceptions for language:</paragraph>
<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_AUTOCORR_LANGUAGE">Select the language for which you want to create or edit the replacement rules.</ahelp> $[officename] first searches for exceptions that are defined for the language at the current cursor position in the document, and then searches the remaining languages.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV" id="bm_id3157959" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_EXCEPT_ED_ABBREV" id="bm_id9220557" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV" id="bm_id9220557" localize="false"/>
<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="3">Abbreviations (no subsequent capital)</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV">Type an abbreviation followed by a period, and then click <emph>New</emph>. This prevents $[officename] from automatically capitalizing the first letter of the word that comes after the period at the end of the abbreviation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV" id="bm_id3150444" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_AUTOCORR_EXCEPT_LB_ABBREV" id="bm_id1217383" localize="false"/>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV" id="bm_id1217383" localize="false"/>
<paragraph role="paragraph" id="par_id3149751" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV">Lists the abbreviations that are not automatically corrected.</ahelp> To remove an item from the list, select the item, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS" id="bm_id3166410" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_OFAPAGE_AUTOCORR_EXCEPT_ED_DOUBLE_CAPS" id="bm_id4391613" localize="false"/>
+<!-- removed HID OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS" id="bm_id4391613" localize="false"/>
<paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="2" l10n="U" oldref="6">Words with TWo INitial CApitals</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="OFFMGR:EDIT:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS">Type the word or abbreviation that starts with two capital letters that you do not want $[officename] to change to one initial capital. For example, enter PC to prevent $[officename] from changing PC to Pc.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS" id="bm_id3153827" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_AUTOCORR_EXCEPT_LB_DOUBLE_CAPS" id="bm_id8192083" localize="false"/>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS" id="bm_id8192083" localize="false"/>
<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS">Lists the words or abbreviations that start with two initial capitals that are not automatically corrected. All words which start with two capital letters are listed in the field.</ahelp> To remove an item from the list, select the item, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV" id="bm_id3157909" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS" id="bm_id3153717" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_NEWABBREV" id="bm_id7159031" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_NEWDOUBLECAPS" id="bm_id2211066" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV" id="bm_id7159031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<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"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_EXCEPT_CB_AUTOCAPS" id="bm_id6384777" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV -->
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV" id="bm_id8066347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS" id="bm_id6384777" localize="false"/>
<paragraph role="heading" id="hd_id3149762" xml-lang="en-US" level="3" l10n="U" oldref="10">AutoInclude</paragraph>
<paragraph role="paragraph" id="par_id3155829" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS">Automatically adds abbreviations or words that start with two capital letters to the corresponding list of exceptions. This feature only works if the <emph>Correct TWo INitial CApitals</emph> option or the Capitalize<emph> first letter of every sentence</emph> option are selected in the <emph>[T]</emph> column on<link href="text/shared/01/06040100.xhp" name="Options"><emph>Options</emph></link> tab of this dialog. </ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/06040400.xhp b/helpcontent2/source/text/shared/01/06040400.xhp
index 33db44e9c7..f1009ca3b6 100755
--- a/helpcontent2/source/text/shared/01/06040400.xhp
+++ b/helpcontent2/source/text/shared/01/06040400.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,11 +29,11 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0106040400xml" indexer="include">
-<title id="tit" xml-lang="en-US">Custom Quotes</title>
+<title id="tit" xml-lang="en-US">Localized Options</title>
<filename>/text/shared/01/06040400.xhp</filename>
</topic>
</meta>
@@ -45,37 +42,52 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153899"><bookmark_value>quotes; custom</bookmark_value>
<bookmark_value>custom quotes</bookmark_value>
<bookmark_value>AutoCorrect function; quotes</bookmark_value>
+<bookmark_value>replacing;ordinal numbers</bookmark_value>
+<bookmark_value>ordinal numbers;replacing</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="1" l10n="U" oldref="15"><link href="text/shared/01/06040400.xhp" name="Custom Quotes">Custom Quotes</link></paragraph>
-<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="16">Specify the AutoCorrect options for quotation marks in your document.</paragraph>
+<comment>renamed tab page from Custom Quotes to Localized Options, cws cbosdo01</comment>
+<paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="1" l10n="U" oldref="15"><link href="text/shared/01/06040400.xhp" name="Localized Options">Localized Options</link></paragraph>
+<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="16">Specify the AutoCorrect options for quotation marks and for options that are specific to the language of the text.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokotyafz"/>
</section>
+<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_QUOTE_SW_CLB" id="bm_id59906552" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id31537173" role="paragraph" l10n="NEW"><ahelp hid=".">Select to apply the replacements while you type [T], or when you modify existing text [M].</ahelp></paragraph>
+
+<comment>new feature, cws cbosdo01. http://wiki.services.openoffice.org/wiki/Non_Breaking_Spaces_Before_Punctuation_In_French_(espaces_ins%C3%A9cables)</comment>
+<paragraph xml-lang="en-US" id="hd_id3159300" role="heading" level="2" l10n="U" oldref="25">Add non breaking space before specific punctuation marks in French text</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153173" role="paragraph" l10n="U" oldref="27">Inserts a non breaking space before ";", "!", "?" and ":" when the character language is set to French (France, Belgium, Luxembourg, Monaco, or Switzerland) and before ":" only when the character language is set to French (Canada).</paragraph>
+
+<comment>moved two paras from 06040100.xhp, cws cbosdo01</comment>
+<paragraph xml-lang="en-US" id="hd_id3159400" role="heading" level="2" l10n="U" oldref="25">Format ordinal number suffixes (1st ... 1^st)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154173" role="paragraph" l10n="U" oldref="27">Formats the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts. For example, in English text, 1st will be converted to 1^st.</paragraph>
+
+
<paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="2" l10n="U" oldref="17">Single quotes / Double quotes</paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="18">Specify the replacement characters to use for single or double quotation marks.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO" id="bm_id3150902" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO" id="bm_id3159194" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Checkbox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_SGL_TYPO" id="bm_id5906552" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_TYPO" id="bm_id4584795" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO -->
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO -->
+<bookmark xml-lang="en-US" branch="hid/cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO" id="bm_id5906552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO" id="bm_id4584795" localize="false"/>
<paragraph role="heading" id="hd_id3156553" xml-lang="en-US" level="3" l10n="U" oldref="22">Replace</paragraph>
<paragraph role="paragraph" id="par_id3155616" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO">Automatically replaces the default system symbol for single quotation marks with the special character that you specify.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE" id="bm_id3147250" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE" id="bm_id3147043" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STARTQUOTE" id="bm_id6259651" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_STARTQUOTE" id="bm_id7007354" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE" id="bm_id6259651" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE" id="bm_id7007354" localize="false"/>
<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="3" l10n="U" oldref="11">Start quote</paragraph>
<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current opening quotation mark in your document when you choose <emph>Format - AutoCorrect - Apply</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE" id="bm_id3147576" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE" id="bm_id3155942" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_ENDQUOTE" id="bm_id6449476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_ENDQUOTE" id="bm_id6838282" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE" id="bm_id6449476" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE" id="bm_id6838282" localize="false"/>
<paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="3" l10n="U" oldref="13">End quote</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE">Select the <link href="text/shared/01/04100000.xhp" name="special character">special character</link> that will automatically replace the current closing quotation mark in your document when you choose <emph>Format - AutoCorrect - Apply</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD" id="bm_id3157863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD" id="bm_id3153682" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STD" id="bm_id4603106" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_DBL_STD" id="bm_id3145542" localize="false"/>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD -->
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD" id="bm_id4603106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD" id="bm_id3145542" localize="false"/>
<paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="19">Default</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD">Resets the quotation marks to the default symbols.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/06040500.xhp b/helpcontent2/source/text/shared/01/06040500.xhp
index 4f94b681ce..69a3c7681a 100755
--- a/helpcontent2/source/text/shared/01/06040500.xhp
+++ b/helpcontent2/source/text/shared/01/06040500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06040600.xhp b/helpcontent2/source/text/shared/01/06040600.xhp
index e1276232b7..3c3141cc9e 100644
--- a/helpcontent2/source/text/shared/01/06040600.xhp
+++ b/helpcontent2/source/text/shared/01/06040600.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06040600.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,61 +31,84 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0106040600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Word Completion</title>
-<filename>/text/shared/01/06040600.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="worterg">
-<paragraph role="heading" id="hd_id3148882" xml-lang="en-US" level="1" l10n="U" oldref="92"><link href="text/shared/01/06040600.xhp" name="Word Completion">Word Completion</link></paragraph>
-<paragraph role="paragraph" id="par_id3153624" xml-lang="en-US" l10n="U" oldref="93">Set the options for completing frequently occurring words while you type.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokoworterg"/>
-</section>
+ <topic id="textshared0106040600xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Word Completion</title>
+ <filename>/text/shared/01/06040600.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="worterg">
+ <paragraph xml-lang="en-US" id="hd_id3148882" role="heading" level="1" l10n="U"
+ oldref="92"><link href="text/shared/01/06040600.xhp" name="Word Completion">Word Completion</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153624" role="paragraph" l10n="U" oldref="93">Set the options for completing frequently occurring words while you type.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#autokoworterg"/>
+ </section>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/word_completion.xhp#word_completion"/>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV" id="bm_id3147620" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_ACTIV" id="bm_id4897915" localize="false"/><paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="3" l10n="U" oldref="94">Enable word completion</paragraph>
-<paragraph role="paragraph" id="par_id3156153" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV">Stores frequently used words, and automatically completes a word after you type three letters that match the first three letters of a stored word.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE" id="bm_id3153258" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE" id="bm_id6168401" localize="false"/><paragraph role="heading" id="hd_id3150978" xml-lang="en-US" level="3" l10n="U" oldref="100">Append space</paragraph>
-<paragraph role="paragraph" id="par_id3153700" xml-lang="en-US" l10n="U" oldref="101"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE">If you do not add punctuation after the word, $[officename] adds a space.</ahelp> The space is added as soon as you begin typing the next word.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP" id="bm_id3159256" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_AS_TIP" id="bm_id668355" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="102">Show as tip</paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="103"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP">Displays the completed word as a Help Tip.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT" id="bm_id3150244" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_COLLECT" id="bm_id2998138" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="3" l10n="U" oldref="96">Collect words</paragraph>
-<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="97"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT">Adds the frequently used words to a list. To remove a word from the Word Completion list, select the word, and then click<emph> Delete Entry</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST" id="bm_id3159344" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST" id="bm_id9715262" localize="false"/><paragraph role="heading" id="hd_id3156193" xml-lang="en-US" level="3" l10n="U" oldref="98">When closing a document, save the list for later use in other documents</paragraph>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="CHG" oldref="99"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST">Makes the current Word Completion list available to other documents after you close the current document. The list remains available until you exit %PRODUCTNAME.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY" id="bm_id3152349" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY" id="bm_id3945738" localize="false"/><paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="3" l10n="U" oldref="104">Accept with</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="105"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY">Select the key that you want to use to accept the automatic word completion.</ahelp></paragraph>
-<paragraph role="tip" id="par_idN106F8" xml-lang="en-US" l10n="NEW">Press Esc to decline the word completion.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN" id="bm_id3155922" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN" id="bm_id7839594" localize="false"/><paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="84">Min. word length</paragraph>
-<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="CHG" oldref="85"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN">Enter the minimum word length for a word to become eligible for the word completion feature.</ahelp><comment>UFI: changed due to BH phone call.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES" id="bm_id3145069" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES" id="bm_id3337199" localize="false"/><paragraph role="heading" id="hd_id3154758" xml-lang="en-US" level="3" l10n="U" oldref="86">Max. entries</paragraph>
-<paragraph role="paragraph" id="par_id3159414" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES">Enter the maximum number of words that you want to store in the Word Completion list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES" id="bm_id3148756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES" id="bm_id6878566" localize="false"/><paragraph role="heading" id="hd_id3147265" xml-lang="en-US" level="3" l10n="U" oldref="106">Word Completion list</paragraph>
-<paragraph role="paragraph" id="par_id3152773" xml-lang="en-US" l10n="CHG" oldref="107"><ahelp hid="OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES">Lists the collected words. The list is valid until you close the current document. To make the list available to other documents in the current session, select "<emph>When closing a document, save the list for later use in other documents</emph>".</ahelp></paragraph>
-<paragraph role="note" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="112">If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES" id="bm_id3149810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_PB_ENTRIES" id="bm_id6572161" localize="false"/><paragraph role="heading" id="hd_id3144434" xml-lang="en-US" level="3" l10n="U" oldref="110">Delete Entry</paragraph>
-<paragraph role="paragraph" id="par_id3153351" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES">Removes the selected word or words from the Word Completion list.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV" id="bm_id4897915" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="2" l10n="U"
+ oldref="94">Enable word completion</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156153" role="paragraph" l10n="U" oldref="95"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV">Stores frequently used words, and automatically completes a word after you type three letters that match the first three letters of a stored word.</ahelp></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE" id="bm_id6168401" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150978" role="heading" level="2" l10n="U"
+ oldref="100">Append space</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153700" role="paragraph" l10n="U" oldref="101"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE">If you do not add punctuation after the word, $[officename] adds a space.</ahelp> The space is added as soon as you begin typing the next word.</paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP" id="bm_id668355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U"
+ oldref="102">Show as tip</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="U" oldref="103"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP">Displays the completed word as a Help Tip.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT" id="bm_id2998138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
+ oldref="96">Collect words</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph" l10n="U" oldref="97"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT">Adds the frequently used words to a list. To remove a word from the Word Completion list, select the word, and then click<emph> Delete Entry</emph>.</ahelp></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST -->
+<!-- removed HID svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST" id="bm_id29981338" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156193" role="heading" level="2" l10n="CHG"
+ oldref="98">When closing a document, remove the words collected from it from the list</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="CHG" oldref="99"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST">When enabled, the list gets cleared when closing the current document. When disabled, makes the current Word Completion list available to other documents after you close the current document. The list remains available until you exit %PRODUCTNAME.</ahelp></paragraph>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY" id="bm_id3945738" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149580" role="heading" level="2" l10n="U"
+ oldref="104">Accept with</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153061" role="paragraph" l10n="U" oldref="105"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY">Select the key that you want to use to accept the automatic word completion.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106F8" role="tip" l10n="NEW">Press Esc to decline the word completion.</paragraph>
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN" id="bm_id7839594" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151245" role="heading" level="2" l10n="U"
+ oldref="84">Min. word length</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145609" role="paragraph" l10n="CHG" oldref="85"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN">Enter the minimum word length for a word to become eligible for the word completion feature.</ahelp><comment>UFI: changed due to BH phone call.</comment></paragraph>
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES" id="bm_id3337199" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154758" role="heading" level="2" l10n="U"
+ oldref="86">Max. entries</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159414" role="paragraph" l10n="U" oldref="87"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES">Enter the maximum number of words that you want to store in the Word Completion list.</ahelp></paragraph>
+<!-- removed HID OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES -->
+<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES" id="bm_id6878566" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147265" role="heading" level="2" l10n="U"
+ oldref="106">Word Completion list</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152773" role="paragraph" l10n="CHG" oldref="107"><ahelp hid="OFFMGR:MULTILISTBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES">Lists the collected words. The list is valid until you close the current document. To make the list available to other documents in the current session, disable "When closing a document, remove the words collected from it from the list".</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156423" role="note" l10n="U" oldref="112">If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected.</paragraph>
+<!-- removed HID OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES" id="bm_id6572161" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144434" role="heading" level="2" l10n="U"
+ oldref="110">Delete Entry</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153351" role="paragraph" l10n="U" oldref="111"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES">Removes the selected word or words from the Word Completion list.</ahelp></paragraph>
<switch select="appl">
-<case select="WRITER"><section id="relatedtopics">
-<embed href="text/swriter/guide/word_completion.xhp#word_completion"/>
-</section>
+<case select="WRITER">
+<section id="relatedtopics">
+ <embed href="text/swriter/guide/word_completion.xhp#word_completion"/>
+ </section>
</case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06040700.xhp b/helpcontent2/source/text/shared/01/06040700.xhp
index 38793efe2d..f9810b9dfd 100644
--- a/helpcontent2/source/text/shared/01/06040700.xhp
+++ b/helpcontent2/source/text/shared/01/06040700.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040700.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,11 +49,11 @@
<embed href="text/shared/00/00000406.xhp#autokosmarttags"/>
</section>
<embed href="text/swriter/guide/smarttags.xhp#smarttags"/>
-<bookmark xml-lang="en-US" branch="hid/809256156" id="bm_id8832056" localize="false"/><paragraph role="heading" id="hd_id686666" xml-lang="en-US" level="2" l10n="NEW">Label text with smart tags</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS" id="bm_id8832056" localize="false"/><paragraph role="heading" id="hd_id686666" xml-lang="en-US" level="2" l10n="NEW">Label text with smart tags</paragraph>
<paragraph role="paragraph" id="par_id3259376" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables Smart Tags to be evaluated and shown in your text document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id4024170" xml-lang="en-US" level="2" l10n="NEW">Currently installed smart tags</paragraph>
<paragraph role="paragraph" id="par_id2847071" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all installed Smart Tags. To configure a Smart Tag, select the name of the Smart Tag, then click Properties. Not all Smart Tags can be configured.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809259743" id="bm_id9547410" localize="false"/><paragraph role="heading" id="hd_id8424329" xml-lang="en-US" level="2" l10n="NEW">Properties</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS" id="bm_id9547410" localize="false"/><paragraph role="heading" id="hd_id8424329" xml-lang="en-US" level="2" l10n="NEW">Properties</paragraph>
<paragraph role="paragraph" id="par_id3912167" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To configure a Smart Tag, select the name of the Smart Tag, then click Properties. Not all Smart Tags can be configured.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06050000.xhp b/helpcontent2/source/text/shared/01/06050000.xhp
index 93cb1e7957..b7c04f9bcf 100644
--- a/helpcontent2/source/text/shared/01/06050000.xhp
+++ b/helpcontent2/source/text/shared/01/06050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,8 @@
<embed href="text/shared/01/06050100.xhp#bullets"/>
<embed href="text/shared/01/06050200.xhp#numerierungsart"/>
<embed href="text/shared/01/06050300.xhp#numerierung"/>
-<embed href="text/shared/01/06050600.xhp#position"/>
+<embed href="text/shared/01/06050400.xhp#graphics"/>
+<embed href="text/shared/01/06050600.xhp#position_s"/>
<embed href="text/shared/01/06050500.xhp#optionen"/>
<bookmark xml-lang="en-US" branch="hid/HID_NUM_RESET" id="bm_id3152996" localize="false"/>
<paragraph role="heading" id="hd_id3154984" xml-lang="en-US" level="2" l10n="U" oldref="27"><switchinline select="appl"><caseinline select="WRITER">Remove
diff --git a/helpcontent2/source/text/shared/01/06050100.xhp b/helpcontent2/source/text/shared/01/06050100.xhp
index 8f757e2af4..dafe85e4ec 100755
--- a/helpcontent2/source/text/shared/01/06050100.xhp
+++ b/helpcontent2/source/text/shared/01/06050100.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,42 +27,35 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106050100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Bullets</title>
-<filename>/text/shared/01/06050100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-22T10:38:33">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="bullets">
+ <topic id="textshared0106050100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Bullets</title>
+ <filename>/text/shared/01/06050100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="bullets">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>bullets;paragraphs</bookmark_value>
-<bookmark_value>paragraphs; inserting bullets</bookmark_value>
-<bookmark_value>inserting; paragraph bullets</bookmark_value>
+ <bookmark_value>paragraphs; inserting bullets</bookmark_value>
+ <bookmark_value>inserting; paragraph bullets</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150502" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050100.xhp" name="Bullets">Bullets</link></paragraph>
-<paragraph role="paragraph" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Displays the different bullet styles that you can apply.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#numbullets"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3150502" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050100.xhp" name="Bullets">Bullets</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155069" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Displays the different bullet styles that you can apply.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0202200910514673" role="note" l10n="NEW">Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#numbullets"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_VALUESET_BULLET" id="bm_id3145629" localize="false"/>
-<paragraph role="heading" id="hd_id3153255" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153255" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050200.xhp b/helpcontent2/source/text/shared/01/06050200.xhp
index 1b0d268cd4..2269e78fe0 100755
--- a/helpcontent2/source/text/shared/01/06050200.xhp
+++ b/helpcontent2/source/text/shared/01/06050200.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,38 +27,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Numbering Style</title>
-<filename>/text/shared/01/06050200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-24T14:40:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="numerierungsart">
-<paragraph role="heading" id="hd_id3146807" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
-<paragraph role="paragraph" id="par_id3148765" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
-</section>
+ <topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Numbering Style</title>
+ <filename>/text/shared/01/06050200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="numerierungsart">
+ <paragraph xml-lang="en-US" id="hd_id3146807" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148765" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_VALUESET_SINGLENUM" id="bm_id3153255" localize="false"/>
-<paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3147000" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152918" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050300.xhp b/helpcontent2/source/text/shared/01/06050300.xhp
index 7a6219b3ca..6d0205ff62 100755
--- a/helpcontent2/source/text/shared/01/06050300.xhp
+++ b/helpcontent2/source/text/shared/01/06050300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06050400.xhp b/helpcontent2/source/text/shared/01/06050400.xhp
new file mode 100755
index 0000000000..3c71a2e8b8
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/06050400.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 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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="textshared0106050400xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Graphics</title>
+ <filename>/text/shared/01/06050400.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="graphics">
+ <paragraph xml-lang="en-US" id="hd_id0611200904373284" role="heading" level="1" l10n="NEW"><link href="text/shared/01/06050400.xhp" name="Graphics">Graphics</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0611200904373226" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the different graphics that you can use as bullets in a bulleted list.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#graphics"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/HID_VALUESET_NUMBMP" id="bm_id0611200904382857" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0611200904361573" role="heading" level="2" l10n="NEW">Selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id061120090436150" role="paragraph" l10n="NEW"><ahelp hid=".">Click the graphics that you want to use as bullets.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED" id="bm_id0611200904355924" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id061120090436157" role="heading" level="2" l10n="NEW">Link graphics</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0611200904361575" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the graphics are inserted as links. If not enabled, the graphics are embedded into the document.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id061120090437338" role="paragraph" l10n="NEW"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0611200904373391" role="paragraph" l10n="NEW"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050500.xhp b/helpcontent2/source/text/shared/01/06050500.xhp
index 2389b2ff12..9a7f86c7b1 100755
--- a/helpcontent2/source/text/shared/01/06050500.xhp
+++ b/helpcontent2/source/text/shared/01/06050500.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050500.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,205 +27,215 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106050500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/01/06050500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T15:01:58">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="optionen">
+ <topic id="textshared0106050500xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Options</title>
+ <filename>/text/shared/01/06050500.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="optionen">
<bookmark xml-lang="en-US" branch="index" id="bm_id4096499"><bookmark_value>numbering;options</bookmark_value>
-<bookmark_value>bullet lists; formatting options</bookmark_value>
-<bookmark_value>font sizes;bullets</bookmark_value>
+ <bookmark_value>bullet lists; formatting options</bookmark_value>
+ <bookmark_value>font sizes;bullets</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3147240" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050500.xhp" name="Options">Options</link><comment>UFI: new name Customize Bullets and Numbering, tab page Options</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147212" xml-lang="en-US" l10n="U" oldref="2">Sets the formatting options for numbered or bulleted lists. If you want, you can apply formatting to individual levels in the list hierarchy.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#numoptionen"/>
-</section>
-<paragraph role="heading" id="hd_id3155069" xml-lang="en-US" level="2" l10n="U" oldref="6">Format</paragraph>
-<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="U" oldref="61">Select the level(s) that you want to modify, and then specify the formatting that you want to use.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL" id="bm_id3150040" localize="false"/>
-<paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="2" l10n="U" oldref="4">Level</paragraph>
-<paragraph role="paragraph" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL">Select the level(s) that you want to define the formatting options for.</ahelp> The selected level is highlighted in the preview.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT" id="bm_id3150789" localize="false"/>
-<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="3" l10n="U" oldref="9">Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT">Select a numbering style for the selected levels.</ahelp></paragraph>
-<table id="tbl_id3145090">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="62">Selection</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="63">Description</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="72">1, 2, 3, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="73">Arabic numerals</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="64">A, B, C, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="65">Capital letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="66">a, b, c, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="67">Lowercase letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="68">I, II, III, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="69">Roman numerals (uppercase)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="70">i, ii, iii, ...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159344" xml-lang="en-US" l10n="U" oldref="71">Roman numerals (lowercase)</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="100">A,... AA,... AAA,...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154579" xml-lang="en-US" l10n="U" oldref="101">Alphabetical numbering with uppercase letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="102">a,... aa,... aaa,...</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159167" xml-lang="en-US" l10n="U" oldref="103">Alphabetical numbering with lowercase letters</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153062" xml-lang="en-US" l10n="U" oldref="76">Bullet</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145085" xml-lang="en-US" l10n="U" oldref="77">Adds a bullet to the beginning of a line. Select this option, and then click the <emph>Character</emph> button to choose a bullet style.</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="appl"><caseinline select="WRITER">Bullets are resized to fit the current line height. If you want, you can define a Character Style that uses a different font size for bullets.
+<paragraph xml-lang="en-US" id="hd_id3147240" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050500.xhp" name="Options">Options</link><comment>UFI: new name Customize Bullets and Numbering, tab page Options</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147212" role="paragraph" l10n="U" oldref="2">Sets the formatting options for numbered or bulleted lists. If you want, you can apply formatting to individual levels in the list hierarchy.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#numoptionen"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3155069" role="heading" level="2" l10n="U" oldref="6">Format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153255" role="paragraph" l10n="U" oldref="61">Select the level(s) that you want to modify, and then specify the formatting that you want to use.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL" id="bm_id3150040" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153089" role="heading" level="2" l10n="U" oldref="4">Level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153935" role="paragraph" l10n="U" oldref="5"><ahelp hid="SVX:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL">Select the level(s) that you want to define the formatting options for.</ahelp> The selected level is highlighted in the preview.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT" id="bm_id3150789" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="3" l10n="U" oldref="9">Numbering</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147261" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT">Select a numbering style for the selected levels.</ahelp></paragraph>
+ <table id="tbl_id3145090">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148548" role="paragraph" l10n="U" oldref="62">Selection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155391" role="paragraph" l10n="U" oldref="63">Description</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156426" role="paragraph" l10n="U" oldref="72">1, 2, 3, ...</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="U" oldref="73">Arabic numerals</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150693" role="paragraph" l10n="U" oldref="64">A, B, C, ...</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156347" role="paragraph" l10n="U" oldref="65">Capital letters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="66">a, b, c, ...</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156327" role="paragraph" l10n="U" oldref="67">Lowercase letters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="68">I, II, III, ...</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154143" role="paragraph" l10n="U" oldref="69">Roman numerals (uppercase)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148474" role="paragraph" l10n="U" oldref="70">i, ii, iii, ...</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159344" role="paragraph" l10n="U" oldref="71">Roman numerals (lowercase)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="U" oldref="100">A,... AA,... AAA,...</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154579" role="paragraph" l10n="U" oldref="101">Alphabetical numbering with uppercase letters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147620" role="paragraph" l10n="U" oldref="102">a,... aa,... aaa,...</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159167" role="paragraph" l10n="U" oldref="103">Alphabetical numbering with lowercase letters</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153062" role="paragraph" l10n="U" oldref="76">Bullet</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145085" role="paragraph" l10n="U" oldref="77">Adds a bullet to the beginning of a line. Select this option, and then click the <emph>Character</emph> button to choose a bullet style.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154758" role="paragraph" l10n="U" oldref="94"><switchinline select="appl"><caseinline select="WRITER">Bullets are resized to fit the current line height. If you want, you can define a Character Style that uses a different font size for bullets.
</caseinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="79">Graphics</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3157817" xml-lang="en-US" l10n="U" oldref="80">Displays an image for the bullet. Select this options, and then click <emph>Select</emph> to locate the image file that you want to use.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="U" oldref="110">Linked graphics</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="111">Links the image to the current file. To embed the image in the current file, clear this checkbox.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148452" xml-lang="en-US" l10n="U" oldref="74">None</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="75">Does not apply a numbering style.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152811" role="paragraph" l10n="U" oldref="79">Graphics</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157817" role="paragraph" l10n="U" oldref="80">Displays an image for the bullet. Select this option, and then click <emph>Select</emph> to locate the image file that you want to use. The image gets embedded into the document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149649" role="paragraph" l10n="U" oldref="110">Linked graphics</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151210" role="paragraph" l10n="U" oldref="111">Displays an image for the bullet. Select this option, and then click <emph>Select</emph> to locate the image file that you want to use. The image gets inserted as a link to the image file.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148452" role="paragraph" l10n="U" oldref="74">None</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149167" role="paragraph" l10n="U" oldref="75">Does not apply a numbering style.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id3145746" xml-lang="en-US" l10n="U" oldref="95">The availability of the following fields depends on the style that you select in the <emph>Numbering </emph>box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX" id="bm_id3145318" localize="false"/>
-<paragraph role="heading" id="hd_id3156293" xml-lang="en-US" level="3" l10n="U" oldref="7">Before</paragraph>
-<paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX">Enter a character or the text to display in front of the number in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX" id="bm_id3152933" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="78">After</paragraph>
-<paragraph role="paragraph" id="par_id3150288" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX">Enter a character or the text to display behind the number in the list. If you want to create a numbered list that uses the style "1.)", enter ".)" in this box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT" id="bm_id3151380" localize="false"/>
-<paragraph role="heading" id="hd_id3156423" xml-lang="en-US" level="3" l10n="U" oldref="29"><switchinline select="appl"><caseinline select="WRITER">Character Styles
+ <paragraph xml-lang="en-US" id="par_id3145746" role="paragraph" l10n="U" oldref="95">The availability of the following fields depends on the style that you select in the <emph>Numbering </emph>box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX" id="bm_id3145318" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156293" role="heading" level="3" l10n="U" oldref="7">Before</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150393" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX">Enter a character or the text to display in front of the number in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX" id="bm_id3152933" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="U"
+ oldref="78">After</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150288" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX">Enter a character or the text to display behind the number in the list. If you want to create a numbered list that uses the style "1.)", enter ".)" in this box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT" id="bm_id3151380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156423" role="heading" level="3" l10n="U"
+ oldref="29"><switchinline select="appl"><caseinline select="WRITER">Character Styles
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150495" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT">Select the Character Style that you want to use in the numbered list.</ahelp> To create or edit a <link href="text/swriter/01/05130002.xhp" name="Character Style">Character Style</link>, open the <emph>Styles and Formatting</emph> window, click the Character Styles icon, right-click a style, and then choose <emph>New</emph>.
+ <paragraph xml-lang="en-US" id="par_id3150495" role="paragraph" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT">Select the Character Style that you want to use in the numbered list.</ahelp> To create or edit a <link href="text/swriter/01/05130002.xhp" name="Character Style">Character Style</link>, open the <emph>Styles and Formatting</emph> window, click the Character Styles icon, right-click a style, and then choose <emph>New</emph>.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL" id="bm_id3153768" localize="false"/>
-<paragraph role="heading" id="hd_id3147299" xml-lang="en-US" level="3" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="WRITER">Show sublevels
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL" id="bm_id3153768" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147299" role="heading" level="3" l10n="U"
+ oldref="31"><switchinline select="appl"><caseinline select="WRITER">Show sublevels
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152881" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL">Enter the number of previous levels to include in the numbering style. For example, if you enter "2" and the previous level uses the "A, B, C..." numbering style, the numbering scheme for the current level becomes: "A.1".</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3152881" role="paragraph" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL">Enter the number of previous levels to include in the numbering style. For example, if you enter "2" and the previous level uses the "A, B, C..." numbering style, the numbering scheme for the current level becomes: "A.1".</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START" id="bm_id3157895" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="U" oldref="33">Start at</paragraph>
-<paragraph role="paragraph" id="par_id3146903" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START">Enter a new starting number for the current level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR" id="bm_id3153726" localize="false"/>
-<paragraph role="heading" id="hd_id3145114" xml-lang="en-US" level="3" l10n="U" oldref="104"><switchinline select="appl"><caseinline select="IMPRESS">Color
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START" id="bm_id3157895" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155429" role="heading" level="3" l10n="U"
+ oldref="33">Start at</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146903" role="paragraph" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START">Enter a new starting number for the current level.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR" id="bm_id3153726" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145114" role="heading" level="3" l10n="U"
+ oldref="104"><switchinline select="appl"><caseinline select="IMPRESS">Color
</caseinline><caseinline select="DRAW">Color
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="105"><switchinline select="appl"><caseinline select="WRITER">
+ <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="105"><switchinline select="appl"><caseinline select="WRITER">
</caseinline><caseinline select="CALC">
</caseinline><caseinline select="MATH">
</caseinline><defaultinline><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR">Select a color for the current numbering style.</ahelp></defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE" id="bm_id3161659" localize="false"/>
-<paragraph role="heading" id="hd_id3159180" xml-lang="en-US" level="3" l10n="U" oldref="107"><switchinline select="appl"><caseinline select="IMPRESS">Relative size
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE" id="bm_id3161659" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159180" role="heading" level="3" l10n="U"
+ oldref="107"><switchinline select="appl"><caseinline select="IMPRESS">Relative size
</caseinline><caseinline select="DRAW">Relative size
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145364" xml-lang="en-US" l10n="U" oldref="108"><switchinline select="appl"><caseinline select="WRITER">
+ <paragraph xml-lang="en-US" id="par_id3145364" role="paragraph" l10n="U" oldref="108"><switchinline select="appl"><caseinline select="WRITER">
</caseinline><caseinline select="CALC">
</caseinline><caseinline select="MATH">
</caseinline><defaultinline><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE">Enter the amount by which you want to resize the bullet character with respect to the font height of the current paragraph.</ahelp></defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET" id="bm_id3153363" localize="false"/>
-<paragraph role="heading" id="hd_id3147444" xml-lang="en-US" level="3" l10n="U" oldref="81">Character</paragraph>
-<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET">Opens the <link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link> dialog, where you can select a bullet symbol.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147327" xml-lang="en-US" level="3" l10n="U" oldref="83">Options for graphics:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP" id="bm_id3153954" localize="false"/>
-<paragraph role="heading" id="hd_id3149934" xml-lang="en-US" level="3" l10n="U" oldref="84">Select...</paragraph>
-<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP">Select the graphic, or locate the graphic file that you want to use as a bullet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH" id="bm_id3147426" localize="false"/>
-<paragraph role="heading" id="hd_id3155746" xml-lang="en-US" level="3" l10n="U" oldref="86">Width</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH">Enter a width for the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT" id="bm_id3146986" localize="false"/>
-<paragraph role="heading" id="hd_id3150487" xml-lang="en-US" level="3" l10n="U" oldref="88">Height</paragraph>
-<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT">Enter a height for the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO" id="bm_id3152880" localize="false"/>
-<paragraph role="heading" id="hd_id3153740" xml-lang="en-US" level="3" l10n="U" oldref="92">Keep ratio</paragraph>
-<paragraph role="paragraph" id="par_id3153097" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO">Maintains the size proportions of the graphic.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT" id="bm_id3149410" localize="false"/>
-<paragraph role="heading" id="hd_id3147382" xml-lang="en-US" level="3" l10n="U" oldref="90">Alignment</paragraph>
-<paragraph role="paragraph" id="par_id3147127" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT">Select the alignment option for the graphic.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145596" xml-lang="en-US" level="2" l10n="U" oldref="96"><switchinline select="appl"><caseinline select="WRITER">All levels
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET" id="bm_id3153363" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147444" role="heading" level="3" l10n="U"
+ oldref="81">Character</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153144" role="paragraph" l10n="U" oldref="82"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET">Opens the <link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link> dialog, where you can select a bullet symbol.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147327" role="heading" level="3" l10n="U"
+ oldref="83">Options for graphics:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP" id="bm_id3153954" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149934" role="heading" level="3" l10n="U"
+ oldref="84">Select...</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152417" role="paragraph" l10n="U" oldref="85"><ahelp hid="SVX:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP">Select the graphic, or locate the graphic file that you want to use as a bullet.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH" id="bm_id3147426" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155746" role="heading" level="3" l10n="U"
+ oldref="86">Width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146974" role="paragraph" l10n="U" oldref="87"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH">Enter a width for the graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT" id="bm_id3146986" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150487" role="heading" level="3" l10n="U"
+ oldref="88">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154640" role="paragraph" l10n="U" oldref="89"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT">Enter a height for the graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO" id="bm_id3152880" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153740" role="heading" level="3" l10n="U"
+ oldref="92">Keep ratio</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153097" role="paragraph" l10n="U" oldref="93"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO">Maintains the size proportions of the graphic.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT" id="bm_id3149410" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147382" role="heading" level="3" l10n="U"
+ oldref="90">Alignment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147127" role="paragraph" l10n="U" oldref="91"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT">Select the alignment option for the graphic.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145596" role="heading" level="2" l10n="U"
+ oldref="96"><switchinline select="appl"><caseinline select="WRITER">All levels
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="97"><switchinline select="appl"><caseinline select="WRITER">Set the numbering options for all of the levels.
+ <paragraph xml-lang="en-US" id="par_id3148455" role="paragraph" l10n="U" oldref="97"><switchinline select="appl"><caseinline select="WRITER">Set the numbering options for all of the levels.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL" id="bm_id3153052" localize="false"/>
-<paragraph role="heading" id="hd_id3155852" xml-lang="en-US" level="3" l10n="U" oldref="98"><switchinline select="appl"><caseinline select="WRITER">Consecutive numbering
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL" id="bm_id3153052" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155852" role="heading" level="3" l10n="U"
+ oldref="98"><switchinline select="appl"><caseinline select="WRITER">Consecutive numbering
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148880" xml-lang="en-US" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL">Increases the numbering by one as you go down each level in the list hierarchy.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3148880" role="paragraph" l10n="U" oldref="99"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL">Increases the numbering by one as you go down each level in the list hierarchy.</ahelp>
</caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050600.xhp b/helpcontent2/source/text/shared/01/06050600.xhp
index 5d50012a57..cbc5ef6106 100644
--- a/helpcontent2/source/text/shared/01/06050600.xhp
+++ b/helpcontent2/source/text/shared/01/06050600.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06050600.xhp,v $
- * $Revision: 1.10.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0106050600xml" indexer="include">
<title id="tit" xml-lang="en-US">Position</title>
@@ -41,7 +38,7 @@
</topic>
</meta>
<body>
-<section id="position">
+<section id="position_s">
<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>
@@ -49,49 +46,49 @@
<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".<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<paragraph role="paragraph" id="par_id3155755" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL">Select the level(s) that you want to modify.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_LABEL_FOLLOWED_BY" id="bm_id7650990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY" id="bm_id7650990" localize="false"/>
<paragraph role="heading" id="hd_id6561784" xml-lang="en-US" level="2" l10n="NEW">Numbering followed by</paragraph>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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></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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2" id="bm_id5262611" localize="false"/>
<paragraph role="heading" id="hd_id3155583" xml-lang="en-US" level="2" l10n="U" oldref="5">Numbering alignment</paragraph>
<paragraph role="paragraph" id="par_id3153063" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SW:LISTBOX:TP_NUM_POSITION:LB_ALIGN">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</ahelp></paragraph>
<paragraph role="note" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="22">The <emph>Numbering alignment</emph> option does not set the alignment of the paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_ALIGNED_AT" id="bm_id8847621" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT" id="bm_id8847621" localize="false"/>
<paragraph role="heading" id="hd_id1619617" xml-lang="en-US" level="2" l10n="NEW">Aligned at</paragraph>
<paragraph role="paragraph" id="par_id1015655" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the distance from the left page margin at which the numbering symbol will be aligned.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_INDENT_AT" id="bm_id1841792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT" id="bm_id1841792" localize="false"/>
<paragraph role="heading" id="hd_id2336191" xml-lang="en-US" level="2" l10n="NEW">Indent at</paragraph>
<paragraph role="paragraph" id="par_id6081728" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the distance from the left page margin to the start of all lines in the numbered paragraph that follow the first line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST" id="bm_id3153032" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST" id="bm_id3155830" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST" id="bm_id3153032" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_BORDERDIST" id="bm_id3155830" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_INDENT" id="bm_id1336405" localize="false"/>
<paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="2" l10n="U" oldref="9">Indent</paragraph>
<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering symbol. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE" id="bm_id3149166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE" id="bm_id3149164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE" id="bm_id3149166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_NUM_POSITION:CB_RELATIVE" id="bm_id3149164" localize="false"/>
<paragraph role="heading" id="hd_id3155179" xml-lang="en-US" level="3" l10n="U" oldref="7">Relative</paragraph>
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE">Indents the current level relative to the previous level in the list hierarchy.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_INDENT" id="bm_id3153349" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_NUM_POSITION:MF_INDENT" id="bm_id3153348" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT" id="bm_id3153349" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_INDENT" id="bm_id3153348" localize="false"/>
<paragraph role="heading" id="hd_id3150245" xml-lang="en-US" level="2" l10n="CHG" oldref="28">Width of numbering<comment>i85347</comment></paragraph>
<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_INDENT">Enter the amount of space to leave between the left edge of the numbering symbol and the left edge of the text.</ahelp><comment>UFI: fixed #i31282#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST" id="bm_id3149237" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST" id="bm_id3149235" localize="false"/>
-<paragraph role="heading" id="hd_id3156194" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="WRITER">Minimum space numbering &lt;-&gt; text
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST" id="bm_id3149237" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_NUMDIST" id="bm_id3149235" localize="false"/>
+<paragraph role="heading" id="hd_id3156194" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="WRITER">Minimum space numbering &lt;-&gt; text
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147574" xml-lang="en-US" l10n="CHG" oldref="18"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST">Enter the minimum amount of space to leave between the right edge of the numbering symbol and the left edge of the text.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD" id="bm_id3154138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD" id="bm_id3151211" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD" id="bm_id3154138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_NUM_POSITION:PB_STANDARD" id="bm_id3151211" localize="false"/>
<paragraph role="heading" id="hd_id3154367" xml-lang="en-US" level="2" l10n="U" oldref="10">Default</paragraph>
<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD">Resets the indent and the spacing values to the default values.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/01/06130000.xhp b/helpcontent2/source/text/shared/01/06130000.xhp
index 41b0bbfc52..2ae3be4b65 100644
--- a/helpcontent2/source/text/shared/01/06130000.xhp
+++ b/helpcontent2/source/text/shared/01/06130000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06130000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
<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"/>
+<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"/>
@@ -59,28 +56,28 @@
<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"/>
+<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"/>
+<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"/>
+<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>
<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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>
@@ -88,40 +85,40 @@
<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"/>
+<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"/>
+<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"/>
+<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>
<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>
<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"/>
+<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>
<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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>
<embed href="text/shared/00/00000001.xhp#loeschen"/>
@@ -133,21 +130,21 @@
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<!-- removed HID svx:Edit:DLG_NEWLIB:ED_LIBNAME -->
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
diff --git a/helpcontent2/source/text/shared/01/06130001.xhp b/helpcontent2/source/text/shared/01/06130001.xhp
index a2abf262b0..6c5702bae0 100755
--- a/helpcontent2/source/text/shared/01/06130001.xhp
+++ b/helpcontent2/source/text/shared/01/06130001.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06130001.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06130010.xhp b/helpcontent2/source/text/shared/01/06130010.xhp
index cdf1b17810..db408ba5ad 100644
--- a/helpcontent2/source/text/shared/01/06130010.xhp
+++ b/helpcontent2/source/text/shared/01/06130010.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06130010.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06130100.xhp b/helpcontent2/source/text/shared/01/06130100.xhp
index 7aa02c46ee..0dac12c2f3 100755
--- a/helpcontent2/source/text/shared/01/06130100.xhp
+++ b/helpcontent2/source/text/shared/01/06130100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06130100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,14 +49,14 @@
<embed href="text/shared/00/00000406.xhp#passwort"/>
</section>
<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="2" l10n="U" oldref="3">Old password</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD" id="bm_id3152895" localize="false"/>
<paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="3" l10n="U" oldref="4">Password</paragraph>
<paragraph role="paragraph" id="par_id3144415" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:EDIT:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD">Enter the current password for the selected library.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145160" xml-lang="en-US" level="2" l10n="U" oldref="6">New password</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD" id="bm_id3144436" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD" id="bm_id3144436" localize="false"/>
<paragraph role="heading" id="hd_id3149525" xml-lang="en-US" level="3" l10n="U" oldref="7">Password</paragraph>
<paragraph role="paragraph" id="par_id3159194" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD">Enter a new password for the selected library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD" id="bm_id3156302" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD" id="bm_id3156302" localize="false"/>
<paragraph role="heading" id="hd_id3166445" xml-lang="en-US" level="3" l10n="U" oldref="9">Confirm</paragraph>
<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:EDIT:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD">Reenter the new password for the selected library.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/06130200.xhp b/helpcontent2/source/text/shared/01/06130200.xhp
index 423db717b3..0159a6889a 100755
--- a/helpcontent2/source/text/shared/01/06130200.xhp
+++ b/helpcontent2/source/text/shared/01/06130200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06130200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06130500.xhp b/helpcontent2/source/text/shared/01/06130500.xhp
index 36910cf9e0..e1434e4504 100755
--- a/helpcontent2/source/text/shared/01/06130500.xhp
+++ b/helpcontent2/source/text/shared/01/06130500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06130500.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,10 +48,10 @@
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="2" l10n="U" oldref="3">File name:</paragraph>
<paragraph role="paragraph" id="par_id3152876" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_BASICIDE_LIBSDLG_TREE">Enter a name or the path to the library that you want to append. You can also select a library from the list.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147294" xml-lang="en-US" level="2" l10n="U" oldref="5">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REF" id="bm_id3147090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF" id="bm_id3147090" localize="false"/>
<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="3" l10n="U" oldref="7">Insert as reference (read-only)</paragraph>
<paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REF">Adds the selected library as a read-only file. The library is reloaded each time you start <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REPL" id="bm_id3152895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL" id="bm_id3152895" localize="false"/>
<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace existing libraries</paragraph>
<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="BASCTL_CHECKBOX_RID_DLG_LIBS_RID_CB_REPL">Replaces a library that has the same name with the current library.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/06140000.xhp b/helpcontent2/source/text/shared/01/06140000.xhp
index e471c3fea3..42f2575894 100644
--- a/helpcontent2/source/text/shared/01/06140000.xhp
+++ b/helpcontent2/source/text/shared/01/06140000.xhp
@@ -6,14 +6,10 @@
***********************************************************************
*
* 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: 06140000.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -39,7 +35,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0106140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Configuration</title>
+<title id="tit" xml-lang="en-US">Customize</title>
<filename>/text/shared/01/06140000.xhp</filename>
</topic>
</meta>
diff --git a/helpcontent2/source/text/shared/01/06140100.xhp b/helpcontent2/source/text/shared/01/06140100.xhp
index d4efd296a6..2032ce7110 100644
--- a/helpcontent2/source/text/shared/01/06140100.xhp
+++ b/helpcontent2/source/text/shared/01/06140100.xhp
@@ -6,14 +6,10 @@
***********************************************************************
*
* 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: 06140100.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -49,18 +45,18 @@
<bookmark_value>customizing;menus</bookmark_value>
<bookmark_value>menus;customizing</bookmark_value>
</bookmark><comment>mw deleted "modifying;..." entry</comment><comment>Mw deleted "changing;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_MENU" id="bm_id3149962" localize="false"/><paragraph role="heading" id="hd_id3153008" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140100.xhp" name="Menu">Menu</link></paragraph>
+<!-- removed HID HID_CONFIG_MENU --><paragraph role="heading" id="hd_id3153008" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140100.xhp" name="Menu">Menu</link></paragraph>
<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_MENU">Customizes and saves current menu layouts as well as creates new menus. You cannot customize context menus.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3146873" xml-lang="en-US" l10n="U" oldref="72">You can add new commands, modify existing commands, or rearrange the menu items.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#menue"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS" id="bm_id1940061" localize="false"/><paragraph role="heading" id="par_idN1069B" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS" id="bm_id1940061" localize="false"/><paragraph role="heading" id="par_idN1069B" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
<paragraph role="paragraph" id="par_idN1069F" xml-lang="en-US" l10n="NEW"><ahelp hid="705498935">Select the menu and submenu that you want to edit.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_MENUS_BTN_NEW" id="bm_id6241340" localize="false"/><paragraph role="heading" id="par_idN106B0" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW" id="bm_id6241340" localize="false"/><paragraph role="heading" id="par_idN106B0" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN106B4" xml-lang="en-US" l10n="NEW"><ahelp hid="705499960">Opens the <link href="text/shared/01/06140101.xhp">New Menu</link> dialog where you can enter the name of a new menu as well as select the location for the menu.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE" id="bm_id1544541" localize="false"/><paragraph role="heading" id="par_idN106B7" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE" id="bm_id1544541" localize="false"/><paragraph role="heading" id="par_idN106B7" xml-lang="en-US" level="2" l10n="NEW">Menu</paragraph>
<paragraph role="paragraph" id="par_idN106BB" xml-lang="en-US" l10n="NEW"><ahelp hid="705507642">Opens a submenu with additional commands.</ahelp></paragraph>
<list type="unordered">
<listitem>
@@ -90,11 +86,15 @@
<paragraph role="heading" id="par_idN106F9" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN106FD" xml-lang="en-US" l10n="NEW">Deletes the selected menu or menu entry.</paragraph>
<paragraph role="note" id="par_idN10910" xml-lang="en-US" l10n="NEW">You can only delete custom menus and custom menu entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MENUCONFIG_LISTBOX" id="bm_id3148410" localize="false"/><paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
+<!-- removed HID HID_MENUCONFIG_LISTBOX -->
+<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
<paragraph role="paragraph" id="par_id3150999" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_MENUCONFIG_LISTBOX">Displays a list of the available menu commands for the selected menu in the current application or document.</ahelp></paragraph>
<section id="updown">
<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="39">To rearrange the order of menu entries, select an entry, and then click the up or down arrow button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP" id="bm_id3153822" localize="false"/><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP" id="bm_id16574620" localize="false"/>
+
+<paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
<paragraph role="paragraph" id="par_id3153585" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP">Moves the selected item up one position.</ahelp></paragraph>
<table id="tbl_id3154897">
<tablerow>
@@ -108,7 +108,9 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN" id="bm_id3150130" localize="false"/><paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN" id="bm_id16574640" localize="false"/>
+<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN">Moves the selected item down one position.</ahelp></paragraph>
<table id="tbl_id3149795">
<tablerow>
@@ -123,9 +125,15 @@
</tablerow>
</table>
</section>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_MENUS_BTN_ADD_COMMANDS" id="bm_id1657460" localize="false"/><paragraph role="heading" id="par_idN107EA" xml-lang="en-US" level="2" l10n="NEW">Add Commands</paragraph>
-<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid="705499974">Opens the Add Commands dialog. Select the command that you want to add to the menu, and then click <emph>Add</emph>. You can also drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY" id="bm_id8946195" localize="false"/><paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="2" l10n="NEW">Command</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS" id="bm_id1657460" localize="false"/><paragraph role="heading" id="par_idN107EA" xml-lang="en-US" level="2" l10n="NEW">Add Commands</paragraph>
+<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_CATEGORIES" id="bm_id1657465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_COMMANDS" id="bm_id1657467" localize="false"/>
+<paragraph role="paragraph" id="par_idN40723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+
+<bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY" id="bm_id8946195" localize="false"/><paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="2" l10n="NEW">Command</paragraph>
<paragraph role="paragraph" id="par_idN107FD" xml-lang="en-US" l10n="NEW"><ahelp hid="705507646">Opens a menu that contains additional commands.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10800" xml-lang="en-US" level="3" l10n="NEW">Add Submenu</paragraph>
<paragraph role="paragraph" id="par_idN10804" xml-lang="en-US" l10n="NEW">Opens the Add Submenu dialog, where you enter the name of a submenu.</paragraph>
@@ -137,7 +145,7 @@
<paragraph role="paragraph" id="par_idN108CD" xml-lang="en-US" l10n="NEW">Enter the new name for the selected command.</paragraph>
<paragraph role="heading" id="par_idN10824" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN10828" xml-lang="en-US" l10n="NEW">Deletes the selected command.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN" id="bm_id3804132" localize="false"/><paragraph role="heading" id="par_idN10918" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN" id="bm_id3804132" localize="false"/><paragraph role="heading" id="par_idN10918" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
<paragraph role="paragraph" id="par_idN107BF" xml-lang="en-US" l10n="NEW"><comment>UFI: Load and Save did not make it into SO8. There seems to be no work-around!!!</comment></paragraph>
<paragraph role="paragraph" id="par_idN1091C" xml-lang="en-US" l10n="NEW"><ahelp hid="705498948">Select the application or open document where you want to add the menu.</ahelp> A separate menu configuration is saved for the item that you select.</paragraph>
<paragraph role="paragraph" id="par_idN10AFB" xml-lang="en-US" l10n="NEW">To edit a menu configuration that is associated with an item in the list, select the item, make the changes that you want, and then click the <emph>OK</emph> button.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140101.xhp b/helpcontent2/source/text/shared/01/06140101.xhp
index a1481027e4..152085979a 100755
--- a/helpcontent2/source/text/shared/01/06140101.xhp
+++ b/helpcontent2/source/text/shared/01/06140101.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06140101.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -30,25 +27,23 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0106140101xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">New Menu</title>
<filename>/text/shared/01/06140101.xhp</filename>
</topic>
-<history>
-<created date="2004-07-12T14:32:22">UFI: New Menu dialog of Customize dialog</created>
-<lastedited date="2004-09-21T09:40:43">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">New Menu</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#menuenew"/>
</section>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME" id="bm_id1657461" localize="false"/>
<paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu name</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</ahelp></paragraph>
+
<paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
<embed href="text/shared/01/06140100.xhp#updown"/>
diff --git a/helpcontent2/source/text/shared/01/06140102.xhp b/helpcontent2/source/text/shared/01/06140102.xhp
index 491f4d2bd6..f861cf4362 100755
--- a/helpcontent2/source/text/shared/01/06140102.xhp
+++ b/helpcontent2/source/text/shared/01/06140102.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06140102.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -30,25 +27,24 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0106140102xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Move Menu</title>
<filename>/text/shared/01/06140102.xhp</filename>
</topic>
-<history>
-<created date="2004-07-12T14:47:43">UFI: Move Menu dialog from Customize dialog</created>
-<lastedited date="2004-09-21T09:40:29">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">Move Menu</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#menuemove"/>
</section>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_CONFIG_MENU_LISTBOX" id="bm_id16574660" localize="false"/>
+
<paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the selected menu entry up one position or down one position in the menu when you click an arrow button.</ahelp></paragraph>
<embed href="text/shared/01/06140100.xhp#updown"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140200.xhp b/helpcontent2/source/text/shared/01/06140200.xhp
index 37776201ef..d9f093175d 100644
--- a/helpcontent2/source/text/shared/01/06140200.xhp
+++ b/helpcontent2/source/text/shared/01/06140200.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06140200.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0106140200xml" indexer="include">
<title id="tit" xml-lang="en-US">Keyboard</title>
@@ -58,15 +55,17 @@
<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"/>
+<!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE" id="bm_id393425" 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
-</caseinline><caseinline select="CALC">Calc
-</caseinline><caseinline select="IMPRESS">Impress
-</caseinline><caseinline select="DRAW">Draw
-</caseinline><caseinline select="MATH">Math
+<!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE" id="bm_id315425" 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"/>
@@ -80,21 +79,27 @@
<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"/>
+<!-- removed HID SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY -->
+
<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"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE" id="bm_id31593425" 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"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE" id="bm_id31593424" 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"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD" id="bm_id31593423" 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"/>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE" id="bm_id31593422" 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_id0904200812484017" localize="false"/>
+<!-- removed HID sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET" id="bm_id31593421" 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"/>
diff --git a/helpcontent2/source/text/shared/01/06140400.xhp b/helpcontent2/source/text/shared/01/06140400.xhp
index 110971a23a..a0041ebb6d 100755
--- a/helpcontent2/source/text/shared/01/06140400.xhp
+++ b/helpcontent2/source/text/shared/01/06140400.xhp
@@ -6,14 +6,10 @@
***********************************************************************
*
* 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: 06140400.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -53,9 +49,15 @@
</section>
<paragraph role="heading" id="par_idN10601" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
<paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW">Select the toolbar you want to edit.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/><paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
-<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the <link href="text/shared/01/06140101.xhp">Name</link> dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/><paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/>
+<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
+
+<paragraph role="paragraph" id="par_idN106011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the name of a new toolbar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106012" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the location of the new toolbar.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/>
+<paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Toolbar button opens a submenu</ahelp> with the following commands:</paragraph>
<paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
<paragraph role="paragraph" id="par_idN10624" xml-lang="en-US" l10n="NEW">Opens the <emph>Name</emph> dialog, where you enter a new name for the selected toolbar.</paragraph>
@@ -71,10 +73,18 @@
<paragraph role="paragraph" id="par_idN10658" xml-lang="en-US" l10n="NEW">Shows text only.</paragraph>
<paragraph role="heading" id="par_idN1065B" xml-lang="en-US" level="3" l10n="NEW">Icons &amp; Text</paragraph>
<paragraph role="paragraph" id="par_idN1065E" xml-lang="en-US" l10n="NEW">Shows icons and text.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP" id="bm_id714743411" localize="false"/>
+<paragraph role="paragraph" id="par_idN1069AAA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected item up in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN" id="bm_id714743412" localize="false"/>
+<paragraph role="paragraph" id="par_idN1068AAA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected item down in the list.</ahelp></paragraph>
+
+
<paragraph role="heading" id="par_idN10661" xml-lang="en-US" level="2" l10n="NEW">Commands</paragraph>
<paragraph role="paragraph" id="par_idN10664" xml-lang="en-US" l10n="NEW">Displays a list of commands for the selected toolbar of the current application or document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/><paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/>
+<paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR_ITEM" id="bm_id3650929" localize="false"/><paragraph role="heading" id="par_idN10675" xml-lang="en-US" level="2" l10n="NEW">Modify</paragraph>
<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Modify button opens a submenu</ahelp> with the following commands:</paragraph>
<paragraph role="heading" id="par_idN1067B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140402.xhp b/helpcontent2/source/text/shared/01/06140402.xhp
index f1204f71df..125e85ebdb 100755
--- a/helpcontent2/source/text/shared/01/06140402.xhp
+++ b/helpcontent2/source/text/shared/01/06140402.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06140402.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -44,11 +41,13 @@
</meta>
<body>
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW">Change Icon</paragraph>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="NEW">Buttons</paragraph>
+<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="CHG">Icons</paragraph>
<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US" l10n="NEW">Displays the available icons in %PRODUCTNAME. To replace the icon that you selected in the <link href="text/shared/01/06140400.xhp">Customize</link> dialog, click an icon, then click the <emph>OK</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT" id="bm_id1383709" localize="false"/><paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT" id="bm_id1383709" localize="false"/>
+<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds new icons to the list of icons. You see a file open dialog that imports the selected icon or icons into the internal icon directory of %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="note" id="par_idN10575" xml-lang="en-US" l10n="NEW">You can only import icons that are in the PNG file format and that are 16x16 or 26x26 pixels in size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_MD_ICONSELECTOR_BTN_REMOVE" id="bm_id8980986" localize="false"/><comment>just guessing the help id</comment><paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_DELETE" id="bm_id1383799" localize="false"/>
+<paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140500.xhp b/helpcontent2/source/text/shared/01/06140500.xhp
index 3da6538571..6482e27d28 100644
--- a/helpcontent2/source/text/shared/01/06140500.xhp
+++ b/helpcontent2/source/text/shared/01/06140500.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06140500.xhp,v $
- *
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,21 +44,21 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3152427"><bookmark_value>customizing; events</bookmark_value>
<bookmark_value>events; customizing</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_EVENT" id="bm_id3152952" localize="false"/><paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph>
+<!-- removed HID HID_CONFIG_EVENT --><paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph>
<paragraph role="paragraph" id="par_id3152937" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_EVENT">Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#events"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_EVENTS_LB_SAVEIN" id="bm_id1163975" localize="false"/><paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN" id="bm_id1163975" localize="false"/><paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
<paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid="705547787">Select first where to save the event binding, in the current document or in %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="note" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="36">A macro that is saved with a document can only be run when that document is opened.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SVX_MACRO_LB_EVENT" id="bm_id1800286" localize="false"/><paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid="40000">The big list box lists the events and the assigned macros. After you selected the location in the <emph>Save In</emph> list box, select an event in the big list box. Then click <emph>Assign Macro</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN" id="bm_id3159167" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_EVENTS_PB_ASSIGN" id="bm_id752891" localize="false"/><paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/><paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN">Opens the <link href="text/shared/01/06130000.xhp">Macro Selector</link> to assign a macro to the selected event.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE" id="bm_id3152910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_EVENTS_PB_DELETE" id="bm_id9109164.00000001" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
+<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE">Deletes the macro assignment for the selected event.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="38"><link href="text/swriter/01/05060700.xhp" name="List of events">List of events</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/06150000.xhp b/helpcontent2/source/text/shared/01/06150000.xhp
index c404e46a37..56a4783509 100644
--- a/helpcontent2/source/text/shared/01/06150000.xhp
+++ b/helpcontent2/source/text/shared/01/06150000.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06150000.xhp,v $
- *
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150100.xhp b/helpcontent2/source/text/shared/01/06150100.xhp
index daeec5d287..44e981115e 100755
--- a/helpcontent2/source/text/shared/01/06150100.xhp
+++ b/helpcontent2/source/text/shared/01/06150100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06150100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150110.xhp b/helpcontent2/source/text/shared/01/06150110.xhp
index d5fec7f2f9..7f1d40c910 100755
--- a/helpcontent2/source/text/shared/01/06150110.xhp
+++ b/helpcontent2/source/text/shared/01/06150110.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06150110.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150120.xhp b/helpcontent2/source/text/shared/01/06150120.xhp
index 5dcbc78cba..d4883845fa 100755
--- a/helpcontent2/source/text/shared/01/06150120.xhp
+++ b/helpcontent2/source/text/shared/01/06150120.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06150120.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,6 +69,6 @@
<paragraph l10n="U" role="paragraph" id="par_id3147653" xml-lang="en-US" oldref="16"><ahelp hid="HID_XML_FILTER_IMPORT_XSLT" visibility="visible">If this is an import filter, enter the file name of the XSLT stylesheet that you want to use for importing.</ahelp></paragraph>
<bookmark branch="hid/HID_XML_FILTER_IMPORT_TEMPLATE" xml-lang="en-US" id="bm_id3155831"/><paragraph role="heading" level="2" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="17">Template for import</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153320" xml-lang="en-US" oldref="18"><ahelp hid="HID_XML_FILTER_IMPORT_TEMPLATE" visibility="visible">Enter the name of the template that you want to use for importing. In the template, styles are defined to display XML tags.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph>Tools - Options - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
+ <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06150200.xhp b/helpcontent2/source/text/shared/01/06150200.xhp
index 0ffbdf8e0a..a1eebe77cf 100755
--- a/helpcontent2/source/text/shared/01/06150200.xhp
+++ b/helpcontent2/source/text/shared/01/06150200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06150200.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06150210.xhp b/helpcontent2/source/text/shared/01/06150210.xhp
index df32f52a67..daf334bd02 100755
--- a/helpcontent2/source/text/shared/01/06150210.xhp
+++ b/helpcontent2/source/text/shared/01/06150210.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06150210.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/06200000.xhp b/helpcontent2/source/text/shared/01/06200000.xhp
index 1e694fea5a..4b8c67646d 100644
--- a/helpcontent2/source/text/shared/01/06200000.xhp
+++ b/helpcontent2/source/text/shared/01/06200000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06200000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_HANGUL_HANJA_CONVERSION" id="bm_id7305797" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:HangulHanjaConversion" id="bm_id3150702" localize="false"/>
<paragraph role="heading" id="hd_id3155757" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06200000.xhp" name="Hangul/Hanja Conversion">Hangul/Hanja Conversion</link></paragraph>
-<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph>Tools - Options - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
+<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#hangul"/>
@@ -61,7 +58,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_EDIT_NEWWORD" id="bm_id3166445" localize="false"/>
<paragraph role="heading" id="hd_id3154230" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace with<comment>name according to spec, current implementation displays "Word" here</comment></paragraph>
<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_HANGULDLG_EDIT_NEWWORD">Displays the first replacement suggestion from the dictionary.</ahelp> You can edit the suggested word or enter another word. Click the <emph>Find</emph> button to replace your original word with the corresponding replacement word.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVX_MDLG_HANGULHANJA_PB_FIND" id="bm_id3156136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND" id="bm_id3156136" localize="false"/>
<paragraph role="heading" id="hd_id3154673" xml-lang="en-US" level="2" l10n="U" oldref="7">Find</paragraph>
<paragraph role="paragraph" id="par_id3156560" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_PUSHBUTTON_RID_SVX_MDLG_HANGULHANJA_PB_FIND">Finds your Hangul input in the dictionary and replaces it with the corresponding Hanja.</ahelp> Click <emph>Ignore</emph> to cancel the find function.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_SUGGESTIONS" id="bm_id3149182" localize="false"/>
@@ -71,33 +68,33 @@
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVX_MDLG_HANGULHANJA_LB_SUGGESTIONS">Displays all available replacements in the dictionary.</ahelp> If the <emph>Replace by character</emph> box is enabled, you see a grid of characters. If the <emph>Replace by character</emph> box is not checked, you see a list of words.</paragraph>
<paragraph role="heading" id="hd_id3157958" xml-lang="en-US" level="2" l10n="U" oldref="11">Format</paragraph>
<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="12">Click the format to display the replacements.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION" id="bm_id3154317" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION" id="bm_id3154317" localize="false"/>
<paragraph role="heading" id="hd_id3153749" xml-lang="en-US" level="3" l10n="U" oldref="13">Hangul/Hanja</paragraph>
<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION">The original characters are replaced by the suggested characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BRACKETED" id="bm_id3153031" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED" id="bm_id3153031" localize="false"/>
<paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="U" oldref="15">Hanja (Hangul)</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BRACKETED">The Hangul part will be displayed in brackets after the Hanja part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BRACKETED" id="bm_id3145227" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED" id="bm_id3145227" localize="false"/>
<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="17">Hangul (Hanja)</paragraph>
<paragraph role="paragraph" id="par_id3149192" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BRACKETED">The Hanja part will be displayed in brackets after the Hangul part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_ABOVE" id="bm_id3158432" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE" id="bm_id3158432" localize="false"/>
<paragraph role="heading" id="hd_id3150119" xml-lang="en-US" level="3" l10n="U" oldref="19">Hanja as ruby text above<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
<paragraph role="paragraph" id="par_id3154173" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_ABOVE">The Hanja part will be displayed as ruby text above the Hangul part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BELOW" id="bm_id3149902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW" id="bm_id3149902" localize="false"/>
<paragraph role="heading" id="hd_id3159400" xml-lang="en-US" level="3" l10n="U" oldref="21">Hanja as ruby text below<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
<paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANGUL_HANJA_BELOW">The Hanja part will be displayed as ruby text below the Hangul part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_ABOVE" id="bm_id3153698" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE" id="bm_id3153698" localize="false"/>
<paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="23">Hangul as ruby text above<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_ABOVE">The Hangul part will be displayed as ruby text above the Hanja part.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BELOW" id="bm_id3153348" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW" id="bm_id3153348" localize="false"/>
<paragraph role="heading" id="hd_id3155831" xml-lang="en-US" level="3" l10n="U" oldref="25">Hangul as ruby text below<comment>To translators: this describes the visible graphical control - it is not part of the sources</comment></paragraph>
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_RADIOBUTTON_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BELOW">The Hangul part will be displayed as ruby text below the Hanja part.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148826" xml-lang="en-US" level="2" l10n="U" oldref="27">Conversion</paragraph>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="28">Normally in a mixed text selection made of Hangul and Hanja characters, all Hangul characters will be converted to Hanja and all Hanja characters will be converted to Hangul. If you want to convert a mixed text selection only in one direction, use the following conversion options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANGUL_ONLY" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY" id="bm_id3154381" localize="false"/>
<paragraph role="heading" id="hd_id3153585" xml-lang="en-US" level="3" l10n="U" oldref="29">Hangul only</paragraph>
<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANGUL_ONLY">Check to convert only Hangul. Do not convert Hanja.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANJA_ONLY" id="bm_id3147530" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY" id="bm_id3147530" localize="false"/>
<paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="3" l10n="U" oldref="31">Hanja only</paragraph>
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_HANJA_ONLY">Check to convert only Hanja. Do not convert Hangul.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_BUTTON_IGNORE" id="bm_id3149670" localize="false"/>
@@ -112,7 +109,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_BUTTON_CHANGEALL" id="bm_id3159084" localize="false"/>
<paragraph role="heading" id="hd_id3153360" xml-lang="en-US" level="2" l10n="U" oldref="39">Always Replace</paragraph>
<paragraph role="paragraph" id="par_id3153338" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_HANGULDLG_BUTTON_CHANGEALL">Replaces the selection with the suggested characters or word according to the format options. Every time the same selection is detected it will be replaced automatically.</ahelp> The next word or character will be selected for conversion. The list of replacement text is valid for the current $[officename] session.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_REPLACE_BY_CHARACTER" id="bm_id3145420" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER" id="bm_id3145420" localize="false"/>
<paragraph role="heading" id="hd_id3149290" xml-lang="en-US" level="3" l10n="U" oldref="41">Replace by character</paragraph>
<paragraph role="paragraph" id="par_id3145154" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_CHECKBOX_RID_SVX_MDLG_HANGULHANJA_CB_REPLACE_BY_CHARACTER">Check to move character-by-character through the selected text. If not checked, full words are replaced.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HANGULDLG_BUTTON_OPTIONS" id="bm_id2443311" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06201000.xhp b/helpcontent2/source/text/shared/01/06201000.xhp
index 9d37461fe1..b1d2c94159 100755
--- a/helpcontent2/source/text/shared/01/06201000.xhp
+++ b/helpcontent2/source/text/shared/01/06201000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06201000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,30 +45,30 @@
<bookmark xml-lang="en-US" branch="hid/HID_HANGULHANJA_OPT_DICTS_LB" id="bm_id3277077" localize="false"/>
<paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">User-defined dictionaries</paragraph>
<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_HANGULHANJA_NEWDICT_DLG">Lists all user-defined dictionaries. Select the check box next to the dictionary that you want to use. Clear the check box next to the dictionary that you do not want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW" id="bm_id4629657" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW" id="bm_id4629657" localize="false"/>
<paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1057E" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW">Opens the New dictionary dialog box, where you can create a new dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME" id="bm_id8444471.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME" id="bm_id8444471.00000001" localize="false"/>
<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Name</paragraph>
<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME">Enter a name for the dictionary.</ahelp> To display the new dictionary in the <emph>User-defined dictionaries</emph> list box, click <emph>OK</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT" id="bm_id6776635" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT" id="bm_id6776635" localize="false"/>
<paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
<paragraph role="paragraph" id="par_idN105B9" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT">Opens the <link href="text/shared/01/06202000.xhp">Edit Custom Dictionary</link> dialog where you can edit any user-defined dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE" id="bm_id6255684" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE" id="bm_id6255684" localize="false"/>
<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE">Deletes the selected user-defined dictionary.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105F1" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
<paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US" l10n="NEW">Specifies additional options for all dictionaries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST" id="bm_id6259346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST" id="bm_id6259346" localize="false"/>
<paragraph role="heading" id="par_idN10600" xml-lang="en-US" level="3" l10n="NEW">Ignore post-positional word</paragraph>
<paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST">Ignores positional characters at the end of Korean words when you search a dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOCLOSE" id="bm_id8419751" localize="false"/>
+<!-- removed HID svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOCLOSE -->
<paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="3" l10n="NEW">Close Conversion dialog automatically after replacement</paragraph>
<paragraph role="paragraph" id="par_idN1061F" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOCLOSE">Closes the Hangul/Hanja Conversion dialog box after you click <emph>Ignore</emph>, <emph>Always Ignore</emph>, <emph>Replace</emph>, or <emph>Always Replace</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST" id="bm_id231940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST" id="bm_id231940" localize="false"/>
<paragraph role="heading" id="par_idN10636" xml-lang="en-US" level="3" l10n="NEW">Show entries recently used first</paragraph>
<paragraph role="paragraph" id="par_idN1063A" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST">Shows the replacement suggestion that you selected the last time as the first entry on the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE" id="bm_id3751029" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE" id="bm_id3751029" localize="false"/>
<paragraph role="heading" id="par_idN10651" xml-lang="en-US" level="3" l10n="NEW">Replace all unique entries automatically</paragraph>
<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE">Automatically replaces words that only have one suggested word replacement.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/06202000.xhp b/helpcontent2/source/text/shared/01/06202000.xhp
index a67f2641ac..b58ba0ae2f 100755
--- a/helpcontent2/source/text/shared/01/06202000.xhp
+++ b/helpcontent2/source/text/shared/01/06202000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06202000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,20 +42,20 @@
<body>
<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Edit Custom Dictionary</paragraph>
<paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW">Add and delete entries that are used for the <link href="text/shared/01/06200000.xhp">Hangul/Hanja Conversion</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK" id="bm_id9376506" localize="false"/><paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK" id="bm_id9376506" localize="false"/><paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Book</paragraph>
<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK">Select the user-defined dictionary that you want to edit.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL" id="bm_id6413159" localize="false"/><paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">Original</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL" id="bm_id6413159" localize="false"/><paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">Original</paragraph>
<paragraph role="paragraph" id="par_idN1057E" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL">Select the entry in the current dictionary that you want to edit. If you want, you can also type a new entry in this box.</ahelp> To move from the Original box to the the first text box in the Suggestions area, press Enter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR" id="bm_id590533" localize="false"/><paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Replace by character</paragraph>
+<!-- removed HID svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR --><paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Replace by character</paragraph>
<paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR">Converts the text on a character by character basis and not on a word by word basis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1" id="bm_id6543778" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2" id="bm_id2266914" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3" id="bm_id5476241" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4" id="bm_id2326120" localize="false"/><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Suggestions (max. 8)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1" id="bm_id6543778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2" id="bm_id2266914" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3" id="bm_id5476241" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4" id="bm_id2326120" localize="false"/><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Suggestions (max. 8)</paragraph>
<paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1">Type a suggested replacement for the entry that is selected in the Original text box. The replacement word can contain a maximum of eight characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW" id="bm_id7013153" localize="false"/><paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW" id="bm_id7013153" localize="false"/><paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN105E8" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW">Adds the current replacement definition to the dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE" id="bm_id5783562" localize="false"/><paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE" id="bm_id5783562" localize="false"/><paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN10603" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE">Deletes the selected entry.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06990000.xhp b/helpcontent2/source/text/shared/01/06990000.xhp
index eda61e93e1..ff57c68f2e 100755
--- a/helpcontent2/source/text/shared/01/06990000.xhp
+++ b/helpcontent2/source/text/shared/01/06990000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06990000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/07010000.xhp b/helpcontent2/source/text/shared/01/07010000.xhp
index cf9c70e6b8..90aa1c6a37 100644
--- a/helpcontent2/source/text/shared/01/07010000.xhp
+++ b/helpcontent2/source/text/shared/01/07010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07010000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/07080000.xhp b/helpcontent2/source/text/shared/01/07080000.xhp
index 32daa8dc5c..da2b488bca 100755
--- a/helpcontent2/source/text/shared/01/07080000.xhp
+++ b/helpcontent2/source/text/shared/01/07080000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07080000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/08060100.xhp b/helpcontent2/source/text/shared/01/08060100.xhp
index 87f86a8bf8..cb0c79c575 100644
--- a/helpcontent2/source/text/shared/01/08060100.xhp
+++ b/helpcontent2/source/text/shared/01/08060100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 08060100.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,39 +32,43 @@
<meta>
-<topic id="textshared0108060100xml" indexer="include">
-<title id="tit" xml-lang="en-US">Registration</title>
-<filename>/text/shared/01/08060100.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="paragraph" id="par_id3152876" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<section id="registrierung">
+ <topic id="textshared0108060100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Registration</title>
+ <filename>/text/shared/01/08060100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <paragraph xml-lang="en-US" id="par_id3152876" role="paragraph" l10n="E" oldref="1"
+ localize="false"/>
+ <section id="registrierung">
<bookmark xml-lang="en-US" branch="index" id="bm_id8190557"><bookmark_value>online registration</bookmark_value>
-<bookmark_value>registering; %PRODUCTNAME</bookmark_value>
+ <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"/>
<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">
-<embed href="text/shared/00/00000408.xhp#online"/>
-</section>
-<paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="4">Registration Dialog</paragraph>
-<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>
-<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>
-<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>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3147477" role="heading" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153882" role="paragraph" 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">
+ <embed href="text/shared/00/00000408.xhp#online"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3153624" role="heading" level="2" l10n="U" oldref="4">Registration Dialog</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150445" role="paragraph" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145629" role="heading" level="3" l10n="U"
+ oldref="10">I want to 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 xml-lang="en-US" id="par_id3149999" role="paragraph" 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 xml-lang="en-US" id="hd_id3149760" role="heading" level="3" l10n="U"
+ oldref="11">I want 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 xml-lang="en-US" id="par_id3151234" role="paragraph" 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 xml-lang="en-US" id="hd_id3147557" role="heading" level="3" l10n="U"
+ oldref="12">I do not want to 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 xml-lang="en-US" id="par_id3148548" role="paragraph" 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> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
index e83b1d19d0..f6631c57ae 100644
--- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp
+++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: about_meta_tags.xhp,v $
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -100,8 +97,8 @@
<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>
<paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="16">Scripts and META tags in the header of an HTML document are imported and anchored to the first paragraph in the document.</paragraph>
-<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] notes. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
+<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
<paragraph role="heading" id="hd_id3163717" xml-lang="en-US" level="3" l10n="U" oldref="17">Export Tips</paragraph>
-<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Notes and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
+<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Comments and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/digitalsignatures.xhp b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
index d9fe1d5bb0..f00d915bcc 100644
--- a/helpcontent2/source/text/shared/01/digitalsignatures.xhp
+++ b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digitalsignatures.xhp,v $
- * $Revision: 1.15 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,51 +29,47 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Digital Signatures</title>
-<filename>/text/shared/01/digitalsignatures.xhp</filename>
-</topic>
-<history>
-<created date="2004-08-25T17:23:25">UFI: Digital Signatures from File-Properties-General</created>
-<lastedited date="2007-03-02T16:29:34">dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="digitalsignatures">
+ <topic id="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Digital Signatures</title>
+ <filename>/text/shared/01/digitalsignatures.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="digitalsignatures">
<bookmark xml-lang="en-US" branch="hid/SID_SIGNATURE" id="bm_id9475924" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Signature" id="bm_id127567" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_DOCINFODOC_BTN_SIGNATURE" id="bm_id4573503" localize="false"/>
-<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link></paragraph>
-<paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds and removes digital signatures to and from your document. You can also use the dialog to view certificates.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#digitalsig"/>
-</section>
-<embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_QUERY_SAVEBEFORESIGN" id="bm_id1376689" localize="false"/>
-<paragraph role="paragraph" id="par_idN10629" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file before you can apply a digital signature to the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_INFO_WRONGDOCFORMAT" id="bm_id133060" localize="false"/>
-<paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file in OpenDocument format before you can apply a digital signature to the file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE" id="bm_id4573503" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1" l10n="NEW"><link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10548" role="paragraph" l10n="NEW"><ahelp hid=".">Adds and removes digital signatures to and from your document. You can also use the dialog to view certificates.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#digitalsig"/>
+ </section>
+ <embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+<!-- removed HID HID_XMLSEC_QUERY_SAVEBEFORESIGN -->
+<paragraph xml-lang="en-US" id="par_idN10629" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file before you can apply a digital signature to the file.</ahelp></paragraph>
+<!-- removed HID HID_XMLSEC_INFO_WRONGDOCFORMAT -->
+<paragraph xml-lang="en-US" id="par_idN10644" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">You must save a file in OpenDocument format before you can apply a digital signature to the file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_SIGNATURESDLG" id="bm_id685445" localize="false"/>
-<paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">List</paragraph>
-<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW">The Signed icon
-<image id="img_id4557023" src="xmlsecurity/res/signet_11x16.png" width="0.222inch" height="0.1528inch"><alt id="alt_id4557023" xml-lang="en-US">icon</alt>
+<paragraph xml-lang="en-US" id="par_idN1055F" role="heading" level="2" l10n="NEW">List</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10563" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
+<image id="img_id4557023" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id4557023">Icon</alt>
</image> indicates a valid digital signature, while the Exclamation mark icon
-<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665inch" height="0.1146inch"><alt id="alt_id249336" xml-lang="en-US">icon</alt>
+<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id249336">Icon</alt>
</image> indicates an invalid digital signature.</paragraph>
-<paragraph role="tip" id="par_idN10569" xml-lang="en-US" l10n="NEW">A Signed icon is also shown in the Status bar when a signed document only contains valid digital signatures.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECDLG_DIGSIG_BTN_VIEWCERT" id="bm_id7360759" localize="false"/>
-<paragraph role="heading" id="par_idN1056C" xml-lang="en-US" level="2" l10n="NEW">View Certificate</paragraph>
-<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/padmin_PushButton_RID_PADIALOG_RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
-<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10585" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/padmin_PushButton_RID_PADIALOG_RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
-<paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected source from the list.</ahelp></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id0821200910573716" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT" id="bm_id7360759" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1056C" role="heading" level="2" l10n="NEW">View Certificate</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10570" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="NEW">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Remove</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1059A" role="paragraph" l10n="NEW"><ahelp hid=".">Removes the selected source from the list.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp
index a3bb03e138..05b8d26a89 100644
--- a/helpcontent2/source/text/shared/01/extensionupdate.xhp
+++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp
@@ -1,19 +1,14 @@
<?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: extensionupdate.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -34,64 +29,43 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Extension Update</title>
-<filename>/text/shared/01/extensionupdate.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Extension Update</title>
+ <filename>/text/shared/01/extensionupdate.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATE" id="bm_id5684377" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" localize="false"/><paragraph role="heading" id="hd_id9688100" xml-lang="en-US" level="1" l10n="NEW">Extension Update</paragraph>
-<paragraph role="paragraph" id="par_id5084688" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
-</section>
-<paragraph role="paragraph" id="par_id6401257" xml-lang="en-US" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/>
-<paragraph role="paragraph" id="par_id5841242" xml-lang="en-US" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id6794030" xml-lang="en-US" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
-<paragraph role="paragraph" id="par_id7096774" xml-lang="en-US" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6420484" xml-lang="en-US" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6986602" xml-lang="en-US" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id616779" xml-lang="en-US" l10n="NEW">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">A manual update is necessary.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="paragraph" id="par_id757469" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5189062" xml-lang="en-US" l10n="NEW">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
-<paragraph role="paragraph" id="par_id3949095" xml-lang="en-US" l10n="NEW">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
-<paragraph role="paragraph" id="par_id3729056" xml-lang="en-US" l10n="NEW">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6854457" xml-lang="en-US" l10n="NEW">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3372295" xml-lang="en-US" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
-<paragraph role="heading" id="hd_id5699942" xml-lang="en-US" level="2" l10n="NEW">Show all Updates</paragraph>
-<paragraph role="paragraph" id="par_id641193" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id7634510" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9688100" role="heading" level="1" l10n="NEW">Extension Update</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5084688" role="paragraph" l10n="CHG"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id6401257" role="paragraph" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5841242" role="paragraph" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id6794030" role="paragraph" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7096774" role="paragraph" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6420484" role="paragraph" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id6986602" role="paragraph" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id616779" role="paragraph" l10n="NEW">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id791039" role="paragraph" l10n="NEW">A manual update is necessary.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id757469" role="paragraph" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id5189062" role="paragraph" l10n="NEW">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3949095" role="paragraph" l10n="NEW">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3729056" role="paragraph" l10n="NEW">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6854457" role="paragraph" l10n="NEW">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3372295" role="paragraph" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5699942" role="heading" level="2" l10n="NEW">Show all Updates</paragraph>
+ <paragraph xml-lang="en-US" id="par_id641193" role="paragraph" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id7634510" role="paragraph" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/formatting_mark.xhp b/helpcontent2/source/text/shared/01/formatting_mark.xhp
index c39e62b982..0417dc0c38 100755
--- a/helpcontent2/source/text/shared/01/formatting_mark.xhp
+++ b/helpcontent2/source/text/shared/01/formatting_mark.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: formatting_mark.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,59 +29,44 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01formatting_markxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Formatting Mark</title>
-<filename>text/shared/01/formatting_mark.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
- <section id="formatting_mark">
-
-
+ <topic id="textshared01formatting_markxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">Formatting Mark </title>
+ <filename>/text/shared/01/formatting_mark.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="formatting_mark">
<bookmark xml-lang="en-US" branch="hid/.uno:FormattingMarkMenu" id="bm_id7235023" localize="false"/>
-
<bookmark xml-lang="en-US" branch="index" id="bm_id9930722"><bookmark_value>CTL;(not) wrapping words</bookmark_value>
-<bookmark_value>words;wrapping in CTL</bookmark_value>
-</bookmark>
- <comment>MW added 2 index entries because of issue 86750</comment>
- <paragraph xml-lang="en-US" id="hd_id126651" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
+ <bookmark_value>words;wrapping in CTL</bookmark_value>
+</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save &amp; overwrite as formatting_mark.xhp</comment><comment>but this did not help</comment>
+<paragraph xml-lang="en-US" id="hd_id030220091035120" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id9305398" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks.</ahelp></paragraph>
-
- </section>
-
+ <paragraph xml-lang="en-US" id="par_id0302200910351248" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks. Enable CTL for more commands.</ahelp></paragraph>
+ </section>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertNonBreakingSpace" id="bm_id2567217" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id9996948" role="heading" level="2" l10n="NEW">Non-breaking space</paragraph>
- <paragraph xml-lang="en-US" id="par_id8326975" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id9996948" role="heading" level="2" l10n="NEW">Non-breaking space</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8326975" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a space that will keep bordering characters together on line breaks.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertHardHyphen" id="bm_id6757713" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph>
- <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id6383556" role="heading" level="2" l10n="NEW">Non-breaking hyphen</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8469191" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a hyphen that will keep bordering characters together on line breaks.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertSoftHyphen" id="bm_id8669698" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Optional hyphen</paragraph>
- <paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id3306680" role="heading" level="2" l10n="NEW">Optional hyphen</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9407330" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible hyphen within a word that will appear and create a line break once it becomes the last character in a line.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertZWSP" id="bm_id1068758" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph>
- <paragraph xml-lang="en-US" id="par_id1536301" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id2295907" role="heading" level="2" l10n="NEW">No-width optional break</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1536301" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertZWNBSP" id="bm_id8484450" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3245643" role="heading" level="2" l10n="NEW">No-width no break</paragraph>
- <paragraph xml-lang="en-US" id="par_id1085238" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id3245643" role="heading" level="2" l10n="NEW">No-width no break</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1085238" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts an invisible space within a word that will keep the word together at the end of a line. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertLRM" id="bm_id714743" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id4634540" role="heading" level="2" l10n="NEW">Left-to-right mark</paragraph>
- <paragraph xml-lang="en-US" id="par_id6690878" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
-
+<paragraph xml-lang="en-US" id="hd_id4634540" role="heading" level="2" l10n="NEW">Left-to-right mark</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6690878" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertRLM" id="bm_id3938413" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
- <paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
- </body>
+<paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
+ <paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/gallery.xhp b/helpcontent2/source/text/shared/01/gallery.xhp
index 6df461b946..48035fb950 100644
--- a/helpcontent2/source/text/shared/01/gallery.xhp
+++ b/helpcontent2/source/text/shared/01/gallery.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: gallery.xhp,v $
- * $Revision: 1.8.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared01galleryxml" indexer="include">
<title id="tit" xml-lang="en-US">Gallery</title>
@@ -65,7 +62,7 @@
<embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
<paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="3" l10n="U" oldref="4">Adding a New File to the Gallery</paragraph>
<paragraph role="paragraph" id="par_id3153032" xml-lang="en-US" l10n="U" oldref="43">To add a file to the <emph>Gallery</emph>, right-click a theme, choose <emph>Properties</emph>, click the <emph>Files </emph>tab, and then click <emph>Add</emph>. You can also click an object in the current document, hold, and then drag it to the <emph>Gallery</emph> window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_NEW_THEME" id="bm_id3155449" localize="false"/>
+
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_NEWTHEME" id="bm_id3154381" localize="false"/>
<paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="2" l10n="U" oldref="10">New theme</paragraph>
<paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_GALLERY_NEWTHEME">Adds a new theme to the <emph>Gallery </emph>and lets you choose the files to include in the theme.</ahelp>.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/gallery_files.xhp b/helpcontent2/source/text/shared/01/gallery_files.xhp
index 9a9ee1060a..0971d97dbe 100755
--- a/helpcontent2/source/text/shared/01/gallery_files.xhp
+++ b/helpcontent2/source/text/shared/01/gallery_files.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: gallery_files.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,22 +48,22 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#galleryregisterdateien"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE" id="bm_id3151330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE" id="bm_id3151330" localize="false"/>
<paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="3" l10n="U" oldref="5">File Type</paragraph>
<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:COMBOBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE">Select the type of file that you want to add.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND" id="bm_id3150902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND" id="bm_id3150902" localize="false"/>
<paragraph role="heading" id="hd_id3153935" xml-lang="en-US" level="3" l10n="U" oldref="7">Files found</paragraph>
<paragraph role="paragraph" id="par_id3145829" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:MULTILISTBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND">Lists the available files. Select the file(s) that you want to add, and then click <emph>Add</emph>. To add all of the files in the list, click <emph>Add All</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH" id="bm_id3155552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH" id="bm_id3155552" localize="false"/>
<paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="9">Find files</paragraph>
<paragraph role="paragraph" id="par_id3147557" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH">Locate the directory containing the files that you want to add, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE" id="bm_id3147576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE" id="bm_id3147576" localize="false"/>
<paragraph role="heading" id="hd_id3154317" xml-lang="en-US" level="3" l10n="U" oldref="13">Add</paragraph>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE">Adds the selected file(s) to the current theme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL" id="bm_id3149095" localize="false"/>
<paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="15">Add all</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:PUSHBUTTON:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL">Adds all of the files in the list to the current theme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW" id="bm_id3147654" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW" id="bm_id3147654" localize="false"/>
<paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="3" l10n="U" oldref="17">Preview</paragraph>
<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:CHECKBOX:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW">Displays or hides a preview of the selected file.</ahelp></paragraph><comment>UFI: removed help id</comment>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="19">Preview box</paragraph>
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
index d56720daa0..b584aea2b5 100755
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: grid.xhp,v $
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
<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>
+<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp
index 749ffe8a3a..cf22da3fab 100755
--- a/helpcontent2/source/text/shared/01/guides.xhp
+++ b/helpcontent2/source/text/shared/01/guides.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: guides.xhp,v $
- * $Revision: 1.14.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk
index 684ee2a8a4..e3ba6734c9 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.21.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,6 +69,7 @@ XHPFILES = \
01100300.xhp \
01100400.xhp \
01100500.xhp \
+ 01100600.xhp \
01110000.xhp \
01110100.xhp \
01110101.xhp \
@@ -285,6 +282,7 @@ XHPFILES = \
06050100.xhp \
06050200.xhp \
06050300.xhp \
+ 06050400.xhp \
06050500.xhp \
06050600.xhp \
06130000.xhp \
@@ -344,4 +342,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index 84f4d1fee2..2040f7d963 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: mediaplayer.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,55 +31,56 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Media Player</title>
-<filename>/text/shared/01/mediaplayer.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="mediaplayer">
+ <topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Media Player</title>
+ <filename>/text/shared/01/mediaplayer.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="mediaplayer">
<bookmark xml-lang="en-US" branch="index" id="bm_id8659321"><bookmark_value>Media Player window</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_AVMEDIA_PLAYER" id="bm_id8777733" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/><paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10550" role="heading" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid="6694">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#mediaplayer"/>
-</section>
-<paragraph role="paragraph" id="par_idN10577" xml-lang="en-US" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#mediaplayer"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10577" role="paragraph" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
<switch select="sys">
-<case select="UNIX"><paragraph role="note" id="par_idN105EF" xml-lang="en-US" l10n="NEW">On UNIX systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files, and add the path to the installed jmf.jar to the class path in Tools - Options - %PRODUCTNAME - Java.</paragraph>
+<case select="UNIX">
+<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in the Options dialog box in %PRODUCTNAME - Java.</paragraph>
</case>
-<case select="WIN"><paragraph role="note" id="par_idN1064F" xml-lang="en-US" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
+<case select="WIN">
+<paragraph xml-lang="en-US" id="par_idN1064F" role="note" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
</case>
</switch>
-<paragraph role="heading" id="par_idN1057A" xml-lang="en-US" level="2" l10n="NEW">Open</paragraph>
-<paragraph role="paragraph" id="par_idN1057E" xml-lang="en-US" l10n="NEW">Opens a movie file or a sound file that you want to preview.</paragraph>
-<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="CHG">Apply<comment>spec says "Insert"</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10585" xml-lang="en-US" l10n="NEW">Inserts the current movie file or sound file as a media object into the current document. </paragraph>
-<paragraph role="note" id="par_idN10605" xml-lang="en-US" l10n="NEW">Only a link to the media file is inserted into the current document.</paragraph>
-<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Play</paragraph>
-<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW">Plays the current file.</paragraph>
-<paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Pause</paragraph>
-<paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW">Pauses or resumes the playback of the current file.</paragraph>
-<paragraph role="heading" id="par_idN10596" xml-lang="en-US" level="2" l10n="NEW">Stop</paragraph>
-<paragraph role="paragraph" id="par_idN1059A" xml-lang="en-US" l10n="NEW">Stops the playback of the current file.</paragraph>
-<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Repeat</paragraph>
-<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US" l10n="NEW">Plays the file repeatedly.</paragraph>
-<paragraph role="heading" id="par_idN105A4" xml-lang="en-US" level="2" l10n="NEW">Mute</paragraph>
-<paragraph role="paragraph" id="par_idN105A8" xml-lang="en-US" l10n="NEW">Turns sound off and on.</paragraph>
-<paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Volume slider</paragraph>
-<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="NEW">Adjusts the volume.</paragraph>
-<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
-<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
-<paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2" l10n="NEW">Position slider</paragraph>
-<paragraph role="paragraph" id="par_idN105BD" xml-lang="en-US" l10n="NEW">Moves to a different position in the file.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/moviesound.xhp#moviesoundtitle"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN1057A" role="heading" level="2" l10n="NEW">Open</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1057E" role="paragraph" l10n="NEW">Opens a movie file or a sound file that you want to preview.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="CHG">Apply</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW">Inserts the current movie file or sound file as a media object into the current document. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10588" role="heading" level="2" l10n="NEW">Play</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph" l10n="NEW">Plays the current file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1058F" role="heading" level="2" l10n="NEW">Pause</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10593" role="paragraph" l10n="NEW">Pauses or resumes the playback of the current file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Stop</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1059A" role="paragraph" l10n="NEW">Stops the playback of the current file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1059D" role="heading" level="2" l10n="NEW">Repeat</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A1" role="paragraph" l10n="NEW">Plays the file repeatedly.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A4" role="heading" level="2" l10n="NEW">Mute</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A8" role="paragraph" l10n="NEW">Turns sound off and on.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2" l10n="NEW">Volume slider</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph" l10n="NEW">Adjusts the volume.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105B2" role="heading" level="2" l10n="CHG">View</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105B6" role="paragraph" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105B9" role="heading" level="2" l10n="NEW">Position slider</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105BD" role="paragraph" l10n="NEW">Moves to a different position in the file.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/01/moviesound.xhp#moviesoundtitle"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/moviesound.xhp b/helpcontent2/source/text/shared/01/moviesound.xhp
index 1f54227221..7561af1032 100755
--- a/helpcontent2/source/text/shared/01/moviesound.xhp
+++ b/helpcontent2/source/text/shared/01/moviesound.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: moviesound.xhp,v $
- * $Revision: 1.15 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,72 +29,65 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01moviesoundxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Movie and Sound</title>
-<filename>/text/shared/01/moviesound.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="moviesound">
+ <topic id="textshared01moviesoundxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Movie and Sound</title>
+ <filename>/text/shared/01/moviesound.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="moviesound">
<bookmark xml-lang="en-US" branch="index" id="bm_id1907712"><bookmark_value>inserting;movies/sounds</bookmark_value>
-<bookmark_value>sounds;inserting and playing</bookmark_value>
-<bookmark_value>playing movies and sound files</bookmark_value>
-<bookmark_value>videos</bookmark_value>
-<bookmark_value>audio; inserting</bookmark_value>
-<bookmark_value>music;inserting</bookmark_value>
-</bookmark><comment>UFI: added "music;inserting"</comment>
+ <bookmark_value>sound files</bookmark_value>
+ <bookmark_value>playing movies and sound files</bookmark_value>
+ <bookmark_value>videos</bookmark_value>
+ <bookmark_value>movies</bookmark_value>
+ <bookmark_value>audio</bookmark_value>
+ <bookmark_value>music</bookmark_value>
+</bookmark><comment>UFI: added "music;inserting"</comment><comment>MW made "sounds;", "audio;", "music;" one level entries and added "movies"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_AVMEDIA" id="bm_id6085699" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertAVMedia" id="bm_id6890774" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="1" l10n="NEW"><variable id="moviesoundtitle"><link href="text/shared/01/moviesound.xhp">Movie and Sound</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertAVMedia" id="bm_id6890774" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1065C" role="heading" level="1" l10n="NEW"><variable id="moviesoundtitle"><link href="text/shared/01/moviesound.xhp">Movie and Sound</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1066C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts a video or sound file into your document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000404.xhp#moviesound"/>
-</section>
-<paragraph role="heading" id="par_idN10683" xml-lang="en-US" level="2" l10n="NEW">To insert a movie or sound file into your document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1068A" xml-lang="en-US" l10n="NEW">Click where you want to insert the file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1068E" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Movie and Sound</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10696" xml-lang="en-US" l10n="NEW">In the File Open dialog, select the file that you want to insert.</paragraph>
-<paragraph role="note" id="par_idN10699" xml-lang="en-US" l10n="NEW">The file types that are listed in this dialog are not supported by all operating systems.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106D7" xml-lang="en-US" l10n="NEW">Click <emph>Open</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1069C" xml-lang="en-US" level="2" l10n="NEW">To play a movie or sound file in an Impress presentation</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US" l10n="NEW">Open the slide that contains the movie or sound file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106A7" xml-lang="en-US" l10n="NEW">Click the object icon for the movie or sound file on the slide.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10788" xml-lang="en-US" l10n="NEW">Click <emph>Play</emph> on the <emph>Media Playback</emph> toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN106BF" xml-lang="en-US" level="2" l10n="NEW">To play a movie or sound file in a Writer, Calc, or Draw document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106C6" xml-lang="en-US" l10n="NEW">Open the document that contains the movie or sound file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106CD" xml-lang="en-US" l10n="CHG">Click Play on the Media Playback toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_idN106D0" xml-lang="en-US" l10n="CHG">You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/01/mediaplayer.xhp#mediaplayertitle"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a video or sound file into your document.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000404.xhp#moviesound"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10683" role="heading" level="2" l10n="NEW">To insert a movie or sound file into your document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1068A" role="paragraph" l10n="NEW">Click where you want to insert the file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1068E" role="paragraph" l10n="NEW">Choose <emph>Insert - Movie and Sound</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10696" role="paragraph" l10n="NEW">In the File Open dialog, select the file that you want to insert.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10699" role="note" l10n="NEW">The file types that are listed in this dialog are not supported by all operating systems.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D7" role="paragraph" l10n="NEW">Click <emph>Open</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id0120200912190948" role="paragraph" l10n="NEW">Alternatively, you can choose <item type="menuitem">Tools - Media Player</item> to open the Media Player. Use the Media Player to preview all supported media files. Click the Apply button in the Media Player window to insert the current media file into your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1069C" role="heading" level="2" l10n="NEW">To play a movie or sound file</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A7" role="paragraph" l10n="NEW">Click the object icon for the movie or sound file in your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200912190940" role="paragraph" l10n="NEW">If the icon is arranged on the background, hold down Ctrl while you click.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200912062096" role="paragraph" l10n="NEW">The Media Playback toolbar is shown.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10788" role="paragraph" l10n="NEW">Click <emph>Play</emph> on the <emph>Media Playback</emph> toolbar.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id0120200912062064" role="note" l10n="NEW">When you show an Impress presentation, the embedded sound or video on the current slide plays automatically until it's over or until you leave the slide.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106D0" role="paragraph" l10n="CHG">You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/01/mediaplayer.xhp#mediaplayertitle"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/online_update.xhp b/helpcontent2/source/text/shared/01/online_update.xhp
index f0c527c6ea..7b5482c123 100644
--- a/helpcontent2/source/text/shared/01/online_update.xhp
+++ b/helpcontent2/source/text/shared/01/online_update.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: online_update.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,56 +31,59 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Check for Updates </title>
-<filename>/text/shared/01/online_update.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Check for Updates </title>
+ <filename>/text/shared/01/online_update.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id7647328"><bookmark_value>updates;checking manually</bookmark_value>
-<bookmark_value>online updates;checking manually</bookmark_value>
+ <bookmark_value>online updates;checking manually</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id315256" xml-lang="en-US" level="1" l10n="CHG"><variable id="online_update"><link href="text/shared/01/online_update.xhp">Check for Updates</link>
-</variable></paragraph><comment>UFI: changed name of page, see i76016</comment>
-<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK" id="bm_id6052125" localize="false"/><paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
-<paragraph role="note" id="par_id4218878" xml-lang="en-US" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
-<paragraph role="paragraph" id="par_id8132267" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
-<paragraph role="paragraph" id="par_id702230" xml-lang="en-US" l10n="NEW">You can disable or enable the automatic check in Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3422345" xml-lang="en-US" l10n="NEW">If an update is available, an icon
-<image id="img_id3155415" src="extensions/source/update/ui/onlineupdate_16.png" width="0.4598inch" height="0.1402inch"><alt id="alt_id3155415" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id315256" role="heading" level="1" l10n="CHG"><variable id="online_update"><link href="text/shared/01/online_update.xhp">Check for Updates</link>
+</variable></paragraph><comment>UFI: changed name of page, see i76016</comment><comment>Next time start download automatically</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD" id="bm_id1509140" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3174230" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose %PRODUCTNAME - Online Update in the Options dialog box to disable or enable this feature.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH" id="bm_id0116200901051320" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0116200901063996" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to select a folder to download the files.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop:CheckBox:TP_UPDATE_CHECK:CB_UPDATE_CHECK" id="bm_id6052125" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id4218878" role="note" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8132267" role="paragraph" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3422345" role="paragraph" l10n="NEW">If an update is available, an icon
+<image id="img_id3155415" src="extensions/source/update/ui/onlineupdate_16.png" width="0.4583in" height="0.1354in"><alt xml-lang="en-US" id="alt_id3155415">Icon</alt>
</image> on the menu bar will notify you of the update. Click the icon to open a dialog with more information.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9313638" xml-lang="en-US" l10n="CHG">You will see the <link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link> dialog with some information about the online update of %PRODUCTNAME.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id9951780" xml-lang="en-US" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
-<paragraph role="paragraph" id="par_id6479384" xml-lang="en-US" l10n="CHG">If you need a proxy server, enter the proxy settings in Tools - Options - Internet - Proxy.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3639027" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3722342" xml-lang="en-US" l10n="NEW">If a newer version is available and %PRODUCTNAME is not set up for automatic downloading, then you can select any of the following actions:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5106662" xml-lang="en-US" l10n="CHG">Download the new version.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4931485" xml-lang="en-US" l10n="CHG">Install the downloaded files.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9168980" xml-lang="en-US" l10n="NEW">Abort this check for updates for now.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id9766533" xml-lang="en-US" l10n="NEW">If %PRODUCTNAME is configured to download the files automatically, the download starts immediately. A download continues even when you minimize the dialog.</paragraph>
-<paragraph role="paragraph" id="par_id927152" xml-lang="en-US" l10n="NEW">For StarOffice, automatic downloads are currently disabled. Start the download manually.</paragraph>
-<paragraph role="paragraph" id="par_id6081728" xml-lang="en-US" l10n="NEW">If no update was found, you can close the dialog.</paragraph>
-<paragraph role="warning" id="par_id9219641" xml-lang="en-US" l10n="NEW">You need Administrator rights to update %PRODUCTNAME.</paragraph><comment>Next time start download automatically</comment>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD" id="bm_id1509140" localize="false"/><paragraph role="paragraph" id="par_id3174230" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose Tools - Options - %PRODUCTNAME - Online Update to disable or enable this feature.</ahelp></paragraph>
-</body>
-</helpdocument>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id9313638" role="paragraph" l10n="CHG">You will see the <link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link> dialog with some information about the online update of %PRODUCTNAME.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9951780" role="paragraph" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6479384" role="paragraph" l10n="CHG">If you need a proxy server, enter the proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3639027" role="paragraph" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3722342" role="paragraph" l10n="NEW">If a newer version is available and %PRODUCTNAME is not set up for automatic downloading, then you can select any of the following actions:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5106662" role="paragraph" l10n="CHG">Download the new version.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4931485" role="paragraph" l10n="CHG">Install the downloaded files.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9168980" role="paragraph" l10n="NEW">Abort this check for updates for now.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id9766533" role="paragraph" l10n="NEW">If %PRODUCTNAME is configured to download the files automatically, the download starts immediately. A download continues even when you minimize the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id927152" role="paragraph" l10n="NEW">If automatic downloads are disabled, start the download manually.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6081728" role="paragraph" l10n="NEW">If no update was found, you can close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9219641" role="warning" l10n="NEW">You need Administrator rights to update %PRODUCTNAME.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/online_update_dialog.xhp b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
index e0a8bb8e59..dcdae77cd2 100644
--- a/helpcontent2/source/text/shared/01/online_update_dialog.xhp
+++ b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: online_update_dialog.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,12 +43,12 @@
<bookmark xml-lang="en-US" branch="hid/HID_DLG_CHECKFORONLINEUPDATE" id="bm_id2912686" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DLG" id="bm_id9766533" localize="false"/><paragraph role="heading" id="hd_id4959257" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link></paragraph><comment>UFI: this is the dialog</comment><paragraph role="paragraph" id="par_id1906491" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Checks for available updates to your version of %PRODUCTNAME. If a newer version is available, you can choose to download the update. After downloading, if you have write permissions for the installation directory, you can install the update.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id4799340" xml-lang="en-US" l10n="NEW">Once the download starts, you see a progress bar and three buttons on the dialog. You can pause and resume the download by clicking the Pause and Resume buttons. Click Cancel to abort the download and delete the partly downloaded file.</paragraph>
-<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in Tools - Options - %PRODUCTNAME - Online Update.</paragraph>
+<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Online Update.</paragraph>
<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">After the download is complete, you can click Install to start the installation of the update. You see a confirmation dialog, where you can choose to close %PRODUCTNAME.</paragraph>
<paragraph role="note" id="par_id2871181" xml-lang="en-US" l10n="NEW">Under some operation systems, it may be required to manually go to the download folder, unzip the download file, and start the setup script.</paragraph>
<paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">After installation of the update you can delete the download file to save space.</paragraph><comment>Download</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD2" id="bm_id2517777" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in Tools - Options - %PRODUCTNAME - Online Update.</ahelp></paragraph><comment>Install</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in %PRODUCTNAME - Online Update in the Options dialog box.</ahelp></paragraph><comment>Install</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_INSTALL" id="bm_id1738639" localize="false"/><paragraph role="paragraph" id="par_id8277230" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Installs the downloaded update.</ahelp></paragraph><comment>Pause</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_PAUSE" id="bm_id6081728" localize="false"/><paragraph role="paragraph" id="par_id4086428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Pauses the download. Later click Resume to continue downloading.</ahelp></paragraph><comment>Resume</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_RESUME" id="bm_id9219641" localize="false"/><paragraph role="paragraph" id="par_id9024628" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Continues a paused download.</ahelp></paragraph><comment>Cancel</comment>
diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp
index 2b68f5a091..1c98c3606a 100755
--- a/helpcontent2/source/text/shared/01/packagemanager.xhp
+++ b/helpcontent2/source/text/shared/01/packagemanager.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: packagemanager.xhp,v $
- * $Revision: 1.18.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -117,32 +114,32 @@
</list>
<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"/>
-<bookmark xml-lang="en-US" branch="hid/2180354572" id="bm_id0523200810583698" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD -->
+<!-- removed HID 2180354572 -->
<paragraph role="heading" id="par_idN10639" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
<paragraph role="paragraph" id="par_idN106BA" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256276">Click Add to add an extension.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106BD" xml-lang="en-US" l10n="CHG">A file dialog opens where you can select the extension that you want to add. To copy and to register the selected extension, click Open.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_MultiLineEdit_RID_DLG_LICENSE_ML_LICENSE" id="bm_id2089297" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_LICENSE_PB_LICENSE_DOWN" id="bm_id3366801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE" id="bm_id2089297" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN" id="bm_id3366801" localize="false"/>
<paragraph role="paragraph" id="par_id4856410" xml-lang="en-US" l10n="NEW">An extension can show a license dialog. <ahelp hid=".">Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE" id="bm_id888393" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/42795" id="bm_id0523200810562584" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE -->
+<bookmark xml-lang="en-US" branch="hid/HID_EXTENSION_MANAGER_LISTBOX_REMOVE" id="bm_id0523200810562584" localize="false"/>
<paragraph role="heading" id="par_idN10643" xml-lang="en-US" level="2" l10n="NEW">Remove</paragraph>
<paragraph role="paragraph" id="par_idN106D1" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256277">Select the extension that you want to remove, and then click Remove.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/42794" id="bm_id0523200810570553" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_EXTENSION_MANAGER_LISTBOX_DISABLE" id="bm_id0523200810570553" localize="false"/>
<paragraph role="paragraph" id="par_id0523200810573866" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enable or disable the extension.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE" id="bm_id6375926" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE -->
<paragraph role="heading" id="par_idN1064D" xml-lang="en-US" level="2" l10n="NEW">Enable</paragraph>
<paragraph role="paragraph" id="par_idN106DE" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256278">Select the extension that you want to enable, and then click Enable.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_DISABLE" id="bm_id755943" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_DISABLE -->
<paragraph role="heading" id="par_idN10657" xml-lang="en-US" level="2" l10n="NEW">Disable</paragraph>
<paragraph role="paragraph" id="par_idN106EB" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256279">Select the extension that you want to disable, and then click Disable.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_CHECK_UPDATES" id="bm_id412915" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/2180354573" id="bm_id0523200810585545" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_CHECK_UPDATES -->
+<!-- removed HID 2180354573 -->
<paragraph role="heading" id="hd_id4453566" xml-lang="en-US" level="2" l10n="NEW">Update</paragraph>
<paragraph role="paragraph" id="par_id4129459" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to check for online updates of all installed extensions. To check for updates of the selected extension only, choose the Update command from the context menu. The check for availability of updates starts immediately.</ahelp> You will see the <link href="text/shared/01/extensionupdate.xhp">Extension Update</link> dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_OPTIONS" id="bm_id6909085" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/42792" id="bm_id052320081054360" localize="false"/>
+<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_OPTIONS -->
+<bookmark xml-lang="en-US" branch="hid/HID_EXTENSION_MANAGER_LISTBOX_OPTIONS" 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>
</body>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index 2c7522e04f..37cade2acb 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: password_dlg.xhp,v $
- * $Revision: 1.4.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,28 +29,36 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared01password_dlgxml" indexer="include">
-<title id="tit" xml-lang="en-US">Password</title>
-<filename>/text/shared/01/password_dlg.xhp</filename>
-</topic>
-</meta>
-<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"/>
+ <topic id="textshared01password_dlgxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Password</title>
+ <filename>/text/shared/01/password_dlg.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="passwort">
+ <paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="1" l10n="U"
+ oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154350" role="paragraph" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
+ <embed href="text/shared/01/password_main.xhp#password_rules"/>
+<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/uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD" id="bm_id3154099" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_CRT" id="bm_id0928200904183274" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="2" l10n="U"
+ oldref="65">Password</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. 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>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
+ oldref="66">Confirm</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="67"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155351" role="heading" level="2" l10n="U"
+ oldref="68">Undoing password protection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146109" role="paragraph" l10n="CHG" oldref="69">To remove a password, open the document, then save without password.</paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/password_main.xhp b/helpcontent2/source/text/shared/01/password_main.xhp
index 877d79bab2..65e535d0a4 100755
--- a/helpcontent2/source/text/shared/01/password_main.xhp
+++ b/helpcontent2/source/text/shared/01/password_main.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: password_main.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,37 +29,50 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01password_mainxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Enter Master Password</title>
-<filename>/text/shared/01/password_main.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-21T14:06:53">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="password_main">
-<paragraph role="heading" id="hd_id3154183" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="password_maintitle"><link href="text/shared/01/password_main.xhp" name="Enter Master Password">Enter Master Password</link>
+ <topic id="textshared01password_mainxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Enter Master Password</title>
+ <filename>/text/shared/01/password_main.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="password_main">
+ <paragraph xml-lang="en-US" id="hd_id3154183" role="heading" level="1" l10n="U" oldref="1"><variable id="password_maintitle"><link href="text/shared/01/password_main.xhp" name="Enter Master Password">Enter Master Password</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154841" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="">Assign a master password to protect the access to a saved password.</ahelp></paragraph>
-<section id="password_text">
-<paragraph role="paragraph" id="par_id3146857" xml-lang="en-US" l10n="CHG" oldref="3">You can save some passwords for the duration of a session, or permanently to a file protected by a master password.<comment> For example, passwords for accessing WebDAV or FTP servers are stored permanently if you enter a master password when prompted. Otherwise, they are only stored for the current session.</comment><comment>removed text see i71792</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="6">You must enter the master password to access a file or service that is protected by a saved password. You only need to enter the master password once during a session.</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_CRT" id="bm_id3154682" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD" id="bm_id3151100" localize="false"/>
-<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="2" l10n="U" oldref="7">Master password</paragraph>
-<paragraph role="paragraph" id="par_id3148731" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD">Type a master password to prevent unauthorized users from accessing stored passwords.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT" id="bm_id3149549" localize="false"/>
-<paragraph role="heading" id="hd_id3144436" xml-lang="en-US" level="2" l10n="U" oldref="9">Confirm master password</paragraph>
-<paragraph role="paragraph" id="par_id3145129" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT">Re-enter the master password.</ahelp></paragraph>
-</section>
-<section id="relatedtopics">
-<embed href="text/shared/guide/protection.xhp#protection"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3154841" role="paragraph" l10n="U" oldref="2"><ahelp hid="">Assign a master password to protect the access to a saved password.</ahelp></paragraph>
+ <section id="password_text">
+ <paragraph xml-lang="en-US" id="par_id3146857" role="paragraph" l10n="CHG" oldref="3">You can save some passwords for the duration of a session, or permanently to a file protected by a master password.<comment> For example, passwords for accessing WebDAV or FTP servers are stored permanently if you enter a master password when prompted. Otherwise, they are only stored for the current session.</comment><comment>removed text see i71792</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147000" role="paragraph" l10n="U" oldref="6">You must enter the master password to access a file or service that is protected by a saved password. You only need to enter the master password once during a session.</paragraph>
+ </section>
+ <section id="password_rules">
+ <paragraph xml-lang="en-US" id="par_id0608200910545958" role="paragraph" l10n="NEW">You should only use passwords that are hard to find by other persons or programs. A password should follow these rules:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0608200910545989" role="paragraph" l10n="NEW">Length of eight or more characters.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0608200910545951" role="paragraph" l10n="NEW">Contains a mix of lower case and upper case letters, numbers, and special characters.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0608200910545923" role="paragraph" l10n="NEW">Cannot be found in any wordbook or encyclopedia.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0608200910550049" role="paragraph" l10n="NEW">Has no direct relation to your personal data, e.g., date of birth or car plate.</paragraph>
+ </listitem>
+ </list>
+ </section>
+<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_CRT -->
+<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD -->
+<paragraph xml-lang="en-US" id="hd_id3147588" role="heading" level="2" l10n="U" oldref="7">Master password</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148731" role="paragraph" l10n="U" oldref="8"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD">Type a master password to prevent unauthorized users from accessing stored passwords.</ahelp></paragraph>
+<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT -->
+<paragraph xml-lang="en-US" id="hd_id3144436" role="heading" level="2" l10n="U" oldref="9">Confirm master password</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145129" role="paragraph" l10n="U" oldref="10"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT">Re-enter the master password.</ahelp></paragraph>
+ </section>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/protection.xhp#protection"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 31dcfcb86a..7c3eb19442 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: ref_pdf_export.xhp,v $
- * $Revision: 1.23.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,257 +29,262 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared01ref_pdf_exportxml" indexer="include">
-<title id="tit" xml-lang="en-US">Export as PDF</title>
-<filename>/text/shared/01/ref_pdf_export.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="pdf_export">
+ <topic id="textshared01ref_pdf_exportxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Export as PDF</title>
+ <filename>/text/shared/01/ref_pdf_export.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="pdf_export">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149532"><bookmark_value>PDF;export</bookmark_value>
-<bookmark_value>portable document format</bookmark_value>
-<bookmark_value>exporting;to PDF</bookmark_value>
+ <bookmark_value>portable document format</bookmark_value>
+ <bookmark_value>exporting;to PDF</bookmark_value>
</bookmark><comment>MW made "PDF export a two level entry"</comment><comment>UFI: write guide and move bookmarks there</comment>
<bookmark xml-lang="en-US" branch="hid/SID_EXPORTDOCASPDF" id="bm_id2491692" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExportToPDF" id="bm_id3146856" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES" id="bm_id3150758" localize="false"/>
-<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>
+<!-- removed HID FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES -->
+<paragraph xml-lang="en-US" id="hd_id3149532" role="heading" 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="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.
+ <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" 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 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"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL" id="bm_id1033967" localize="false"/>
-<paragraph role="heading" id="hd_id3166445" xml-lang="en-US" level="3" l10n="U" oldref="4">All</paragraph>
-<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_ALL">Exports all defined print ranges. If no print range is defined, exports the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_RANGE" id="bm_id8835718" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_RANGE" id="bm_id2618793" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_Edit_RID_PDF_TAB_GENER_ED_PAGES" id="bm_id2676778" localize="false"/>
-<paragraph role="heading" id="hd_id3154673" xml-lang="en-US" level="3" l10n="U" oldref="6">Range</paragraph>
-<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Exports the pages you type in the box.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="53">To export a range of pages, use the format 3-6. To export single pages, use the format 7;9;11. If you want, you can export a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_SELECTION" id="bm_id480971" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_SELECTION" id="bm_id8889126" localize="false"/>
-<paragraph role="heading" id="hd_id3147043" xml-lang="en-US" level="3" l10n="U" oldref="8">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_SELECTION">Exports the current selection.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10706" xml-lang="en-US" level="3" l10n="NEW">Images</paragraph>
-<paragraph role="paragraph" id="par_idN1070A" xml-lang="en-US" l10n="NEW">Sets the PDF export options for images inside your document.</paragraph>
-<paragraph role="note" id="par_idN1071B" xml-lang="en-US" l10n="NEW">EPS images with embedded previews are exported only as previews. EPS images without embedded previews are exported as empty placeholders.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_LOSSLESSCOMPRESSION" id="bm_id1303750" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_LOSSLESSCOMPRESSION" id="bm_id8095950" localize="false"/>
-<paragraph role="heading" id="par_idN10715" xml-lang="en-US" level="3" l10n="NEW">Lossless compression</paragraph>
-<paragraph role="paragraph" id="par_idN10719" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects a lossless compression of images. All pixels are preserved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_JPEGCOMPRESSION" id="bm_id1926023" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_GENER_RB_JPEGCOMPRESSION" id="bm_id137028" localize="false"/>
-<paragraph role="heading" id="par_idN10730" xml-lang="en-US" level="3" l10n="NEW">JPEG compression</paragraph>
-<paragraph role="paragraph" id="par_idN10734" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Selects a JPEG compression of images. With a high quality level, almost all pixels are preserved. With a low quality level, some pixels get lost and artefacts are introduced, but file sizes are reduced.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_NumericField_RID_PDF_EXPORT_DLG_NF_QUALITY" id="bm_id9557786" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_MetricField_RID_PDF_TAB_GENER_NF_QUALITY" id="bm_id5849787" localize="false"/>
-<paragraph role="heading" id="par_idN1074C" xml-lang="en-US" level="4" l10n="NEW">Quality</paragraph>
-<paragraph role="paragraph" id="par_idN10750" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the quality level for JPEG compression.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_REDUCEIMAGERESOLUTION" id="bm_id9614551" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_REDUCEIMAGERESOLUTION" id="bm_id3947264" localize="false"/>
-<paragraph role="heading" id="par_idN10767" xml-lang="en-US" level="3" l10n="NEW">Reduce image resolution</paragraph>
-<paragraph role="paragraph" id="par_idN1076B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects to resample or down-size the images to a lower number of pixels per inch.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_ComboBox_RID_PDF_EXPORT_DLG_CO_REDUCEIMAGERESOLUTION" id="bm_id9715567" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_ComboBox_RID_PDF_TAB_GENER_CO_REDUCEIMAGERESOLUTION" id="bm_id1751762" localize="false"/>
-<paragraph role="paragraph" id="par_idN10782" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the target resolution for the images.</ahelp></paragraph>
-<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-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>
-<paragraph role="paragraph" id="par_idN107A4" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Selects to write PDF tags. This can increase file size by huge amounts.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN107B3" xml-lang="en-US" l10n="CHG">Tagged PDF contains information about the structure of the document contents. This can help to display the document on devices with different screens, and when using screen reader software.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTNOTES" id="bm_id5767998" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTNOTES" id="bm_id7971129" localize="false"/>
-<paragraph role="heading" id="par_idN107BE" xml-lang="en-US" level="3" l10n="NEW">Export notes</paragraph>
-<paragraph role="paragraph" id="par_idN107C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects to export notes of Writer and Calc documents as PDF notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTBOOKMARKS" id="bm_id8694112" localize="false"/>
-<paragraph role="heading" id="hd_id8257087" xml-lang="en-US" level="3" l10n="NEW">Export bookmarks</paragraph>
-<paragraph role="paragraph" id="par_id3479415" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Selects to export bookmarks of Writer documents as PDF bookmarks. Bookmarks are created for all outline paragraphs (Tools - Outline Numbering) and for all table of contents entries for which you did assign hyperlinks in the source document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTFORMFIELDS" id="bm_id9651478" localize="false"/>
-<paragraph role="heading" id="par_idN107F4" xml-lang="en-US" level="3" l10n="CHG">Create PDF form</paragraph>
-<paragraph role="paragraph" id="par_id4909817" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Choose to create a PDF form. This can be filled out and printed by the user of the PDF document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_ListBox_RID_PDF_EXPORT_DLG_LB_FORMSFORMAT" id="bm_id2612689" localize="false"/>
-<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"/>
-<paragraph role="heading" id="hd_id7071443" xml-lang="en-US" level="4" l10n="NEW">Page only</paragraph>
-<paragraph role="paragraph" id="par_id1851557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows only the page contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_OUTLINE" id="bm_id5274819" localize="false"/>
-<paragraph role="heading" id="hd_id7464217" xml-lang="en-US" level="4" l10n="NEW">Bookmarks and page</paragraph>
-<paragraph role="paragraph" id="par_id4490188" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a bookmarks palette and the page contents.</ahelp><comment>UFI: Adobe reader help names the panes as "palettes"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_THUMBS" id="bm_id9964598" localize="false"/>
-<paragraph role="heading" id="hd_id3581041" xml-lang="en-US" level="4" l10n="NEW">Thumbnails and page</paragraph>
-<paragraph role="paragraph" id="par_id956755" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a thumbnails palette and the page contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/867883100" id="bm_id5693533" localize="false"/>
-<paragraph role="heading" id="hd_id1905575" xml-lang="en-US" level="4" l10n="NEW">Open on page</paragraph>
-<paragraph role="paragraph" id="par_id9776909" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show the given page when the reader opens the PDF file.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id7509994" xml-lang="en-US" level="3" l10n="NEW">Magnification</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_DEFAULT" id="bm_id7652821" localize="false"/>
-<paragraph role="heading" id="hd_id5900143" xml-lang="en-US" level="4" l10n="NEW">Default</paragraph>
-<paragraph role="paragraph" id="par_id822168" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page contents without zooming. If the reader software is configured to use a zoom factor by default, the page shows with that zoom factor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIND" id="bm_id8959929" localize="false"/>
-<paragraph role="heading" id="hd_id1092257" xml-lang="en-US" level="4" l10n="NEW">Fit in window</paragraph>
-<paragraph role="paragraph" id="par_id3092135" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit entirely into the reader's window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIDTH" id="bm_id5164342" localize="false"/>
-<paragraph role="heading" id="hd_id654622" xml-lang="en-US" level="4" l10n="NEW">Fit width</paragraph>
-<paragraph role="paragraph" id="par_id814539" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_VISIBLE" id="bm_id4881435" localize="false"/>
-<paragraph role="heading" id="hd_id9883114" xml-lang="en-US" level="4" l10n="NEW">Fit visible</paragraph>
-<paragraph role="paragraph" id="par_id2362437" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the text and graphics on the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/867877465" id="bm_id3769035" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/867883610" id="bm_id2727134" localize="false"/>
-<paragraph role="heading" id="hd_id7296975" xml-lang="en-US" level="4" l10n="NEW">Zoom factor</paragraph>
-<paragraph role="paragraph" id="par_id371715" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a given zoom factor when the reader opens the PDF file.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id329905" xml-lang="en-US" level="3" l10n="NEW">Page layout</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_DEFAULT" id="bm_id2023682" localize="false"/>
-<paragraph role="heading" id="hd_id5632496" xml-lang="en-US" level="4" l10n="NEW">Default</paragraph>
-<paragraph role="paragraph" id="par_id1694082" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the pages according to the layout setting of the reader software.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_SINGPG" id="bm_id863368" localize="false"/>
-<paragraph role="heading" id="hd_id8454237" xml-lang="en-US" level="4" l10n="NEW">Single page</paragraph>
-<paragraph role="paragraph" id="par_id672322" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows one page at a time.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONT" id="bm_id3083590" localize="false"/>
-<paragraph role="heading" id="hd_id7387310" xml-lang="en-US" level="4" l10n="NEW">Continuous</paragraph>
-<paragraph role="paragraph" id="par_id8764305" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages in a continuous vertical column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONTFAC" id="bm_id5062410" localize="false"/>
-<paragraph role="heading" id="hd_id6223639" xml-lang="en-US" level="4" l10n="NEW">Continuous facing</paragraph>
-<paragraph role="paragraph" id="par_id5318765" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT" id="bm_id9036835" localize="false"/>
-<paragraph role="heading" id="hd_id1416364" xml-lang="en-US" level="4" l10n="NEW">First page is left</paragraph>
-<paragraph role="paragraph" id="par_id9596850" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Tools - Options - Language settings - Languages.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id18005" xml-lang="en-US" level="2" l10n="NEW">User Interface</paragraph>
-<paragraph role="heading" id="hd_id6676839" xml-lang="en-US" level="3" l10n="NEW">Window options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_RESINIT" id="bm_id4184392" localize="false"/>
-<paragraph role="heading" id="hd_id3809015" xml-lang="en-US" level="4" l10n="NEW">Resize window to initial page</paragraph>
-<paragraph role="paragraph" id="par_id1321146" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a full screen reader window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_CNTRWIN" id="bm_id1589098" localize="false"/>
-<paragraph role="heading" id="hd_id6994842" xml-lang="en-US" level="4" l10n="NEW">Center window on screen</paragraph>
-<paragraph role="paragraph" id="par_id9601428" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a reader window centered on screen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_OPNFULL" id="bm_id1278420" localize="false"/>
-<paragraph role="heading" id="hd_id6369212" xml-lang="en-US" level="4" l10n="NEW">Open in full screen mode</paragraph>
-<paragraph role="paragraph" id="par_id1111789" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a full screen reader window in front of all other windows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_DISPDOCTITLE" id="bm_id8746910" localize="false"/>
-<paragraph role="heading" id="hd_id2041993" xml-lang="en-US" level="4" l10n="NEW">Display document title</paragraph>
-<paragraph role="paragraph" id="par_id4576555" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown with the document title in the reader's title bar.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id4632099" xml-lang="en-US" level="3" l10n="NEW">User interface options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVMENUBAR" id="bm_id9636524" localize="false"/>
-<paragraph role="heading" id="hd_id3154087" xml-lang="en-US" level="4" l10n="NEW">Hide menu bar</paragraph>
-<paragraph role="paragraph" id="par_id6582537" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to hide the reader's menu bar when the document is active.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVTOOLBAR" id="bm_id5675527" localize="false"/>
-<paragraph role="heading" id="hd_id729697" xml-lang="en-US" level="4" l10n="NEW">Hide toolbar</paragraph>
-<paragraph role="paragraph" id="par_id769066" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to hide the reader's toolbar when the document is active.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVWINCTRL" id="bm_id3486434" localize="false"/>
-<paragraph role="heading" id="hd_id376293" xml-lang="en-US" level="4" l10n="NEW">Hide window controls</paragraph>
-<paragraph role="paragraph" id="par_id43641" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to hide the reader's controls when the document is active.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id1886654" xml-lang="en-US" level="3" l10n="NEW">Transitions</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TRANSITIONEFFECTS" id="bm_id7838373" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_TRANSITIONEFFECTS" id="bm_id4296395" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_TRANSITIONEFFECTS" id="bm_id3901791" localize="false"/>
-<paragraph role="heading" id="par_idN107D9" xml-lang="en-US" level="4" l10n="NEW">Use transition effects</paragraph>
-<paragraph role="paragraph" id="par_idN107DD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects to export Impress slide transition effects to respective PDF effects.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9053926" xml-lang="en-US" level="3" l10n="NEW">Bookmarks</paragraph>
-<bookmark xml-lang="en-US" branch="hid/867861104" id="bm_id4371776" localize="false"/>
-<paragraph role="heading" id="hd_id1941892" xml-lang="en-US" level="4" l10n="NEW">All bookmark levels</paragraph>
-<paragraph role="paragraph" id="par_id341807" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show all bookmark levels when the reader opens the PDF file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/867861105" id="bm_id6384166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/867866738" id="bm_id1559801" localize="false"/>
-<paragraph role="heading" id="hd_id486770" xml-lang="en-US" level="4" l10n="NEW">Visible bookmark levels</paragraph>
-<paragraph role="paragraph" id="par_id4850001" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to show bookmark levels down to the selected level when the reader opens the PDF file.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9464094" xml-lang="en-US" level="2" l10n="NEW">Links</paragraph>
-<paragraph role="paragraph" id="par_id9302346" xml-lang="en-US" l10n="NEW">Specify how to export bookmarks and hyperlinks in your document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_LINKS_CB_EXP_BMRK_TO_DEST" id="bm_id5594042" localize="false"/>
-<paragraph role="heading" id="hd_id8296151" xml-lang="en-US" level="3" l10n="NEW">Export bookmarks as named destinations</paragraph>
-<paragraph role="paragraph" id="par_id4809411" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The bookmarks (targets of references) in PDF files can be defined as rectangular areas. Additionally, bookmarks to named objects can be defined by their names. Enable the checkbox to export the names of objects in your document as valid bookmark targets. This allows to link to those objects by name from other documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_LINKS_CB_CNV_OOO_DOCTOPDF" id="bm_id6163823" localize="false"/>
-<paragraph role="heading" id="hd_id6454969" xml-lang="en-US" level="3" l10n="NEW">Convert document references to PDF targets</paragraph>
-<paragraph role="paragraph" id="par_id7928708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this checkbox to convert the URLs referencing other ODF files to PDF files with the same name. In the referencing URLs the extensions .odt, .odp, .ods, .odg, and .odm are converted to the extension .pdf.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_LINKS_CB_ENAB_RELLINKFSYS" id="bm_id9741508" localize="false"/>
-<paragraph role="heading" id="hd_id3864253" xml-lang="en-US" level="3" l10n="NEW">Export URLs relative to file system</paragraph>
-<paragraph role="paragraph" id="par_id3144016" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this checkbox to export URLs to other documents as relative URLs in the file system. See <link href="text/shared/guide/hyperlink_rel_abs.xhp">"relative hyperlinks"</link> in the Help.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id9937131" xml-lang="en-US" level="3" l10n="NEW">Cross-document links</paragraph>
-<paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">Specify how to handle hyperlinks from your PDF file to other files.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_LINKS_CB_VIEW_PDF_DEFAULT" id="bm_id909451" localize="false"/>
-<paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Default mode</paragraph>
-<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Links from your PDF document to other documents will be handled as it is specified in your operating system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_LINKS_CB_VIEW_PDF_APPLICATION" id="bm_id1665089" localize="false"/>
-<paragraph role="heading" id="hd_id4076357" xml-lang="en-US" level="3" l10n="NEW">Open with PDF reader application</paragraph>
-<paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the PDF reader application that currently shows the document. The PDF reader application must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_LINKS_CB_VIEW_PDF_BROWSER" id="bm_id4997100" localize="false"/>
-<paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Open with Internet browser</paragraph>
-<paragraph role="paragraph" id="par_id1909848" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3068636" xml-lang="en-US" level="2" l10n="NEW">Security</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT" id="bm_id3811456" localize="false"/>
-<paragraph role="heading" id="hd_id2480849" xml-lang="en-US" level="3" l10n="NEW">Encrypt the PDF document</paragraph>
-<paragraph role="paragraph" id="par_id4181951" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to encrypt the PDF document with a password. The PDF file can be opened only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD" id="bm_id8720358" localize="false"/>
-<paragraph role="heading" id="hd_id2927335" xml-lang="en-US" level="4" l10n="NEW">Set open password</paragraph>
-<paragraph role="paragraph" id="par_id2107303" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS" id="bm_id824610" localize="false"/>
-<paragraph role="heading" id="hd_id4071779" xml-lang="en-US" level="3" l10n="NEW">Restrict permission</paragraph>
-<paragraph role="paragraph" id="par_id7844477" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to restrict some permissions. The permissions can be changed only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD" id="bm_id8016602" localize="false"/>
-<paragraph role="heading" id="hd_id6478469" xml-lang="en-US" level="4" l10n="NEW">Set permission password</paragraph>
-<paragraph role="paragraph" id="par_id9038972" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id7985168" xml-lang="en-US" level="4" l10n="NEW">Printing</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE" id="bm_id1476485" localize="false"/>
-<paragraph role="heading" id="hd_id876186" xml-lang="en-US" level="4" l10n="NEW">Not permitted</paragraph>
-<paragraph role="paragraph" id="par_id3939634" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Printing the document is not permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES" id="bm_id1693472" localize="false"/>
-<paragraph role="heading" id="hd_id599688" xml-lang="en-US" level="4" l10n="NEW">Low resolution (150 dpi)</paragraph>
-<paragraph role="paragraph" id="par_id1371501" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The document can only be printed in low resolution (150 dpi). Not all PDF readers honor this setting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES" id="bm_id8849147" localize="false"/>
-<paragraph role="heading" id="hd_id4661702" xml-lang="en-US" level="4" l10n="NEW">High resolution</paragraph>
-<paragraph role="paragraph" id="par_id7868892" xml-lang="en-US" l10n="CHG"><ahelp hid=".">The document can be printed in high resolution.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id2188787" xml-lang="en-US" level="4" l10n="NEW">Changes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE" id="bm_id8967253" localize="false"/>
-<paragraph role="heading" id="hd_id5833307" xml-lang="en-US" level="4" l10n="NEW">Not permitted</paragraph>
-<paragraph role="paragraph" id="par_id7726676" xml-lang="en-US" l10n="NEW"><ahelp hid=".">No changes of the content are permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_INSDEL" id="bm_id53712" localize="false"/>
-<paragraph role="heading" id="hd_id3729361" xml-lang="en-US" level="4" l10n="NEW">Inserting, deleting, and rotating pages</paragraph>
-<paragraph role="paragraph" id="par_id9573961" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only inserting, deleting, and rotating pages is permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_FILLFORM" id="bm_id8904385" localize="false"/>
-<paragraph role="heading" id="hd_id7700430" xml-lang="en-US" level="4" l10n="NEW">Filling in form fields</paragraph>
-<paragraph role="paragraph" id="par_id1180455" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only filling in form fields is permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_COMMENT" id="bm_id677205" localize="false"/>
-<paragraph role="heading" id="hd_id3405560" xml-lang="en-US" level="4" l10n="NEW">Commenting, filling in form fields</paragraph>
-<paragraph role="paragraph" id="par_id3409527" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only commenting and filling in form fields is permitted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_ANY_NOCOPY" id="bm_id4991607" localize="false"/>
-<paragraph role="heading" id="hd_id7112338" xml-lang="en-US" level="4" l10n="NEW">Any except extracting pages</paragraph>
-<paragraph role="paragraph" id="par_id2855616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">All changes are permitted, except extracting pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY" id="bm_id7106845" localize="false"/>
-<paragraph role="heading" id="hd_id2091433" xml-lang="en-US" level="4" l10n="NEW">Enable copying of content</paragraph>
-<paragraph role="paragraph" id="par_id5092318" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable copying of content to the clipboard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS" id="bm_id3429059" localize="false"/>
-<paragraph role="heading" id="hd_id9312417" xml-lang="en-US" level="4" l10n="NEW">Enable text access for accessibility tools</paragraph>
-<paragraph role="paragraph" id="par_id9089022" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable text access for accessibility tools.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150507" xml-lang="en-US" level="2" l10n="U" oldref="50">Export</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid=".">Exports the current file in PDF format.</ahelp></paragraph>
-</body>
-</helpdocument>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000401.xhp#exportpdf"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id746482" role="heading" 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 xml-lang="en-US" id="hd_id3148520" role="heading" level="2" l10n="CHG"
+ oldref="2">Pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL" id="bm_id1033967" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3166445" role="heading" level="2" l10n="U" oldref="4">All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149893" role="paragraph" l10n="U" oldref="5"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_ALL">Exports all defined print ranges. If no print range is defined, exports the entire document.</ahelp></paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_RANGE -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE" id="bm_id2618793" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/filter:Edit:RID_PDF_TAB_GENER:ED_PAGES" id="bm_id2676778" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="U" oldref="6">Range</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147571" role="paragraph" l10n="U" oldref="7"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Exports the pages you type in the box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="53">To export a range of pages, use the format 3-6. To export single pages, use the format 7;9;11. If you want, you can export a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_SELECTION -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_SELECTION" id="bm_id8889126" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147043" role="heading" level="2" l10n="U" oldref="8">Selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="9"><ahelp hid="FILTER_RADIOBUTTON_RID_PDF_EXPORT_DLG_RB_SELECTION">Exports the current selection.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10706" role="heading" level="2" l10n="NEW">Images</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">Sets the PDF export options for images inside your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1071B" role="note" l10n="NEW">EPS images with embedded previews are exported only as previews. EPS images without embedded previews are exported as empty placeholders.</paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_LOSSLESSCOMPRESSION -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_LOSSLESSCOMPRESSION" id="bm_id8095950" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10715" role="heading" level="2" l10n="NEW">Lossless compression</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10719" role="paragraph" l10n="NEW"><ahelp hid=".">Selects a lossless compression of images. All pixels are preserved.</ahelp></paragraph>
+<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_JPEGCOMPRESSION -->
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_JPEGCOMPRESSION" id="bm_id137028" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10730" role="heading" level="2" l10n="NEW">JPEG compression</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10734" role="paragraph" l10n="CHG"><ahelp hid=".">Selects a JPEG compression of images. With a high quality level, almost all pixels are preserved. With a low quality level, some pixels get lost and artefacts are introduced, but file sizes are reduced.</ahelp></paragraph>
+<!-- removed HID filter_NumericField_RID_PDF_EXPORT_DLG_NF_QUALITY -->
+<bookmark xml-lang="en-US" branch="hid/filter:MetricField:RID_PDF_TAB_GENER:NF_QUALITY" id="bm_id5849787" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1074C" role="heading" level="2" l10n="NEW">Quality</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10750" role="paragraph" l10n="CHG"><ahelp hid=".">Enter the quality level for JPEG compression.</ahelp></paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_REDUCEIMAGERESOLUTION -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_REDUCEIMAGERESOLUTION" id="bm_id3947264" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10767" role="heading" level="2" l10n="NEW">Reduce image resolution</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1076B" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to resample or down-size the images to a lower number of pixels per inch.</ahelp></paragraph>
+<!-- removed HID filter_ComboBox_RID_PDF_EXPORT_DLG_CO_REDUCEIMAGERESOLUTION -->
+<bookmark xml-lang="en-US" branch="hid/filter:ComboBox:RID_PDF_TAB_GENER:CO_REDUCEIMAGERESOLUTION" id="bm_id1751762" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10782" role="paragraph" l10n="NEW"><ahelp hid=".">Select the target resolution for the images.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10791" role="heading" level="2" l10n="NEW">General</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" 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 xml-lang="en-US" id="hd_id2796411" role="heading" level="2" l10n="NEW">PDF/A-1a</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5016327" role="paragraph" 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>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TAGGEDPDF -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF" id="bm_id6884975" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107A0" role="heading" level="2" l10n="NEW">Tagged PDF</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107A4" role="paragraph" l10n="CHG"><ahelp hid=".">Selects to write PDF tags. This can increase file size by huge amounts.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107B3" role="paragraph" l10n="CHG">Tagged PDF contains information about the structure of the document contents. This can help to display the document on devices with different screens, and when using screen reader software.</paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTNOTES -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES" id="bm_id7971129" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107BE" role="heading" level="2" l10n="NEW">Export notes</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107C2" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to export comments of Writer and Calc documents as PDF notes.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS" id="bm_id8694112" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8257087" role="heading" level="2" l10n="NEW">Export bookmarks</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3479415" role="paragraph" l10n="CHG"><ahelp hid=".">Selects to export bookmarks of Writer documents as PDF bookmarks. Bookmarks are created for all outline paragraphs (Tools - Outline Numbering) and for all table of contents entries for which you did assign hyperlinks in the source document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTFORMFIELDS" id="bm_id9651478" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107F4" role="heading" level="2" l10n="CHG">Create PDF form</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4909817" role="paragraph" l10n="CHG"><ahelp hid=".">Choose to create a PDF form. This can be filled out and printed by the user of the PDF document.</ahelp></paragraph>
+<!-- removed HID filter_ListBox_RID_PDF_EXPORT_DLG_LB_FORMSFORMAT -->
+<bookmark xml-lang="en-US" branch="hid/filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT" id="bm_id3088167" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6585283" role="heading" level="2" l10n="NEW">Submit format</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0901200811454970" role="paragraph" 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 xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph><comment>insert help id here</comment>
+<paragraph xml-lang="en-US" id="hd_id1026200909535841" role="heading" level="2" l10n="NEW">Allow duplicate field names</paragraph>
+ <paragraph xml-lang="en-US" id="par_id102620090953596" role="paragraph" l10n="NEW"><ahelp hid=".">Allows to use the same field name for multiple fields in the generated PDF file. If disabled, field names will be exported using generated unique names.</ahelp></paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3946958" role="heading" level="2" l10n="NEW">Export automatically inserted blank pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8551896" role="paragraph" 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 xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">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 xml-lang="en-US" id="hd_id9796441" role="heading" level="2" l10n="NEW">Initial View</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id1218604" role="heading" level="2" 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"/>
+<paragraph xml-lang="en-US" id="hd_id7071443" role="heading" level="2" l10n="NEW">Page only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1851557" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows only the page contents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE" id="bm_id5274819" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7464217" role="heading" level="2" l10n="NEW">Bookmarks and page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4490188" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a bookmarks palette and the page contents.</ahelp><comment>UFI: Adobe reader help names the panes as "palettes"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_THUMBS" id="bm_id9964598" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3581041" role="heading" level="2" l10n="NEW">Thumbnails and page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id956755" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows a thumbnails palette and the page contents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_NUMERICFIELD_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE" id="bm_id5693533" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1905575" role="heading" level="2" l10n="NEW">Open on page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9776909" role="paragraph" l10n="NEW"><ahelp hid=".">Select to show the given page when the reader opens the PDF file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id7509994" role="heading" level="2" l10n="NEW">Magnification</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_DEFAULT" id="bm_id7652821" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5900143" role="heading" level="2" l10n="NEW">Default</paragraph>
+ <paragraph xml-lang="en-US" id="par_id822168" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page contents without zooming. If the reader software is configured to use a zoom factor by default, the page shows with that zoom factor.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIND" id="bm_id8959929" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1092257" role="heading" level="2" l10n="NEW">Fit in window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3092135" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit entirely into the reader's window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIDTH" id="bm_id5164342" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id654622" role="heading" level="2" l10n="NEW">Fit width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id814539" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_VISIBLE" id="bm_id4881435" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9883114" role="heading" level="2" l10n="NEW">Fit visible</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2362437" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the text and graphics on the page zoomed to fit the width of the reader's window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_RADIOBUTTON_RID_PDF_TAB_OPNFTR_RB_MAGNF_ZOOM" id="bm_id3769035" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FILTER_METRICFIELD_RID_PDF_TAB_OPNFTR_NUM_MAGNF_ZOOM" id="bm_id2727134" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7296975" role="heading" level="2" l10n="NEW">Zoom factor</paragraph>
+ <paragraph xml-lang="en-US" id="par_id371715" role="paragraph" l10n="NEW"><ahelp hid=".">Select a given zoom factor when the reader opens the PDF file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id329905" role="heading" level="2" l10n="NEW">Page layout</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT" id="bm_id2023682" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5632496" role="heading" level="2" l10n="NEW">Default</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1694082" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows the pages according to the layout setting of the reader software.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG" id="bm_id863368" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8454237" role="heading" level="2" l10n="NEW">Single page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id672322" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows one page at a time.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT" id="bm_id3083590" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7387310" role="heading" level="2" l10n="NEW">Continuous</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8764305" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages in a continuous vertical column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC" id="bm_id5062410" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6223639" role="heading" level="2" l10n="NEW">Continuous facing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5318765" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the right.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_OPNFTR:CB_PGLY_FIRSTLEFT" id="bm_id9036835" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1416364" role="heading" level="2" l10n="NEW">First page is left</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9596850" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Language settings - Languages in the Options dialog box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id18005" role="heading" level="2" l10n="NEW">User Interface</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id6676839" role="heading" level="2" l10n="NEW">Window options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_RESINIT" id="bm_id4184392" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3809015" role="heading" level="2" l10n="NEW">Resize window to initial page</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1321146" role="paragraph" l10n="CHG"><ahelp hid=".">Select to generate a PDF file that is shown in a window displaying the whole initial page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_CNTRWIN" id="bm_id1589098" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6994842" role="heading" level="2" l10n="NEW">Center window on screen</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9601428" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a reader window centered on screen.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_OPNFULL" id="bm_id1278420" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6369212" role="heading" level="2" l10n="NEW">Open in full screen mode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1111789" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown in a full screen reader window in front of all other windows.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_DISPDOCTITLE" id="bm_id8746910" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2041993" role="heading" level="2" l10n="NEW">Display document title</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4576555" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that is shown with the document title in the reader's title bar.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id4632099" role="heading" level="2" l10n="NEW">User interface options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR" id="bm_id9636524" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154087" role="heading" level="2" l10n="NEW">Hide menu bar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6582537" role="paragraph" l10n="NEW"><ahelp hid=".">Select to hide the reader's menu bar when the document is active.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR" id="bm_id5675527" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id729697" role="heading" level="2" l10n="NEW">Hide toolbar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id769066" role="paragraph" l10n="NEW"><ahelp hid=".">Select to hide the reader's toolbar when the document is active.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL" id="bm_id3486434" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id376293" role="heading" level="2" l10n="NEW">Hide window controls</paragraph>
+ <paragraph xml-lang="en-US" id="par_id43641" role="paragraph" l10n="NEW"><ahelp hid=".">Select to hide the reader's controls when the document is active.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id1886654" role="heading" level="2" l10n="NEW">Transitions</paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TRANSITIONEFFECTS -->
+<!-- removed HID filter_CheckBox_RID_PDF_TAB_GENER_CB_TRANSITIONEFFECTS -->
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_TRANSITIONEFFECTS" id="bm_id3901791" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN107D9" role="heading" level="2" l10n="NEW">Use transition effects</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107DD" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to export Impress slide transition effects to respective PDF effects.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9053926" role="heading" level="2" l10n="NEW">Bookmarks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_RADIOBUTTON_RID_PDF_TAB_VPREFER_RB_ALLBOOKMARKLEVELS" id="bm_id4371776" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1941892" role="heading" level="2" l10n="NEW">All bookmark levels</paragraph>
+ <paragraph xml-lang="en-US" id="par_id341807" role="paragraph" l10n="NEW"><ahelp hid=".">Select to show all bookmark levels when the reader opens the PDF file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FILTER_RADIOBUTTON_RID_PDF_TAB_VPREFER_RB_VISIBLEBOOKMARKLEVELS" id="bm_id6384166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FILTER_NUMERICFIELD_RID_PDF_TAB_VPREFER_NUM_BOOKMARKLEVELS" id="bm_id1559801" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id486770" role="heading" level="2" l10n="NEW">Visible bookmark levels</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4850001" role="paragraph" l10n="NEW"><ahelp hid=".">Select to show bookmark levels down to the selected level when the reader opens the PDF file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9464094" role="heading" level="2" l10n="NEW">Links</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9302346" role="paragraph" l10n="NEW">Specify how to export bookmarks and hyperlinks in your document.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_LINKS:CB_EXP_BMRK_TO_DEST" id="bm_id5594042" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8296151" role="heading" level="2" l10n="NEW">Export bookmarks as named destinations</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4809411" role="paragraph" l10n="NEW"><ahelp hid=".">The bookmarks (targets of references) in PDF files can be defined as rectangular areas. Additionally, bookmarks to named objects can be defined by their names. Enable the checkbox to export the names of objects in your document as valid bookmark targets. This allows to link to those objects by name from other documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_LINKS:CB_CNV_OOO_DOCTOPDF" id="bm_id6163823" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6454969" role="heading" level="2" l10n="NEW">Convert document references to PDF targets</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7928708" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this checkbox to convert the URLs referencing other ODF files to PDF files with the same name. In the referencing URLs the extensions .odt, .odp, .ods, .odg, and .odm are converted to the extension .pdf.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_LINKS:CB_ENAB_RELLINKFSYS" id="bm_id9741508" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3864253" role="heading" level="2" l10n="NEW">Export URLs relative to file system</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144016" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this checkbox to export URLs to other documents as relative URLs in the file system. See <link href="text/shared/guide/hyperlink_rel_abs.xhp">"relative hyperlinks"</link> in the Help.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9937131" role="heading" level="2" l10n="NEW">Cross-document links</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5616626" role="paragraph" l10n="NEW">Specify how to handle hyperlinks from your PDF file to other files.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_DEFAULT" id="bm_id909451" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1972106" role="heading" level="2" l10n="NEW">Default mode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id79042" role="paragraph" l10n="NEW"><ahelp hid=".">Links from your PDF document to other documents will be handled as it is specified in your operating system.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_APPLICATION" id="bm_id1665089" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4076357" role="heading" level="2" l10n="NEW">Open with PDF reader application</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8231757" role="paragraph" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the PDF reader application that currently shows the document. The PDF reader application must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_BROWSER" id="bm_id4997100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3168736" role="heading" level="2" l10n="NEW">Open with Internet browser</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1909848" role="paragraph" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3068636" role="heading" level="2" l10n="NEW">Security</paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT -->
+<paragraph xml-lang="en-US" id="hd_id2480849" role="heading" level="2" l10n="NEW">Encrypt the PDF document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="NEW"><ahelp hid=".">Select to encrypt the PDF document with a password. The PDF file can be opened only when the user enters the correct password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_USER_PWD" id="bm_id8720358" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="2" l10n="NEW">Set open password</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
+<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS -->
+<paragraph xml-lang="en-US" id="hd_id4071779" role="heading" level="2" l10n="NEW">Restrict permission</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7844477" role="paragraph" l10n="NEW"><ahelp hid=".">Select to restrict some permissions. The permissions can be changed only when the user enters the correct password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_OWNER_PWD" id="bm_id8016602" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id6478469" role="heading" level="2" l10n="NEW">Set permission password</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id7985168" role="heading" level="2" l10n="NEW">Printing</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE" id="bm_id1476485" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="2" l10n="NEW">Not permitted</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW"><ahelp hid=".">Printing the document is not permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_LOWRES" id="bm_id1693472" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id599688" role="heading" level="2" l10n="NEW">Low resolution (150 dpi)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1371501" role="paragraph" l10n="NEW"><ahelp hid=".">The document can only be printed in low resolution (150 dpi). Not all PDF readers honor this setting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_HIGHRES" id="bm_id8849147" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4661702" role="heading" level="2" l10n="NEW">High resolution</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7868892" role="paragraph" l10n="CHG"><ahelp hid=".">The document can be printed in high resolution.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2188787" role="heading" level="2" l10n="NEW">Changes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_NONE" id="bm_id8967253" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id5833307" role="heading" level="2" l10n="NEW">Not permitted</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7726676" role="paragraph" l10n="NEW"><ahelp hid=".">No changes of the content are permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_INSDEL" id="bm_id53712" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3729361" role="heading" level="2" l10n="NEW">Inserting, deleting, and rotating pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9573961" role="paragraph" l10n="NEW"><ahelp hid=".">Only inserting, deleting, and rotating pages is permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_FILLFORM" id="bm_id8904385" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7700430" role="heading" level="2" l10n="NEW">Filling in form fields</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1180455" role="paragraph" l10n="NEW"><ahelp hid=".">Only filling in form fields is permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_COMMENT" id="bm_id677205" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3405560" role="heading" level="2" l10n="NEW">Commenting, filling in form fields</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3409527" role="paragraph" l10n="NEW"><ahelp hid=".">Only commenting and filling in form fields is permitted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_ANY_NOCOPY" id="bm_id4991607" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7112338" role="heading" level="2" l10n="NEW">Any except extracting pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2855616" role="paragraph" l10n="NEW"><ahelp hid=".">All changes are permitted, except extracting pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENDAB_COPY" id="bm_id7106845" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2091433" role="heading" level="2" l10n="NEW">Enable copying of content</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5092318" role="paragraph" l10n="NEW"><ahelp hid=".">Select to enable copying of content to the clipboard.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENAB_ACCESS" id="bm_id3429059" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9312417" role="heading" level="2" l10n="NEW">Enable text access for accessibility tools</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9089022" role="paragraph" l10n="NEW"><ahelp hid=".">Select to enable text access for accessibility tools.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150507" role="heading" level="2" l10n="U"
+ oldref="50">Export</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="51"><ahelp hid=".">Exports the current file in PDF format.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp b/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp
index aaac3d9b6f..359ec13a07 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_send_as.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ref_pdf_send_as.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/securitywarning.xhp b/helpcontent2/source/text/shared/01/securitywarning.xhp
index 668de9a5f9..21d5717fb1 100644
--- a/helpcontent2/source/text/shared/01/securitywarning.xhp
+++ b/helpcontent2/source/text/shared/01/securitywarning.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: securitywarning.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,13 +45,13 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id6499832"><bookmark_value>security;warning dialogs with macros</bookmark_value>
<bookmark_value>macros;security warning dialog</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_WARNING_MACROSDISABLED" id="bm_id7895443" localize="false"/>
+<!-- removed HID HID_WARNING_MACROSDISABLED -->
<bookmark xml-lang="en-US" branch="hid/HID_WARNING_SECURITY_HYPERLINK" id="bm_id5382854" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSECDLG_MACROWARN" id="bm_id7777947" localize="false"/>
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="securitywarning"><link href="text/shared/01/securitywarning.xhp">Security Warning</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW">When you open a document that contains an unsigned macro, or a signed macro from an unknown source, the <emph>Security Warning</emph> dialog opens.</paragraph>
-<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>Tools - Options - %PRODUCTNAME - Security</emph> to set the options.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>%PRODUCTNAME - Security</emph> in the Options dialog box to set the options.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="2" l10n="NEW">View Signature</paragraph>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can view the signature.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="2" l10n="NEW">Always trust macros from this source</paragraph>
diff --git a/helpcontent2/source/text/shared/01/selectcertificate.xhp b/helpcontent2/source/text/shared/01/selectcertificate.xhp
index a3578bdadb..bbb0482e84 100644
--- a/helpcontent2/source/text/shared/01/selectcertificate.xhp
+++ b/helpcontent2/source/text/shared/01/selectcertificate.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: selectcertificate.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,8 +47,8 @@
<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"/>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_CERTPATH_BTN_VIEWCERT" id="bm_id3395794" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT" id="bm_id5101168" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_CERTPATH:BTN_VIEWCERT" id="bm_id3395794" localize="false"/>
<paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2" l10n="NEW">View Certificate</paragraph>
<paragraph role="paragraph" id="par_idN10575" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog where you can examine the selected certificate.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/webhtml.xhp b/helpcontent2/source/text/shared/01/webhtml.xhp
index 1a632f39ff..49b1a5cc7d 100644
--- a/helpcontent2/source/text/shared/01/webhtml.xhp
+++ b/helpcontent2/source/text/shared/01/webhtml.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webhtml.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#webhtml"/>
</section>
-<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem">Tools - Options - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
-<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem">Tools - Options - Load/Save - HTML Compatibility</item>.</paragraph>
+<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
+<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</item>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/xformsdata.xhp b/helpcontent2/source/text/shared/01/xformsdata.xhp
index 507976dfa6..fe9a95b1ad 100644
--- a/helpcontent2/source/text/shared/01/xformsdata.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdata.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xformsdata.xhp,v $
- * $Revision: 1.15.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,77 +32,81 @@
<meta>
-<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">
+ <topic id="textshared01xformsdataxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">Data Navigator</title>
+ <filename>/text/shared/01/xformsdata.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <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_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 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 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>
+<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX" id="bm_id0130200901571189" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TAB_CONTROL" id="bm_id0130200901573014" 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>
</variable></paragraph>
-<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>
+ <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>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_LIST" id="bm_id759300" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_MENUBTN" id="bm_id6110721" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_ADD" id="bm_id6934415" localize="false"/>
-<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>
+<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>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME" id="bm_id0130200901582112" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0130200901590878" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT" id="bm_id0910200811130823" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0910200811173295" role="heading" level="3" l10n="NEW">Model data updates change document's modification status</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0910200811173255" role="paragraph" 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 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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_EDIT" id="bm_id8617816" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_SHOW_DETAILS" id="bm_id5646229" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_ITEMS_LIST" id="bm_id2524491" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id4040955" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_INSTANCES_MENUBTN" id="bm_id3339335" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_ADD" id="bm_id9214148" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_EDIT" id="bm_id4229255" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_REMOVE" id="bm_id1858882" localize="false"/>
-<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>
+<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>
<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 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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_EDIT" id="bm_id1051362" localize="false"/>
-<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>
+<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>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_REMOVE" id="bm_id3862117" localize="false"/>
-<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>
+<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>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/xformsdataadd.xhp b/helpcontent2/source/text/shared/01/xformsdataadd.xhp
index 3ba52c5d65..c4626dd282 100644
--- a/helpcontent2/source/text/shared/01/xformsdataadd.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdataadd.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xformsdataadd.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,66 +51,66 @@
<paragraph xml-lang="en-US" id="par_idN1054B" role="paragraph" l10n="CHG"><ahelp hid=".">Adds a new item or edits the selected item in the XForms Data Navigator.</ahelp> Items can be elements, attributes, submissions, or bindings.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="CHG"><ahelp hid=".">%PRODUCTNAME inserts a new item directly after the currently selected item in the Data Navigator. A new attribute is added to the currently selected element.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME" id="bm_id5775627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME" id="bm_id5775627" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10563" role="heading" level="3" l10n="NEW">Name</paragraph>
<paragraph xml-lang="en-US" id="par_idN10567" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the name of the item.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1056A" role="note" l10n="CHG">The attribute names must be unique within the same group.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1056D" role="heading" level="3" l10n="NEW">Type</paragraph>
<paragraph xml-lang="en-US" id="par_idN10571" role="paragraph" l10n="NEW"><ahelp hid=".">Select the type of a new item. You cannot change the type of an edited item.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT" id="bm_id9302041" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT" id="bm_id9302041" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10574" role="heading" level="3" l10n="NEW">Default value</paragraph>
<paragraph xml-lang="en-US" id="par_idN10578" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a default value for the selected item.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1057B" role="heading" level="2" l10n="NEW">Settings</paragraph>
<paragraph xml-lang="en-US" id="par_idN1057F" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the properties of the selected item.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_ADD_DATAITEM_LB_DATATYPE" id="bm_id5551011" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE" id="bm_id5551011" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10582" role="heading" level="3" l10n="NEW">Data type</paragraph>
<paragraph xml-lang="en-US" id="par_idN10586" role="paragraph" l10n="NEW"><ahelp hid=".">Select the data type for the selected item.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_REQUIRED" id="bm_id2487258" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED" id="bm_id2487258" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_REQUIRED" id="bm_id1239661" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10589" role="heading" level="3" l10n="NEW">Required</paragraph>
<paragraph xml-lang="en-US" id="par_idN1058D" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies if the item must be included on the XForm.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_REQUIRED" id="bm_id1404156" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED" id="bm_id1404156" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10590" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter used namespaces and full XPath expressions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_RELEVANT" id="bm_id8867458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT" id="bm_id8867458" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_RELEVANT" id="bm_id3679616" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105AA" role="heading" level="3" l10n="NEW">Relevant</paragraph>
<paragraph xml-lang="en-US" id="par_idN105AE" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as relevant.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_RELEVANT" id="bm_id3488570" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT" id="bm_id3488570" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105B1" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter used namespaces and full XPath expressions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CONSTRAINT" id="bm_id2007812" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT" id="bm_id2007812" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CONSTRAINT" id="bm_id8594622" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105CB" role="heading" level="3" l10n="NEW">Constraint</paragraph>
<paragraph xml-lang="en-US" id="par_idN105CF" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as a constraint.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_CONSTRAINT" id="bm_id2240058" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT" id="bm_id2240058" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN106C7" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can specify the constraint condition.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY" id="bm_id6203192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY" id="bm_id6203192" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_READONLY" id="bm_id4252449" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105E4" role="heading" level="3" l10n="NEW">Read-only</paragraph>
<paragraph xml-lang="en-US" id="par_idN105E8" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as read-only.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_READONLY" id="bm_id165105" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY" id="bm_id165105" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105EB" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter used namespaces and full XPath expressions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CALCULATE" id="bm_id6361583" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE" id="bm_id6361583" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CALCULATION" id="bm_id383617" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10605" role="heading" level="3" l10n="CHG">Calculate / Calculation<comment>UFI: inconsistent use of name</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN10609" role="paragraph" l10n="NEW"><ahelp hid=".">Declares that the item is calculated.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_CALCULATE" id="bm_id2518997" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE" id="bm_id2518997" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1076B" role="paragraph" l10n="NEW">The <emph>Condition</emph> button opens the <link href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where you can enter the calculation.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp b/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp
index cad32aa4d8..3cbf78d75c 100644
--- a/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdataaddcon.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xformsdataaddcon.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,13 +50,13 @@
<paragraph xml-lang="en-US" id="par_idN1053E" role="heading" level="1" l10n="NEW">Add Condition</paragraph>
<paragraph xml-lang="en-US" id="par_idN10542" role="paragraph" l10n="CHG"><ahelp hid=".">Add a condition in this subdialog of the Add Item / Edit Item dialog of the Data Navigator.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION" id="bm_id5080721" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION" id="bm_id5080721" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10561" role="heading" level="2" l10n="NEW">Condition</paragraph>
<paragraph xml-lang="en-US" id="par_idN10565" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a condition.</ahelp><comment>examples?</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN10568" role="heading" level="2" l10n="NEW">Result</paragraph>
<paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a preview of the result.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_ADD_CONDITION_PB_EDIT_NAMESPACES" id="bm_id5074007" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES" id="bm_id5074007" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1056F" role="heading" level="2" l10n="NEW">Edit Namespaces</paragraph>
<paragraph xml-lang="en-US" id="par_idN10573" role="paragraph" l10n="CHG"><ahelp hid=".">Opens the Form Namespaces dialog where you can add, edit, or delete namespaces.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/xformsdatachange.xhp b/helpcontent2/source/text/shared/01/xformsdatachange.xhp
index 8e20fabc8a..f27b3ea2b4 100644
--- a/helpcontent2/source/text/shared/01/xformsdatachange.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdatachange.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xformsdatachange.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/01/xformsdataname.xhp b/helpcontent2/source/text/shared/01/xformsdataname.xhp
index 6804fe6882..c9537e8fe7 100644
--- a/helpcontent2/source/text/shared/01/xformsdataname.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdataname.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xformsdataname.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,17 +56,17 @@
<paragraph xml-lang="en-US" id="par_idN10561" role="heading" level="2" l10n="NEW">Namespaces</paragraph>
<paragraph xml-lang="en-US" id="par_idN10565" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the currently defined namespaces for the form.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_ADD_NAMESPACE" id="bm_id5343485" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE" id="bm_id5343485" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10568" role="heading" level="2" l10n="NEW">Add</paragraph>
<paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="NEW"><ahelp hid=".">Adds a new namespace to the list.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1056F" role="paragraph" l10n="NEW">Use the <emph>Add Namespace</emph> dialog to enter the Prefix and URL.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_EDIT_NAMESPACE" id="bm_id3851435" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE" id="bm_id3851435" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10576" role="heading" level="2" l10n="NEW">Edit</paragraph>
<paragraph xml-lang="en-US" id="par_idN1057A" role="paragraph" l10n="NEW"><ahelp hid=".">Edits the selected namespace.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1057D" role="paragraph" l10n="NEW">Use the <emph>Edit Namespace</emph> dialog to edit the Prefix and URL.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_DELETE_NAMESPACE" id="bm_id2580034" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE" id="bm_id2580034" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10584" role="heading" level="2" l10n="NEW">Delete</paragraph>
<paragraph xml-lang="en-US" id="par_idN10588" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the selected namespace.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/xformsdatatab.xhp b/helpcontent2/source/text/shared/01/xformsdatatab.xhp
index 26d3aee7fc..9dd4b8d611 100644
--- a/helpcontent2/source/text/shared/01/xformsdatatab.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdatatab.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xformsdatatab.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,93 +29,89 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01xformsdatatabxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Data (for XML Form Documents)</title>
-<filename>/text/shared/01/xformsdatatab.xhp</filename>
-</topic>
-<history>
-<created date="2004-08-24T11:25:20">UFI: XForms, Data Navigator, Add/Edit Item, Condition, Edit Namespaces</created>
-<lastedited date="2006-02-22T17:10:46">UFI: copied this as new file</lastedited>
-</history>
-</meta>
-<body>
-<section id="data">
-<paragraph role="heading" id="hd_id5766472" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/xformsdatatab.xhp">Data (for XML Form Documents)</link></paragraph>
-<paragraph role="paragraph" id="par_id1161534" xml-lang="en-US" l10n="NEW">The Data tab page of the Properties dialog for an XML Form document offers some XML forms settings.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#xformsdatatab"/>
-</section>
-<paragraph role="paragraph" id="par_id3994567" xml-lang="en-US" l10n="NEW">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>
+ <topic id="textshared01xformsdatatabxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Data (for XML Form Documents)</title>
+ <filename>/text/shared/01/xformsdatatab.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="data">
+ <paragraph xml-lang="en-US" id="hd_id5766472" role="heading" level="1" l10n="NEW"><link href="text/shared/01/xformsdatatab.xhp">Data (for XML Form Documents)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1161534" role="paragraph" l10n="NEW">The Data tab page of the Properties dialog for an XML Form document offers some XML forms settings.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040501.xhp#xformsdatatab"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3994567" role="paragraph" l10n="NEW">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>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XML_DATA_MODEL" id="bm_id2136295" localize="false"/>
-<paragraph role="heading" id="hd_id9461653" xml-lang="en-US" level="2" l10n="NEW">XML data model</paragraph>
-<paragraph role="paragraph" id="par_id9239173" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a model from the list of all models in the current document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id9461653" role="heading" level="2" l10n="NEW">XML data model</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9239173" role="paragraph" l10n="NEW"><ahelp hid=".">Select a model from the list of all models in the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_BINDING_NAME" id="bm_id908841" localize="false"/>
-<paragraph role="heading" id="hd_id2656941" xml-lang="en-US" level="2" l10n="NEW">Binding</paragraph>
-<paragraph role="paragraph" id="par_id1481063" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select or enter the name of a binding. Selecting the name of an existing binding associates the binding with the form control. Entering a new name creates a new binding and associates it with the form control.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id2656941" role="heading" level="2" l10n="NEW">Binding</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1481063" role="paragraph" l10n="NEW"><ahelp hid=".">Select or enter the name of a binding. Selecting the name of an existing binding associates the binding with the form control. Entering a new name creates a new binding and associates it with the form control.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_BIND_EXPRESSION" id="bm_id9841608" localize="false"/>
-<paragraph role="heading" id="hd_id7921079" xml-lang="en-US" level="2" l10n="NEW">Binding expression</paragraph>
-<paragraph role="paragraph" id="par_id636921" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the DOM node <comment>what's a DOM node? spec doesn't tell</comment>to bind the control model to<comment>what's a control model? spec doesn't tell. may be a typo in spec: control's model?</comment>. Click the ... button for a dialog to enter the XPath expression.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id7921079" role="heading" level="2" l10n="NEW">Binding expression</paragraph>
+ <paragraph xml-lang="en-US" id="par_id636921" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the DOM node <comment>what's a DOM node? spec doesn't tell</comment>to bind the control model to<comment>what's a control model? spec doesn't tell. may be a typo in spec: control's model?</comment>. Click the ... button for a dialog to enter the XPath expression.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_REQUIRED" id="bm_id4186223" localize="false"/>
-<paragraph role="heading" id="hd_id2799157" xml-lang="en-US" level="2" l10n="NEW">Required</paragraph>
-<paragraph role="paragraph" id="par_id3004547" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies if the item must be included on the XForm.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id2799157" role="heading" level="2" l10n="NEW">Required</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3004547" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies if the item must be included on the XForm.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_RELEVANT" id="bm_id1491134" localize="false"/>
-<paragraph role="heading" id="hd_id6401867" xml-lang="en-US" level="2" l10n="NEW">Relevant</paragraph>
-<paragraph role="paragraph" id="par_id18616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares the item as relevant.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id6401867" role="heading" level="2" l10n="NEW">Relevant</paragraph>
+ <paragraph xml-lang="en-US" id="par_id18616" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as relevant.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_READONLY" id="bm_id2873622" localize="false"/>
-<paragraph role="heading" id="hd_id6138492" xml-lang="en-US" level="2" l10n="NEW">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id4569231" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares the item as read-only.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id6138492" role="heading" level="2" l10n="NEW">Read-only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4569231" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as read-only.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CONSTRAINT" id="bm_id2374034" localize="false"/>
-<paragraph role="heading" id="hd_id291451" xml-lang="en-US" level="2" l10n="NEW">Constraint</paragraph>
-<paragraph role="paragraph" id="par_id3341776" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares the item as a constraint.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id291451" role="heading" level="2" l10n="NEW">Constraint</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3341776" role="paragraph" l10n="NEW"><ahelp hid=".">Declares the item as a constraint.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_CALCULATION" id="bm_id1687063" localize="false"/>
-<paragraph role="heading" id="hd_id5947141" xml-lang="en-US" level="2" l10n="NEW">Calculation</paragraph>
-<paragraph role="paragraph" id="par_id1911679" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Declares that the item is calculated.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id5947141" role="heading" level="2" l10n="NEW">Calculation</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1911679" role="paragraph" l10n="NEW"><ahelp hid=".">Declares that the item is calculated.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_DATA_TYPE" id="bm_id8982207" localize="false"/>
-<paragraph role="heading" id="hd_id9364909" xml-lang="en-US" level="2" l10n="NEW">Data type</paragraph>
-<paragraph role="paragraph" id="par_id4473403" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a data type which the control should be validated against.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id9364909" role="heading" level="2" l10n="NEW">Data type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4473403" role="paragraph" l10n="NEW"><ahelp hid=".">Select a data type which the control should be validated against.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/UID_PROP_REMOVE_DATA_TYPE" id="bm_id3486434" localize="false"/>
-<paragraph role="heading" id="hd_id2480849" xml-lang="en-US" level="3" l10n="NEW">x</paragraph>
-<paragraph role="paragraph" id="par_id4181951" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a user-defined data type and click the button to delete the user-defined data type.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id2480849" role="heading" level="3" l10n="NEW">x</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="NEW"><ahelp hid=".">Select a user-defined data type and click the button to delete the user-defined data type.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/UID_PROP_ADD_DATA_TYPE" id="bm_id3068636" localize="false"/>
-<paragraph role="heading" id="hd_id2927335" xml-lang="en-US" level="3" l10n="NEW">+</paragraph>
-<paragraph role="paragraph" id="par_id2107303" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click the button to open a dialog where you can enter the name of a new user-defined data type. The new data type inherits all facets from the currently selected data type.</ahelp></paragraph>
-<paragraph role="note" id="par_id4071779" xml-lang="en-US" l10n="NEW">The following lists all facets that are valid for data types. Some facets are only available for some data types.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="3" l10n="NEW">+</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW"><ahelp hid=".">Click the button to open a dialog where you can enter the name of a new user-defined data type. The new data type inherits all facets from the currently selected data type.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id4071779" role="note" l10n="NEW">The following lists all facets that are valid for data types. Some facets are only available for some data types.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_WHITESPACES" id="bm_id7074190" localize="false"/>
-<paragraph role="heading" id="hd_id4313791" xml-lang="en-US" level="3" l10n="NEW">Whitespaces</paragraph>
-<paragraph role="paragraph" id="par_id4331797" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies how whitespaces are to be handled when a string of the current data type is being processed. Possible values are Preserve, Replace, and Collapse. The sematics follow the definition at <link href="http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace">http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace</link>.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id4313791" role="heading" level="3" l10n="NEW">Whitespaces</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4331797" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies how whitespaces are to be handled when a string of the current data type is being processed. Possible values are Preserve, Replace, and Collapse. The sematics follow the definition at http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_PATTERN" id="bm_id5452436" localize="false"/>
-<paragraph role="heading" id="hd_id4191717" xml-lang="en-US" level="3" l10n="NEW">Pattern</paragraph>
-<paragraph role="paragraph" id="par_id2318796" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies a regular expression pattern. Strings validated against the data type must conform to this pattern to be valid. The XSD data type syntax for regular expressions is different from the regular expression syntax used elseswhere in %PRODUCTNAME, for example in the Find &amp; Replace dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id4191717" role="heading" level="3" l10n="NEW">Pattern</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2318796" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies a regular expression pattern. Strings validated against the data type must conform to this pattern to be valid. The XSD data type syntax for regular expressions is different from the regular expression syntax used elseswhere in %PRODUCTNAME, for example in the Find &amp; Replace dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_TOTAL_DIGITS" id="bm_id9527878" localize="false"/>
-<paragraph role="heading" id="hd_id399182" xml-lang="en-US" level="3" l10n="NEW">Digits (total)</paragraph>
-<paragraph role="paragraph" id="par_id5298318" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of digits that values of the decimal data type can have.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id399182" role="heading" level="3" l10n="NEW">Digits (total)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5298318" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of digits that values of the decimal data type can have.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_FRACTION_DIGITS" id="bm_id6342356" localize="false"/>
-<paragraph role="heading" id="hd_id7588732" xml-lang="en-US" level="3" l10n="NEW">Digits (fraction)</paragraph>
-<paragraph role="paragraph" id="par_id95828" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of fractional digits that values of the decimal data type can have.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id7588732" role="heading" level="3" l10n="NEW">Digits (fraction)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the maximum total number of fractional digits that values of the decimal data type can have.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MAX_INCLUSIVE" id="bm_id166936" localize="false"/>
-<paragraph role="heading" id="hd_id3496200" xml-lang="en-US" level="3" l10n="NEW">Max. (inclusive)</paragraph>
-<paragraph role="paragraph" id="par_id7599108" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an inclusive upper bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3496200" role="heading" level="3" l10n="NEW">Max. (inclusive)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an inclusive upper bound for values.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MAX_EXCLUSIVE" id="bm_id6826990" localize="false"/>
-<paragraph role="heading" id="hd_id888698" xml-lang="en-US" level="3" l10n="NEW">Max. (exclusive)</paragraph>
-<paragraph role="paragraph" id="par_id3394573" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an exclusive upper bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id888698" role="heading" level="3" l10n="NEW">Max. (exclusive)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an exclusive upper bound for values.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MIN_INCLUSIVE" id="bm_id6897183" localize="false"/>
-<paragraph role="heading" id="hd_id7594225" xml-lang="en-US" level="3" l10n="NEW">Min. (inclusive)</paragraph>
-<paragraph role="paragraph" id="par_id8147221" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an inclusive lower bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id7594225" role="heading" level="3" l10n="NEW">Min. (inclusive)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an inclusive lower bound for values.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MIN_EXCLUSIVE" id="bm_id7003387" localize="false"/>
-<paragraph role="heading" id="hd_id5081637" xml-lang="en-US" level="3" l10n="NEW">Min. (exclusive)</paragraph>
-<paragraph role="paragraph" id="par_id9759514" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies an exclusive lower bound for values.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id5081637" role="heading" level="3" l10n="NEW">Min. (exclusive)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9759514" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies an exclusive lower bound for values.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_LENGTH" id="bm_id4897915" localize="false"/>
-<paragraph role="heading" id="hd_id1614429" xml-lang="en-US" level="3" l10n="NEW">Length</paragraph>
-<paragraph role="paragraph" id="par_id1589098" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the number of characters for a string.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/38008" id="bm_id3105868" localize="false"/><comment>UFI: found 37998 which is already in use</comment>
-<paragraph role="heading" id="hd_id1278420" xml-lang="en-US" level="3" l10n="NEW">Length (at least)</paragraph>
-<paragraph role="paragraph" id="par_id8746910" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the minimum number of characters for a string.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id1614429" role="heading" level="3" l10n="NEW">Length</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1589098" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the number of characters for a string.</ahelp></paragraph>
+<!-- removed HID 38008 --><comment>UFI: found 37998 which is already in use</comment>
+<paragraph xml-lang="en-US" id="hd_id1278420" role="heading" level="3" l10n="NEW">Length (at least)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8746910" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the minimum number of characters for a string.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_XSD_MAX_LENGTH" id="bm_id3908810" localize="false"/>
-<paragraph role="heading" id="hd_id9636524" xml-lang="en-US" level="3" l10n="NEW">Length (at most)</paragraph>
-<paragraph role="paragraph" id="par_id5675527" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the maximum number of characters for a string.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id9636524" role="heading" level="3" l10n="NEW">Length (at most)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5675527" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the maximum number of characters for a string.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01110000.xhp b/helpcontent2/source/text/shared/02/01110000.xhp
index 7918dada7d..f0f3e53b4b 100644
--- a/helpcontent2/source/text/shared/02/01110000.xhp
+++ b/helpcontent2/source/text/shared/02/01110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01140000.xhp b/helpcontent2/source/text/shared/02/01140000.xhp
index 4165245c9b..f33db0534a 100644
--- a/helpcontent2/source/text/shared/02/01140000.xhp
+++ b/helpcontent2/source/text/shared/02/01140000.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.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01140000.xhp,v $
- * $Revision: 1.17 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,396 +32,349 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0201140000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Show Draw Functions</title>
-<filename>/text/shared/02/01140000.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textshared0201140000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Show Draw Functions</title>
+ <filename>/text/shared/02/01140000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150476"><bookmark_value>Drawing bar</bookmark_value>
-<bookmark_value>lines; draw functions</bookmark_value>
-<bookmark_value>polygon drawing</bookmark_value>
-<bookmark_value>freeform lines; draw functions</bookmark_value>
-<bookmark_value>text boxes; positioning</bookmark_value>
-<bookmark_value>headings; entering as text box</bookmark_value>
-<bookmark_value>text objects; draw functions</bookmark_value>
-<bookmark_value>ticker text</bookmark_value>
-<bookmark_value>text; animating</bookmark_value>
-<bookmark_value>vertical callouts</bookmark_value>
-<bookmark_value>vertical text boxes</bookmark_value>
-</bookmark>
- <comment>MW moved "frames;" and "selecting;" to the shared guide groups.xhp</comment>
- <paragraph xml-lang="en-US" id="par_id3150476" role="paragraph" l10n="E" oldref="96" localize="false"/>
- <section id="zeichnen">
-
-
+ <bookmark_value>lines; draw functions</bookmark_value>
+ <bookmark_value>polygon drawing</bookmark_value>
+ <bookmark_value>freeform lines; draw functions</bookmark_value>
+ <bookmark_value>text boxes; positioning</bookmark_value>
+ <bookmark_value>headings; entering as text box</bookmark_value>
+ <bookmark_value>text objects; draw functions</bookmark_value>
+ <bookmark_value>ticker text</bookmark_value>
+ <bookmark_value>text; animating</bookmark_value>
+ <bookmark_value>vertical callouts</bookmark_value>
+ <bookmark_value>vertical text boxes</bookmark_value>
+ <bookmark_value>cube drawing</bookmark_value>
+ <bookmark_value>triangle drawing</bookmark_value>
+ <bookmark_value>ellipse drawing</bookmark_value>
+ <bookmark_value>rectangle drawing</bookmark_value>
+ <bookmark_value>shapes</bookmark_value>
+</bookmark><comment>MW moved "frames;" and "selecting;" to the shared guide groups.xhp</comment><comment>MW added 5 entries</comment>
+<paragraph xml-lang="en-US" id="par_id3150476" role="paragraph" l10n="E" oldref="96"
+ localize="false"/>
+ <section id="zeichnen">
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_DRAW" id="bm_id484265" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:InsertDraw" id="bm_id3149205" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3152363" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01140000.xhp" name="Show Draw Functions">Show Draw Functions</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150789" role="paragraph" l10n="CHG" oldref="72"><ahelp hid=".uno:InsertDraw">Click to open or close the <emph>Drawing </emph>bar, where you can add shapes, lines, text, and callouts to the current document.</ahelp></paragraph>
-
- </section>
- <section id="syzeichnen">
-
- <paragraph xml-lang="en-US" id="par_idN10849" role="paragraph" l10n="NEW">You can switch on and off the Drawing toolbar of Writer and Calc documents using an icon on the Standard toolbar.</paragraph>
- <section id="syshowdraw">
-
- <table id="tbl_id3149182">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
-<image id="img_id3153683" src="res/commandimagelist/sc_insertdraw.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153683">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3152363" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01140000.xhp" name="Show Draw Functions">Show Draw Functions</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150789" role="paragraph" l10n="CHG" oldref="72"><ahelp hid=".uno:InsertDraw">Click to open or close the <emph>Drawing </emph>bar, where you can add shapes, lines, text, and callouts to the current document.</ahelp></paragraph>
+ </section>
+ <section id="syzeichnen">
+ <paragraph xml-lang="en-US" id="par_idN10849" role="paragraph" l10n="NEW">You can switch on and off the Drawing toolbar of Writer and Calc documents using an icon on the Standard toolbar.</paragraph>
+ <section id="syshowdraw">
+ <table id="tbl_id3149182">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
+<image id="img_id3153683" src="res/commandimagelist/sc_insertdraw.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153683">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153032" role="paragraph" l10n="CHG" oldref="10">Show Draw Functions</paragraph>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
-
- </section>
- <paragraph xml-lang="en-US" id="par_idN1089D" role="tip" l10n="NEW">You can show and hide the <emph>Visible Buttons</emph>. Click the arrow at the end of the toolbar to access the <emph>Visible Buttons</emph> command.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149398" role="heading" level="2" l10n="U" oldref="11">Selection</paragraph>
- <table id="tbl_id3159157">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph" l10n="E">
-<image id="img_id3153824" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153824">Icon</alt>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153032" role="paragraph" l10n="CHG" oldref="10">Show Draw Functions</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN1089D" role="tip" l10n="NEW">You can show and hide the <emph>Visible Buttons</emph>. Click the arrow at the end of the toolbar to access the <emph>Visible Buttons</emph> command.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149398" role="heading" level="2" l10n="U"
+ oldref="11">Selection</paragraph>
+ <table id="tbl_id3159157">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph" l10n="E">
+<image id="img_id3153824" src="res/commandimagelist/sc_drawselect.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153824">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" l10n="U" oldref="12">Lets you select objects in the current document. To select an object, click the object with the arrow. To select more than one object, drag a selection frame around the objects. To add an object to a selection, press Shift, and then click the object.</paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph" l10n="U" oldref="12">Lets you select objects in the current document. To select an object, click the object with the arrow. To select more than one object, drag a selection frame around the objects. To add an object to a selection, press Shift, and then click the object.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_LINE" id="bm_id9304767" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Line" id="bm_id3155449" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U" oldref="13">Line</paragraph>
- <table id="tbl_id3150275">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
-<image id="img_id3147618" src="res/commandimagelist/sc_line.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3147618">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U"
+ oldref="13">Line</paragraph>
+ <table id="tbl_id3150275">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
+<image id="img_id3147618" src="res/commandimagelist/sc_line.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147618">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
- <paragraph xml-lang="en-US" id="par_id3153360" role="tip" l10n="CHG" oldref="71">To enter text on a line, double-click the line and type or paste your text. The text direction corresponds to the direction you dragged to draw the line. To hide the line, select <emph>Invisible</emph> in the <emph>Line Style</emph> box on the <emph>Drawing Object Properties</emph> bar.</paragraph>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="par_id3153360" role="tip" l10n="CHG" oldref="71">To enter text on a line, double-click the line and type or paste your text. The text direction corresponds to the direction you dragged to draw the line. To hide the line, select <emph>Invisible</emph> in the <emph>Line Style</emph> box on the <emph>Drawing Object Properties</emph> bar.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_RECT" id="bm_id8789060" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Rect" id="bm_id3149169" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3152922" role="heading" level="2" l10n="U" oldref="16">Rectangle</paragraph>
- <table id="tbl_id3153178">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph" l10n="E">
-<image id="img_id3158407" src="res/commandimagelist/sc_rect.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3158407">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3152922" role="heading" level="2" l10n="U"
+ oldref="16">Rectangle</paragraph>
+ <table id="tbl_id3153178">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph" l10n="E">
+<image id="img_id3158407" src="res/commandimagelist/sc_rect.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3158407">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="U" oldref="65"><ahelp hid=".uno:Rect">Draws a rectangle where you drag in the current document. To draw a square, hold down Shift while you drag. Click where you want to place a corner of the rectangle, and drag to the size you want.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="U" oldref="65"><ahelp hid=".uno:Rect">Draws a rectangle where you drag in the current document. To draw a square, hold down Shift while you drag. Click where you want to place a corner of the rectangle, and drag to the size you want.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_ELLIPSE" id="bm_id1817643" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Ellipse" id="bm_id3153771" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3153367" role="heading" level="2" l10n="U" oldref="20">Ellipse</paragraph>
- <table id="tbl_id3157894">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3156443" role="paragraph" l10n="E">
-<image id="img_id3153951" src="res/commandimagelist/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153951">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153367" role="heading" level="2" l10n="U"
+ oldref="20">Ellipse</paragraph>
+ <table id="tbl_id3157894">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156443" role="paragraph" l10n="E">
+<image id="img_id3153951" src="res/commandimagelist/sc_ellipse.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153951">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3159197" role="paragraph" l10n="U" oldref="21"><ahelp hid=".uno:Ellipse">Draws an oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159197" role="paragraph" l10n="U" oldref="21"><ahelp hid=".uno:Ellipse">Draws an oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_POLYGON_NOFILL" id="bm_id8487307" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Polygon_Unfilled" id="bm_id3146976" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3155308" role="heading" level="2" l10n="U" oldref="23">Polygon</paragraph>
- <section id="polytext">
-
- <table id="tbl_id3155366">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" l10n="E">
-<image id="img_id3152576" src="res/commandimagelist/sc_polygon_unfilled.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3152576">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3155308" role="heading" level="2" l10n="U"
+ oldref="23">Polygon</paragraph>
+ <section id="polytext">
+ <table id="tbl_id3155366">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" l10n="E">
+<image id="img_id3152576" src="res/commandimagelist/sc_polygon_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152576">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <section id="polytext2">
-
- <paragraph xml-lang="en-US" id="par_id3147214" role="paragraph" l10n="U" oldref="24"><ahelp hid=".uno:Polygon_Unfilled">Draws a line composed of a series of straight line segments. 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, double-click the starting point of the line.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="47">Hold the Shift key while drawing a polygon to position new points at 45 degree angles.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="48">The <link href="text/shared/01/05270000.xhp" name="Edit Points">Edit Points</link> mode enables you to interactively modify the individual points of the polygon.</paragraph>
-
+ </tablecell>
+ <tablecell>
+ <section id="polytext2">
+ <paragraph xml-lang="en-US" id="par_id3147214" role="paragraph" l10n="U" oldref="24"><ahelp hid=".uno:Polygon_Unfilled">Draws a line composed of a series of straight line segments. 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, double-click the starting point of the line.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="47">Hold the Shift key while drawing a polygon to position new points at 45 degree angles.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="48">The <link href="text/shared/01/05270000.xhp" name="Edit Points">Edit Points</link> mode enables you to interactively modify the individual points of the polygon.</paragraph>
+ </section>
+ </tablecell>
+ </tablerow>
+ </table>
+
</section>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
-
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_BEZIER_NOFILL" id="bm_id7112387" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Bezier_Unfilled" id="bm_id3149960" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3153279" role="heading" level="2" l10n="U" oldref="56">Curve</paragraph>
- <table id="tbl_id3150423">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="E">
-<image id="img_id3149379" src="res/commandimagelist/sc_bezier_unfilled.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3149379">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153279" role="heading" level="2" l10n="U"
+ oldref="56">Curve</paragraph>
+ <table id="tbl_id3150423">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="E">
+<image id="img_id3149379" src="res/commandimagelist/sc_bezier_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149379">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3148878" role="paragraph" l10n="U" oldref="57"><variable id="kurvetext"><ahelp hid=".uno:Bezier_Unfilled">Draws a smooth Bezier curve. Click where you want the curve to start, drag, release, and then move the pointer to where you want the curve to end and click. Move the pointer and click again to add a straight line segment to the curve. Double-click to finish drawing the curve. To create a closed shape, double click the starting point of the curve.</ahelp> The arc of the curve is determined by the distance you drag.
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148878" role="paragraph" l10n="U" oldref="57"><variable id="kurvetext"><ahelp hid=".uno:Bezier_Unfilled">Draws a smooth Bezier curve. Click where you want the curve to start, drag, release, and then move the pointer to where you want the curve to end and click. Move the pointer and click again to add a straight line segment to the curve. Double-click to finish drawing the curve. To create a closed shape, double click the starting point of the curve.</ahelp> The arc of the curve is determined by the distance you drag.
</variable></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_FREELINE_NOFILL" id="bm_id7473732" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Freeline_Unfilled" id="bm_id3150116" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3148587" role="heading" level="2" l10n="U" oldref="60">Freeform Line</paragraph>
- <table id="tbl_id3154015">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph" l10n="E">
-<image id="img_id3154510" src="res/commandimagelist/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3148587" role="heading" level="2" l10n="U"
+ oldref="60">Freeform Line</paragraph>
+ <table id="tbl_id3154015">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph" l10n="E">
+<image id="img_id3154510" src="res/commandimagelist/sc_linetoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154163" role="paragraph" l10n="U" oldref="61"><variable id="freihandtext"><ahelp hid=".uno:Freeline_Unfilled">Draws a freeform line where you drag in the current document. To end the line, release the mouse button. To draw a closed shape, release the mouse button near the starting point of the line.</ahelp>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154163" role="paragraph" l10n="U" oldref="61"><variable id="freihandtext"><ahelp hid=".uno:Freeline_Unfilled">Draws a freeform line where you drag in the current document. To end the line, release the mouse button. To draw a closed shape, release the mouse button near the starting point of the line.</ahelp>
</variable></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_ARC" id="bm_id8811603" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Arc" id="bm_id3154272" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3147259" role="heading" level="2" l10n="U" oldref="27">Arc</paragraph>
- <table id="tbl_id3148566">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3156359" role="paragraph" l10n="E">
-<image id="img_id3153710" src="res/commandimagelist/sc_arc.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3153710">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3147259" role="heading" level="2" l10n="U"
+ oldref="27">Arc</paragraph>
+ <table id="tbl_id3148566">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156359" role="paragraph" l10n="E">
+<image id="img_id3153710" src="res/commandimagelist/sc_arc.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153710">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3148482" role="paragraph" l10n="U" oldref="66"><ahelp hid=".uno:Arc">Draws an arc in the current document. To draw an arc, drag an oval to the size you want, and then click to define the starting point of the arc. Move your pointer to where you want to place the endpoint and click. You do not need to click on the oval. To draw an arc that is based on a circle, hold down Shift while you drag.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148482" role="paragraph" l10n="U" oldref="66"><ahelp hid=".uno:Arc">Draws an arc in the current document. To draw an arc, drag an oval to the size you want, and then click to define the starting point of the arc. Move your pointer to where you want to place the endpoint and click. You do not need to click on the oval. To draw an arc that is based on a circle, hold down Shift while you drag.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_PIE" id="bm_id8122704" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Pie" id="bm_id3152962" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3153924" role="heading" level="2" l10n="U" oldref="30">Ellipse Pie</paragraph>
- <table id="tbl_id3148914">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154363" role="paragraph" l10n="E">
-<image id="img_id3159186" src="res/commandimagelist/sc_pie.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3159186">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3153924" role="heading" level="2" l10n="U"
+ oldref="30">Ellipse Pie</paragraph>
+ <table id="tbl_id3148914">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154363" role="paragraph" l10n="E">
+<image id="img_id3159186" src="res/commandimagelist/sc_pie.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159186">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3156383" role="paragraph" l10n="CHG" oldref="67"><ahelp hid=".uno:Pie">Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down Shift while you drag.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156383" role="paragraph" l10n="CHG" oldref="67"><ahelp hid=".uno:Pie">Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down Shift while you drag.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_CIRCLECUT" id="bm_id485718" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:CircleCut" id="bm_id3145297" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3154964" role="heading" level="2" l10n="U" oldref="33">Circle Segment</paragraph>
- <table id="tbl_id3163807">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3151017" role="paragraph" l10n="E">
-<image id="img_id3147315" src="res/commandimagelist/sc_circlecut.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3147315">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3154964" role="heading" level="2" l10n="U"
+ oldref="33">Circle Segment</paragraph>
+ <table id="tbl_id3163807">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151017" role="paragraph" l10n="E">
+<image id="img_id3147315" src="res/commandimagelist/sc_circlecut.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147315">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="68"><ahelp hid=".uno:CircleCut">Draws a filled shape that is defined by the arc of a circle and a diameter line in the current document. To draw a circle segment, drag a circle to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the circle. To draw an ellipse segment, hold down Shift while you drag.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="68"><ahelp hid=".uno:CircleCut">Draws a filled shape that is defined by the arc of a circle and a diameter line in the current document. To draw a circle segment, drag a circle to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the circle. To draw an ellipse segment, hold down Shift while you drag.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_TEXT" id="bm_id8730699" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:DrawText" id="bm_id3147321" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U" oldref="36">Text</paragraph>
- <table id="tbl_id3150297">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145790" role="paragraph" l10n="E">
-<image id="img_id3155608" src="res/commandimagelist/sc_texttoolbox.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3155608">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
+ oldref="36">Text</paragraph>
+ <table id="tbl_id3150297">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145790" role="paragraph" l10n="E">
+<image id="img_id3155608" src="res/commandimagelist/sc_texttoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155608">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_TEXT_MARQUEE" id="bm_id9847340" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:Text_Marquee" id="bm_id3148877" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3158214" role="heading" level="2" l10n="U" oldref="62">Text Animation</paragraph>
- <table id="tbl_id3150979">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="E">
-<image id="img_id3152580" src="res/commandimagelist/sc_text_marquee.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3152580">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3158214" role="heading" level="2" l10n="U"
+ oldref="62">Text Animation</paragraph>
+ <table id="tbl_id3150979">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="E">
+<image id="img_id3152580" src="res/commandimagelist/sc_text_marquee.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152580">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150826" role="paragraph" l10n="U" oldref="63"><ahelp hid=".uno:Text_Marquee" visibility="hidden">Inserts animated text with horizontal text direction into the current document. Drag a text box, and then type or paste your text. To assign an animation effect, choose <emph>Format - Text - Text Animation</emph>.</ahelp><variable id="lauftext">Inserts animated text with horizontal text direction into the current document.
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150826" role="paragraph" l10n="U" oldref="63"><ahelp hid=".uno:Text_Marquee" visibility="hidden">Inserts animated text with horizontal text direction into the current document. Drag a text box, and then type or paste your text. To assign an animation effect, choose <emph>Format - Text - Text Animation</emph>.</ahelp><variable id="lauftext">Inserts animated text with horizontal text direction into the current document.
</variable></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
+ </tablecell>
+ </tablerow>
+ </table>
+
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_CAPTION" id="bm_id3229321" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:DrawCaption" id="bm_id3145616" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3149966" role="heading" level="2" l10n="U" oldref="41">Callouts</paragraph>
- <table id="tbl_id3153793">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153781" role="paragraph" l10n="E">
-<image id="img_id3145256" src="res/commandimagelist/sc_drawcaption.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3145256">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3149966" role="heading" level="2" l10n="U"
+ oldref="41">Callouts</paragraph>
+ <table id="tbl_id3153793">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153781" role="paragraph" l10n="E">
+<image id="img_id3145256" src="res/commandimagelist/sc_drawcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145256">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3151274" role="paragraph" l10n="U" oldref="70"><ahelp hid=".uno:DrawCaption">Draws a line that ends in a rectangular callout with horizontal text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
- <embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
- <embed href="text/shared/00/00000404.xhp#sybasicshapes"/>
- <embed href="text/shared/02/symbolshapes.xhp#symbolshapes"/>
- <embed href="text/shared/00/00000404.xhp#sysymbolshapes"/>
- <embed href="text/shared/02/blockarrows.xhp#blockarrows"/>
- <embed href="text/shared/00/00000404.xhp#syblockarrows"/>
- <embed href="text/shared/02/flowcharts.xhp#flowcharts"/>
- <embed href="text/shared/00/00000404.xhp#syflowcharts"/>
- <embed href="text/shared/02/callouts.xhp#callouts"/>
- <embed href="text/shared/00/00000404.xhp#sycallouts"/>
- <embed href="text/shared/02/stars.xhp#stars"/>
- <embed href="text/shared/00/00000404.xhp#systars"/>
- <paragraph xml-lang="en-US" id="par_idN10E50" role="heading" level="2" l10n="NEW"><link href="text/shared/01/05270000.xhp" name="Points">Points</link></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10E60" role="paragraph" l10n="NEW">Enables you to edit points on your drawing.</paragraph>
- <embed href="text/shared/02/fontwork.xhp#fontwork"/>
- <embed href="text/shared/00/00000404.xhp#syfontworkgallery"/>
- <paragraph xml-lang="en-US" id="par_idN10E75" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph>
- <embed href="text/shared/01/04140000.xhp#grafiktext"/>
- <embed href="text/shared/00/00000404.xhp#sygrafik"/>
- <paragraph xml-lang="en-US" id="par_idN10E95" role="heading" level="2" l10n="NEW"><link href="text/shared/3dsettings_toolbar.xhp">Extrusion On/Off</link></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10EA5" role="paragraph" l10n="NEW">Switches the 3D effects on and off for the selected objects.</paragraph>
- <embed href="text/shared/00/00000007.xhp#asia"/>
- <section id="legasia">
-
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151274" role="paragraph" l10n="U" oldref="70"><ahelp hid=".uno:DrawCaption">Draws a line that ends in a rectangular callout with horizontal text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
+ <embed href="text/shared/00/00000404.xhp#sybasicshapes"/>
+ <embed href="text/shared/02/symbolshapes.xhp#symbolshapes"/>
+ <embed href="text/shared/00/00000404.xhp#sysymbolshapes"/>
+ <embed href="text/shared/02/blockarrows.xhp#blockarrows"/>
+ <embed href="text/shared/00/00000404.xhp#syblockarrows"/>
+ <embed href="text/shared/02/flowcharts.xhp#flowcharts"/>
+ <embed href="text/shared/00/00000404.xhp#syflowcharts"/>
+ <embed href="text/shared/02/callouts.xhp#callouts"/>
+ <embed href="text/shared/00/00000404.xhp#sycallouts"/>
+ <embed href="text/shared/02/stars.xhp#stars"/>
+ <embed href="text/shared/00/00000404.xhp#systars"/>
+ <paragraph xml-lang="en-US" id="par_idN10E50" role="heading" level="2" l10n="NEW"><link href="text/shared/01/05270000.xhp" name="Points">Points</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10E60" role="paragraph" l10n="NEW">Enables you to edit points on your drawing.</paragraph>
+ <embed href="text/shared/02/fontwork.xhp#fontwork"/>
+ <embed href="text/shared/00/00000404.xhp#syfontworkgallery"/>
+ <paragraph xml-lang="en-US" id="par_idN10E75" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph>
+ <embed href="text/shared/01/04140000.xhp#grafiktext"/>
+ <embed href="text/shared/00/00000404.xhp#sygrafik"/>
+ <paragraph xml-lang="en-US" id="par_idN10E95" role="heading" level="2" l10n="NEW"><link href="text/shared/3dsettings_toolbar.xhp">Extrusion On/Off</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10EA5" role="paragraph" l10n="NEW">Switches the 3D effects on and off for the selected objects.</paragraph>
+ <embed href="text/shared/00/00000007.xhp#asia"/>
+ <section id="legasia">
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_CAPTION_VERTICAL" id="bm_id1434672" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:VerticalCaption" id="bm_id3151046" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3149735" role="heading" level="2" l10n="U" oldref="75">Vertical Callouts</paragraph>
- <table id="tbl_id3154585">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3156068" role="paragraph" l10n="E">
-<image id="img_id3154818" src="res/commandimagelist/sc_verticalcaption.png" width="0.1335inch" height="0.1335inch"><alt xml-lang="en-US" id="alt_id3154818">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3149735" role="heading" level="2" l10n="U"
+ oldref="75">Vertical Callouts</paragraph>
+ <table id="tbl_id3154585">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156068" role="paragraph" l10n="E">
+<image id="img_id3154818" src="res/commandimagelist/sc_verticalcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154818">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150492" role="paragraph" l10n="CHG" oldref="76"><ahelp hid=".uno:VerticalCaption">Draws a line that ends in a rectangular callout with vertical text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand. Only available when Asian language support is enabled.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
- <section id="textasia">
-
-
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150492" role="paragraph" l10n="CHG" oldref="76"><ahelp hid=".uno:VerticalCaption">Draws a line that ends in a rectangular callout with vertical text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand. Only available when Asian language support is enabled.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ <section id="textasia">
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_TEXT_VERTICAL" id="bm_id5245755" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:VerticalText" id="bm_id3163722" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3166437" role="heading" level="2" l10n="U" oldref="77">Vertical Text</paragraph>
- <table id="tbl_id3148751">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3146929" role="paragraph" l10n="E">
-<image id="img_id3154372" src="res/commandimagelist/sc_verticaltext.png" width="0.1701inch" height="0.1701inch"><alt xml-lang="en-US" id="alt_id3154372">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3166437" role="heading" level="2" l10n="U"
+ oldref="77">Vertical Text</paragraph>
+ <table id="tbl_id3148751">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146929" role="paragraph" l10n="E">
+<image id="img_id3154372" src="res/commandimagelist/sc_verticaltext.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154372">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3152989" role="paragraph" l10n="CHG" oldref="78"><ahelp hid=".uno:VerticalText">Draws a text box with vertical text direction where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a text box, and then type or paste your text. Only available when Asian language support is enabled.</ahelp></paragraph>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph" l10n="CHG" oldref="74"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Tips">Tips for working with the <emph>Drawing </emph>bar.</link></paragraph>
-
- </section>
- </body>
-</helpdocument>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152989" role="paragraph" l10n="CHG" oldref="78"><ahelp hid=".uno:VerticalText">Draws a text box with vertical text direction where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a text box, and then type or paste your text. Only available when Asian language support is enabled.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph" l10n="CHG" oldref="74"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Tips">Tips for working with the <emph>Drawing </emph>bar.</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index 12c4979e14..acf1e16f78 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.16.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,21 +72,19 @@
<tablerow>
<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.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
- </image></paragraph>
+<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="3">Form Controls</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<paragraph role="note" id="par_idN10B21" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/xforms.xhp">XML Form documents</link> (XForms) use the same controls.</paragraph>
<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="CHG" oldref="45">To create a form, open a document and use the Form Controls toolbar to add and define the form controls. If you want, you can also link the form to a database, so that you can use the controls to manipulate a database.</paragraph>
<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="46">When you create a form in an HTML document, you can use the form to send data over the Internet.</paragraph>
-<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>.</paragraph>
+<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>.</paragraph>
<paragraph role="heading" id="par_idN10C39" xml-lang="en-US" level="2" l10n="NEW">To add a control to a document</paragraph>
<list type="ordered">
<listitem>
@@ -120,8 +115,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
- </image></paragraph>
+<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<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>
@@ -143,15 +137,13 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
- </image></paragraph>
+<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<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>
</table>
-
</section>
<section id="Section16">
<bookmark xml-lang="en-US" branch="hid/SID_FM_EDIT" id="bm_id7355178" localize="false"/>
@@ -161,15 +153,13 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
- </image></paragraph>
+<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<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>
</table>
-
</section>
<section id="Section7">
<bookmark xml-lang="en-US" branch="hid/SID_FM_FORMATTEDFIELD" id="bm_id6606960" localize="false"/>
@@ -179,7 +169,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -198,7 +188,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -217,7 +207,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -236,7 +226,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -254,7 +244,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -272,7 +262,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -296,7 +286,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -319,7 +309,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -338,7 +328,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -442,7 +432,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -460,7 +450,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -479,7 +469,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -500,7 +490,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -519,7 +509,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -537,7 +527,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -555,7 +545,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -573,7 +563,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -592,7 +582,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -615,7 +605,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -634,7 +624,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -658,7 +648,7 @@
<tablerow>
<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.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/02/01170001.xhp b/helpcontent2/source/text/shared/02/01170001.xhp
index 89b0921fec..258fc477ff 100644
--- a/helpcontent2/source/text/shared/02/01170001.xhp
+++ b/helpcontent2/source/text/shared/02/01170001.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170001.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170002.xhp b/helpcontent2/source/text/shared/02/01170002.xhp
index 7a086ca03c..7d9c59156a 100755
--- a/helpcontent2/source/text/shared/02/01170002.xhp
+++ b/helpcontent2/source/text/shared/02/01170002.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170002.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170003.xhp b/helpcontent2/source/text/shared/02/01170003.xhp
index 7d98745f6b..14d2138244 100755..100644
--- a/helpcontent2/source/text/shared/02/01170003.xhp
+++ b/helpcontent2/source/text/shared/02/01170003.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01170003.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,17 +32,11 @@
<title xml-lang="en-US" id="tit">Special Tips for Date Fields</title>
<filename>/text/shared/02/01170003.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="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph>Tools - Options - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
- <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
- <embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
- </body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
+ <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document.</paragraph>
+<embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170004.xhp b/helpcontent2/source/text/shared/02/01170004.xhp
index a0a842c439..78e5b3b0dc 100755
--- a/helpcontent2/source/text/shared/02/01170004.xhp
+++ b/helpcontent2/source/text/shared/02/01170004.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170004.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -67,7 +64,7 @@
<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 (Mac: Command) key to select multiple entries.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
diff --git a/helpcontent2/source/text/shared/02/01170100.xhp b/helpcontent2/source/text/shared/02/01170100.xhp
index 8ce33995dc..771f450cc3 100644
--- a/helpcontent2/source/text/shared/02/01170100.xhp
+++ b/helpcontent2/source/text/shared/02/01170100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170100.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170101.xhp b/helpcontent2/source/text/shared/02/01170101.xhp
index 34d06943ec..b826137df6 100644
--- a/helpcontent2/source/text/shared/02/01170101.xhp
+++ b/helpcontent2/source/text/shared/02/01170101.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01170101.xhp,v $
- * $Revision: 1.19.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,682 +31,865 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0201170101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/02/01170101.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="allgemein">
-<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170101.xhp" name="General">General</link></paragraph><comment>UFI: had to remove all internal links to this file because all the targets vanished and no time to reinsert them all</comment><paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">This <emph>General </emph>tab enables you to define the general properties of a form control. These properties differ, depending on the control type. Not all of the following properties are available for every control.</paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00040501.xhp#controleigenschaftenallgemein"/>
-</section>
-<paragraph role="note" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="172">If you export the current form document to HTML format, the default control values are exported, not the current control values. Default values are determined - depending on the type of control - by the properties' Default value (for example, in text fields), Default status (for check boxes and option fields), and Default selection (for list boxes).</paragraph>
+ <topic id="textshared0201170101xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">General</title>
+ <filename>/text/shared/02/01170101.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="allgemein">
+ <paragraph xml-lang="en-US" id="hd_id3153681" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170101.xhp" name="General">General</link></paragraph><comment>UFI: had to remove all internal links to this file because all the targets vanished and no time to reinsert them all</comment>
+<paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="2">This <emph>General </emph>tab enables you to define the general properties of a form control. These properties differ, depending on the control type. Not all of the following properties are available for every control.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040501.xhp#controleigenschaftenallgemein"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3155342" role="note" l10n="CHG" oldref="172">If you export the current form document to HTML format, the default control values are exported, not the current control values. Default values are determined - depending on the type of control - by the properties' Default value (for example, in text fields), Default status (for check boxes and option fields), and Default selection (for list boxes).</paragraph>
<sort>
<section id="Section1">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ENABLED" id="bm_id3154897" localize="false"/><paragraph role="heading" id="hd_id3149734" xml-lang="en-US" level="2" l10n="U" oldref="13">Enabled</paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_PROP_ENABLED">If a control field has the property "Enabled" (Yes), the form user will be able to use the control field.</ahelp> If the property is disabled, it will not be enabled (No) and will be displayed in a gray color.</paragraph>
-</section>
-<section id="Section63">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINECOUNT" id="bm_id3146948" localize="false"/><paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="2" l10n="U" oldref="74">Line count</paragraph>
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="HID_PROP_LINECOUNT" visibility="hidden">Specifies how many lines should be displayed in the dropdown list. This setting is only active if you chose "Yes" in the "Dropdown" option.</ahelp>For combo boxes with the Dropdown property, you can specify how many lines should be displayed in the dropdown list. With control fields which do not have the Dropdown option, the line's display will be specified by the size of the control field and the font size.</paragraph>
-</section>
-<section id="Section62">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BUTTONTYPE" id="bm_id3156152" localize="false"/><paragraph role="heading" id="hd_id3153147" xml-lang="en-US" level="2" l10n="CHG" oldref="23">Action<comment>UFI: renamed from Button type to Action, see dba.features: Form navigation functionality for command buttons</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="HID_PROP_BUTTONTYPE" visibility="hidden">The Action property determines the action that occurs when you activate a button.</ahelp>You can use navigation actions to design your own database navigation buttons.</paragraph>
-<paragraph role="paragraph" id="par_id3152474" xml-lang="en-US" l10n="U" oldref="25">The following table describes the actions that you can assign to a button.</paragraph>
-<table id="tbl_id3148943">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147303" xml-lang="en-US" l10n="U" oldref="224">Action</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="225">Description</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154071" xml-lang="en-US" l10n="CHG" oldref="26">None</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153797" xml-lang="en-US" l10n="U" oldref="27">No action occurs.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154216" xml-lang="en-US" l10n="CHG" oldref="30">Submit form</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147228" xml-lang="en-US" l10n="CHG" oldref="31">Sends the data that is entered in other control fields of the current form to the address that is specified in <link href="text/shared/02/01170200.xhp" name="Form Properties">Form Properties</link> under <link href="text/shared/02/01170201.xhp" name="URL"><emph>URL</emph></link>. </paragraph>
-<paragraph role="tablecontent" id="par_idN107F7" xml-lang="en-US" l10n="NEW">Enter the URL into the form's data property "URL" text box when you export to a PDF file.<comment>UFI: see #i36574#</comment></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151041" xml-lang="en-US" l10n="CHG" oldref="28">Reset form</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155101" xml-lang="en-US" l10n="CHG" oldref="29">Resets the settings in other control fields to the predefined defaults (Default Status, Default Selection, Default Value).</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155431" xml-lang="en-US" l10n="CHG" oldref="32">Open document / web page</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="33">Opens the URL that is specified under <emph>URL</emph>. You can use <emph>Frame</emph> to specify the target frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN107FE" xml-lang="en-US" l10n="NEW">First record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10803" xml-lang="en-US" l10n="NEW">Moves the current form to the first record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10809" xml-lang="en-US" l10n="NEW">Previous record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1080E" xml-lang="en-US" l10n="NEW">Moves the current form to the previous record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10814" xml-lang="en-US" l10n="NEW">Next record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10819" xml-lang="en-US" l10n="NEW">Moves the current form to the next record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1081F" xml-lang="en-US" l10n="NEW">Last record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10824" xml-lang="en-US" l10n="NEW">Moves the current form to the last record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1082A" xml-lang="en-US" l10n="NEW">Save record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1082F" xml-lang="en-US" l10n="NEW">Saves the current record, if necessary.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10835" xml-lang="en-US" l10n="NEW">Undo data entry</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1083A" xml-lang="en-US" l10n="NEW">Reverses the changes in the current record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10840" xml-lang="en-US" l10n="NEW">New record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10845" xml-lang="en-US" l10n="NEW">Moves the current form to the insert row.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1084B" xml-lang="en-US" l10n="NEW">Delete record</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10850" xml-lang="en-US" l10n="NEW">Deletes the current record.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10856" xml-lang="en-US" l10n="NEW">Refresh form</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN1085B" xml-lang="en-US" l10n="NEW">Reloads the most recently saved version of the current form.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<section id="Section61">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DROPDOWN" id="bm_id3146148" localize="false"/><paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="2" l10n="U" oldref="19">Dropdown</paragraph>
-<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_PROP_DROPDOWN" visibility="hidden">Specifies whether the combo box should dropdown (Yes) or not (No).</ahelp>A control field with the dropdown property has an additional arrow button which opens the list of the existing form entries per mouse click. Under <emph>Line count</emph>, you can specify how many lines (or rows) should be displayed in the dropdown state. Combination fields can have the dropdown property.</paragraph>
-<paragraph role="paragraph" id="par_id3159198" xml-lang="en-US" l10n="U" oldref="182">Combo boxes that were inserted as columns in a table control are always dropdown as the default.</paragraph>
-</section>
-<section id="Section60">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ENABLED" id="bm_id3154897" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149734" role="heading" level="2" l10n="U"
+ oldref="13">Enabled</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_PROP_ENABLED">If a control field has the property "Enabled" (Yes), the form user will be able to use the control field.</ahelp> If the property is disabled, it will not be enabled (No) and will be displayed in a gray color.</paragraph>
+ </section>
+ <section id="Section63">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINECOUNT" id="bm_id3146948" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153320" role="heading" level="2" l10n="U"
+ oldref="74">Line count</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="75"><ahelp hid="HID_PROP_LINECOUNT" visibility="hidden">Specifies how many lines should be displayed in the dropdown list. This setting is only active if you chose "Yes" in the "Dropdown" option.</ahelp>For combo boxes with the Dropdown property, you can specify how many lines should be displayed in the dropdown list. With control fields which do not have the Dropdown option, the line's display will be specified by the size of the control field and the font size.</paragraph>
+ </section>
+ <section id="Section62">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BUTTONTYPE" id="bm_id3156152" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153147" role="heading" level="2" l10n="CHG"
+ oldref="23">Action<comment>UFI: renamed from Button type to Action, see dba.features: Form navigation functionality for command buttons</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149415" role="paragraph" l10n="CHG" oldref="24"><ahelp hid="HID_PROP_BUTTONTYPE" visibility="hidden">The Action property determines the action that occurs when you activate a button.</ahelp>You can use navigation actions to design your own database navigation buttons.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152474" role="paragraph" l10n="U" oldref="25">The following table describes the actions that you can assign to a button.</paragraph>
+ <table id="tbl_id3148943">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147303" role="tablehead" l10n="U" oldref="224">Action</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154388" role="tablehead" l10n="U" oldref="225">Description</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154071" role="tablecontent" l10n="CHG" oldref="26">None</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153797" role="tablecontent" l10n="U" oldref="27">No action occurs.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154216" role="tablecontent" l10n="CHG" oldref="30">Submit form</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147228" role="tablecontent" l10n="CHG" oldref="31">Sends the data that is entered in other control fields of the current form to the address that is specified in <link href="text/shared/02/01170200.xhp" name="Form Properties">Form Properties</link> under <link href="text/shared/02/01170201.xhp" name="URL"><emph>URL</emph></link>. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107F7" role="tablecontent" l10n="NEW">Enter the URL into the form's data property "URL" text box when you export to a PDF file.<comment>UFI: see #i36574#</comment></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151041" role="tablecontent" l10n="CHG" oldref="28">Reset form</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155101" role="tablecontent" l10n="CHG" oldref="29">Resets the settings in other control fields to the predefined defaults (Default Status, Default Selection, Default Value).</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155431" role="tablecontent" l10n="CHG" oldref="32">Open document / web page</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150010" role="tablecontent" l10n="U" oldref="33">Opens the URL that is specified under <emph>URL</emph>. You can use <emph>Frame</emph> to specify the target frame.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107FE" role="tablecontent" l10n="NEW">First record</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10803" role="tablecontent" l10n="NEW">Moves the current form to the first record.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10809" role="tablecontent" l10n="NEW">Previous record</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1080E" role="tablecontent" l10n="NEW">Moves the current form to the previous record.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10814" role="tablecontent" l10n="NEW">Next record</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10819" role="tablecontent" l10n="NEW">Moves the current form to the next record.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1081F" role="tablecontent" l10n="NEW">Last record</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10824" role="tablecontent" l10n="NEW">Moves the current form to the last record.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1082A" role="tablecontent" l10n="NEW">Save record</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1082F" role="tablecontent" l10n="NEW">Saves the current record, if necessary.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10835" role="tablecontent" l10n="NEW">Undo data entry</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1083A" role="tablecontent" l10n="NEW">Reverses the changes in the current record.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10840" role="tablecontent" l10n="NEW">New record</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10845" role="tablecontent" l10n="NEW">Moves the current form to the insert row.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1084B" role="tablecontent" l10n="NEW">Delete record</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10850" role="tablecontent" l10n="NEW">Deletes the current record.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10856" role="tablecontent" l10n="NEW">Refresh form</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1085B" role="tablecontent" l10n="NEW">Reloads the most recently saved version of the current form.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ <section id="Section61">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DROPDOWN" id="bm_id3146148" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154638" role="heading" level="2" l10n="U"
+ oldref="19">Dropdown</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_PROP_DROPDOWN" visibility="hidden">Specifies whether the combo box should dropdown (Yes) or not (No).</ahelp>A control field with the dropdown property has an additional arrow button which opens the list of the existing form entries per mouse click. Under <emph>Line count</emph>, you can specify how many lines (or rows) should be displayed in the dropdown state. Combination fields can have the dropdown property.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159198" role="paragraph" l10n="U" oldref="182">Combo boxes that were inserted as columns in a table control are always dropdown as the default.</paragraph>
+ </section>
+ <section id="Section60">
<bookmark xml-lang="en-US" branch="hid/HID_PROP_ALIGN" id="bm_id3150116" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGEPOSITION" id="bm_id2524491" localize="false"/><paragraph role="heading" id="hd_id3153140" xml-lang="en-US" level="2" l10n="CHG" oldref="11">Alignment / Graphics alignment</paragraph>
-<paragraph role="paragraph" id="par_id3151281" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="HID_PROP_ALIGN" visibility="hidden">Specifies the alignment option for text or graphics that are used on a control.</ahelp>The alignment options are left-aligned, right-aligned, and centered. These options are available for the following elements:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN109DD" xml-lang="en-US" l10n="NEW">Title of Label fields</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN109E1" xml-lang="en-US" l10n="NEW">Content of text fields</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN109E5" xml-lang="en-US" l10n="NEW">Content of table fields in the columns of a table control</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN109E9" xml-lang="en-US" l10n="NEW">Graphics or text that are used in buttons</paragraph>
-<paragraph role="note" id="par_idN109EC" xml-lang="en-US" l10n="NEW">The <emph>Alignment</emph> option for buttons is called <emph>Graphics alignment</emph>.</paragraph>
-</listitem>
-</list>
-</section>
-<section id="Section59">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_AUTOCOMPLETE" id="bm_id3154790" localize="false"/><paragraph role="heading" id="hd_id3151073" xml-lang="en-US" level="2" l10n="CHG" oldref="76">AutoFill</paragraph>
-<paragraph role="paragraph" id="par_id3152375" xml-lang="en-US" l10n="CHG" oldref="77"><ahelp hid="HID_PROP_AUTOCOMPLETE" visibility="hidden">Assigns the AutoFill function to a combo box.</ahelp>The AutoFill function displays a list of previous entries after you start to type an entry.<comment>UFI: changed AutoComplete to AutoFill (got changed by error in the UI, so we stay with it now, according to FS)</comment></paragraph>
-</section>
-<section id="Section58">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLLABEL" id="bm_id3151053" localize="false"/><paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="216">Label field</paragraph>
-<paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="217"><ahelp hid="HID_PROP_CONTROLLABEL">Specifies the source for the label of the control.</ahelp> The text of the label field will be used instead of the name of a database field. For example, in the <emph>Filter Navigator</emph>, <emph>Search</emph> dialog, and as a column name in the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="231">To define one character of the label as a mnemonic, so that the user can access this control by pressing the character on the keyboard, insert a tilde (~) character in front of the character in the label.</paragraph>
-<paragraph role="paragraph" id="par_id3154502" xml-lang="en-US" l10n="U" oldref="218">Only the text of a group frame can be used as the label field when using radio buttons. This text applies to all of the radio buttons of the same group.</paragraph>
-<paragraph role="paragraph" id="par_id3148587" xml-lang="en-US" l10n="CHG" oldref="219">If you click on the <emph>...</emph> button next to the text field, you will see the <emph>Label Field Selection</emph> dialog. Select a label from the list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1" id="bm_id3156179" localize="false"/><paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="CHG" oldref="220"><ahelp hid="PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1">Check the <emph>No assignment </emph>box to remove the link between a control and the assigned label field.</ahelp></paragraph>
-</section>
-<section id="Section57">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_WIDTH" id="bm_id3156356" localize="false"/><paragraph role="heading" id="hd_id3148834" xml-lang="en-US" level="2" l10n="U" oldref="142">Width</paragraph>
-<paragraph role="paragraph" id="par_id3148566" xml-lang="en-US" l10n="CHG" oldref="143"><ahelp hid="HID_PROP_WIDTH" visibility="hidden">Sets the column width in the table control field.</ahelp>Sets the column width in the table control field in the units that are specified in the %PRODUCTNAME module options. If you want, you can enter a value followed by a valid measurement unit, for example, 2 cm.</paragraph>
-</section>
-<section id="Section56">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT" id="bm_id2982573" localize="false"/><paragraph role="heading" id="hd_id1877803" xml-lang="en-US" level="2" l10n="NEW">Repeat<comment>UFI: see spec spinbutton_form_control.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id9863277" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_PROP_REPEAT">Specifies if the action of a control such as a spin button repeats when you click the control and hold the mouse button down.</ahelp></paragraph>
-</section>
-<section id="Section55">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/><paragraph role="heading" id="hd_id9827875" xml-lang="en-US" level="2" l10n="NEW">Delay<comment>UFI: see http://dba.openoffice.org/specifications/forms/scrollbar_form_control.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id6092715" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_PROP_REPEAT_DELAY">Specifies the delay in milliseconds between repeating events.</ahelp> A repeating event occurs when you click an arrow button or the background of a scrollbar, or one of the record navigation buttons of a Navigation Bar, and you keep the mouse button pressed for some time. You can enter a value followed by a valid time unit, for example, 2 s or 500 ms.</paragraph>
-</section>
-<section id="Section54">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_RECORDMARKER" id="bm_id3154272" localize="false"/><paragraph role="heading" id="hd_id3145164" xml-lang="en-US" level="2" l10n="U" oldref="214">Record marker</paragraph>
-<paragraph role="paragraph" id="par_id3147257" xml-lang="en-US" l10n="U" oldref="215"><ahelp hid="HID_PROP_RECORDMARKER">Specifies whether the first column is displayed with row labels, in which the current record is marked by an arrow.</ahelp></paragraph>
-</section>
-<section id="Section53">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEFORMAT" id="bm_id3158419" localize="false"/><paragraph role="heading" id="hd_id3151019" xml-lang="en-US" level="2" l10n="U" oldref="82">Date format</paragraph>
-<paragraph role="paragraph" id="par_id3152971" xml-lang="en-US" l10n="U" oldref="83"><ahelp hid="HID_PROP_DATEFORMAT" visibility="hidden">Here, you can determine the format you want for the date readout.</ahelp>With date fields you can determine the format for the date readout.</paragraph>
-<paragraph role="note" id="par_id3151356" xml-lang="en-US" l10n="U" oldref="84"><variable id="hinweis">All format fields (date, time, currency, numeric) are formatted automatically in the selected format as soon as you leave them regardless of how you entered the input.
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGEPOSITION" id="bm_id2524491" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153140" role="heading" level="2" l10n="CHG"
+ oldref="11">Alignment / Graphics alignment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151281" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="HID_PROP_ALIGN" visibility="hidden">Specifies the alignment option for text or graphics that are used on a control.</ahelp>The alignment options are left-aligned, right-aligned, and centered. These options are available for the following elements:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN109DD" role="paragraph" l10n="NEW">Title of Label fields</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN109E1" role="paragraph" l10n="NEW">Content of text fields</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN109E5" role="paragraph" l10n="NEW">Content of table fields in the columns of a table control</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN109E9" role="paragraph" l10n="NEW">Graphics or text that are used in buttons</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN109EC" role="note" l10n="NEW">The <emph>Alignment</emph> option for buttons is called <emph>Graphics alignment</emph>.</paragraph>
+ </listitem>
+ </list>
+ </section>
+ <section id="Section59">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_AUTOCOMPLETE" id="bm_id3154790" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151073" role="heading" level="2" l10n="CHG"
+ oldref="76">AutoFill</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152375" role="paragraph" l10n="CHG" oldref="77"><ahelp hid="HID_PROP_AUTOCOMPLETE" visibility="hidden">Assigns the AutoFill function to a combo box.</ahelp>The AutoFill function displays a list of previous entries after you start to type an entry.<comment>UFI: changed AutoComplete to AutoFill (got changed by error in the UI, so we stay with it now, according to FS)</comment></paragraph>
+ </section>
+ <section id="Section58">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLLABEL" id="bm_id3151053" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154729" role="heading" level="2" l10n="U"
+ oldref="216">Label field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145801" role="paragraph" l10n="CHG" oldref="217"><ahelp hid="HID_PROP_CONTROLLABEL">Specifies the source for the label of the control.</ahelp> The text of the label field will be used instead of the name of a database field. For example, in the <emph>Filter Navigator</emph>, <emph>Search</emph> dialog, and as a column name in the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="231">To define one character of the label as a mnemonic, so that the user can access this control by pressing the character on the keyboard, insert a tilde (~) character in front of the character in the label.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154502" role="paragraph" l10n="U" oldref="218">Only the text of a group frame can be used as the label field when using radio buttons. This text applies to all of the radio buttons of the same group.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148587" role="paragraph" l10n="CHG" oldref="219">If you click on the <emph>...</emph> button next to the text field, you will see the <emph>Label Field Selection</emph> dialog. Select a label from the list.</paragraph>
+<!-- removed HID PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1 -->
+<paragraph xml-lang="en-US" id="par_id3154512" role="paragraph" l10n="CHG" oldref="220"><ahelp hid="PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1">Check the <emph>No assignment </emph>box to remove the link between a control and the assigned label field.</ahelp></paragraph>
+ </section>
+ <section id="Section57">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WIDTH" id="bm_id3156356" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148834" role="heading" level="2" l10n="U"
+ oldref="142">Width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148566" role="paragraph" l10n="CHG" oldref="143"><ahelp hid="HID_PROP_WIDTH" visibility="hidden">Sets the column width in the table control field.</ahelp>Sets the column width in the table control field in the units that are specified in the %PRODUCTNAME module options. If you want, you can enter a value followed by a valid measurement unit, for example, 2 cm.</paragraph>
+ </section>
+ <section id="Section56">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT" id="bm_id2982573" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1877803" role="heading" level="2" l10n="NEW">Repeat<comment>UFI: see spec spinbutton_form_control.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9863277" role="paragraph" l10n="CHG"><ahelp hid="HID_PROP_REPEAT">Specifies if the action of a control such as a spin button repeats when you click the control and hold the mouse button down.</ahelp></paragraph>
+ </section>
+ <section id="Section55">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9827875" role="heading" level="2" l10n="NEW">Delay</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6092715" role="paragraph" l10n="CHG"><ahelp hid="HID_PROP_REPEAT_DELAY">Specifies the delay in milliseconds between repeating events.</ahelp> A repeating event occurs when you click an arrow button or the background of a scrollbar, or one of the record navigation buttons of a Navigation Bar, and you keep the mouse button pressed for some time. You can enter a value followed by a valid time unit, for example, 2 s or 500 ms.</paragraph>
+ </section>
+ <section id="Section54">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_RECORDMARKER" id="bm_id3154272" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145164" role="heading" level="2" l10n="U"
+ oldref="214">Record marker</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147257" role="paragraph" l10n="U" oldref="215"><ahelp hid="HID_PROP_RECORDMARKER">Specifies whether the first column is displayed with row labels, in which the current record is marked by an arrow.</ahelp></paragraph>
+ </section>
+ <section id="Section53">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEFORMAT" id="bm_id3158419" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151019" role="heading" level="2" l10n="U"
+ oldref="82">Date format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152971" role="paragraph" l10n="U" oldref="83"><ahelp hid="HID_PROP_DATEFORMAT" visibility="hidden">Here, you can determine the format you want for the date readout.</ahelp>With date fields you can determine the format for the date readout.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151356" role="note" l10n="U" oldref="84"><variable id="hinweis">All format fields (date, time, currency, numeric) are formatted automatically in the selected format as soon as you leave them regardless of how you entered the input.
</variable></paragraph>
-</section>
-<section id="Section52">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPIN" id="bm_id3145642" localize="false"/><paragraph role="heading" id="hd_id3156054" xml-lang="en-US" level="2" l10n="U" oldref="87">Spin Button</paragraph>
-<paragraph role="paragraph" id="par_id3154360" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid="HID_PROP_SPIN" visibility="hidden">The "Yes" option transforms the control field into a spin button, where corresponding arrow buttons are added.</ahelp>Numerical fields, currency fields, date and time fields can be introduced as spin buttons in the form.</paragraph>
-</section>
-<section id="Section51">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TRISTATE" id="bm_id3150386" localize="false"/><paragraph role="heading" id="hd_id3159268" xml-lang="en-US" level="2" l10n="U" oldref="173">Tristate</paragraph>
-<paragraph role="paragraph" id="par_id3154254" xml-lang="en-US" l10n="U" oldref="174"><ahelp hid="HID_PROP_TRISTATE">Specifies whether a check box can also represent ZERO values of a linked database apart from the TRUE and FALSE values.</ahelp> This function is only available if the database accepts three states: TRUE, FALSE and ZERO.</paragraph>
-<paragraph role="note" id="par_id3156712" xml-lang="en-US" l10n="U" oldref="183">The<emph> Tristate </emph>property is only defined for database forms, not for HTML forms.</paragraph>
-</section>
-<section id="Section50">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_PRINTABLE" id="bm_id3145228" localize="false"/><paragraph role="heading" id="hd_id3147324" xml-lang="en-US" level="2" l10n="U" oldref="89">Print</paragraph>
-<paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="90"><ahelp hid="HID_PROP_PRINTABLE">Specifies whether you want the control field to appear in a document's printout.</ahelp></paragraph>
-</section>
-<section id="Section49">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_EDITMASK" id="bm_id3147001" localize="false"/><paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="2" l10n="U" oldref="91">Edit mask</paragraph>
-<paragraph role="paragraph" id="par_id3150938" xml-lang="en-US" l10n="U" oldref="92"><ahelp hid="HID_PROP_EDITMASK" visibility="hidden">Defines the edit mask. By specifying a character code you can determine what the user can enter in the control field.</ahelp>By specifying the character code in pattern fields, you can determine what the user can enter in the pattern field.</paragraph>
-<paragraph role="paragraph" id="par_id3148479" xml-lang="en-US" l10n="U" oldref="184">The length of the edit mask determines the number of the possible input positions. If the user enters characters that do not correspond to the edit mask, the input is rejected when the user leaves the field. You can enter the following characters to define the edit mask:</paragraph>
-<table id="tbl_id3155607">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3147130" xml-lang="en-US" l10n="U" oldref="93"> Character </paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3149815" xml-lang="en-US" l10n="U" oldref="94">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153774" xml-lang="en-US" l10n="U" oldref="95">L</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154660" xml-lang="en-US" l10n="U" oldref="96">A text constant. This position cannot be edited. The character is displayed at the corresponding position of the Literal Mask.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151346" xml-lang="en-US" l10n="U" oldref="97">a</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150829" xml-lang="en-US" l10n="U" oldref="98">The characters a-z and A-Z can be entered. Capital characters are not converted to lowercase characters.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="99">A</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156140" xml-lang="en-US" l10n="U" oldref="100">The characters A-Z can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153703" xml-lang="en-US" l10n="U" oldref="101">c</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148873" xml-lang="en-US" l10n="U" oldref="102">The characters a-z, A-Z, and 0-9 can be entered. Capital characters are not converted to lowercase characters.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153781" xml-lang="en-US" l10n="U" oldref="103">C</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="104">The characters A-Z and 0-9 can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="105">N</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150979" xml-lang="en-US" l10n="U" oldref="106">Only the characters 0-9 can be entered.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152769" xml-lang="en-US" l10n="U" oldref="107">x</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="108">All printable characters can be entered.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150517" xml-lang="en-US" l10n="U" oldref="109">X</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150429" xml-lang="en-US" l10n="U" oldref="110">All printable characters can be entered. If a lowercase letter is used, it is automatically converted to a capital letter.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3155081" xml-lang="en-US" l10n="CHG" oldref="111">For the literal mask "__.__.2000", for example, define the "NNLNNLLLLL" edit mask so that the user can only enter four digits when entering a date.</paragraph>
-</section>
-<section id="Section48">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRICTFORMAT" id="bm_id3145588" localize="false"/><paragraph role="heading" id="hd_id3154818" xml-lang="en-US" level="2" l10n="U" oldref="112">Strict format</paragraph>
-<paragraph role="paragraph" id="par_id3148750" xml-lang="en-US" l10n="U" oldref="113">You can have a format check with control fields that accept formatted contents (date, time, and so on). <ahelp hid="HID_PROP_STRICTFORMAT">If the strict format function is activated (Yes), only the allowed characters are accepted.</ahelp> For example, in a date field, only numbers or date delimiters are accepted; all alphabet entries typed with your keyboard are ignored.</paragraph>
-</section>
-<section id="targetframe">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_FRAME" id="bm_id3149491" localize="false"/><paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="2" l10n="CHG" oldref="60">Frame</paragraph>
-<paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="HID_PROP_TARGET_FRAME" visibility="hidden">Specifies the target frame to display the document that is opened by the "Open document / web page" action.</ahelp>You can also specify the target frame to display a <emph>URL</emph> that you open when you click a button that has been assigned the Open document or web page action).</paragraph>
-<section id="fuerformulareigenschaft">
-<paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="U" oldref="62">If you click the field, you can select an option from the list that specifies into which frame the next document should be loaded. The following possibilities exist:</paragraph>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148814" xml-lang="en-US" l10n="U" oldref="226">Entry</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3155500" xml-lang="en-US" l10n="U" oldref="227">Meaning</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="U" oldref="63">_blank</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146770" xml-lang="en-US" l10n="U" oldref="64">The next document is created in a new empty frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149771" xml-lang="en-US" l10n="U" oldref="65">_parent</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159143" xml-lang="en-US" l10n="U" oldref="66">The next document is created in a parent frame. If no parent exists, the document is created in the same frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151374" xml-lang="en-US" l10n="U" oldref="67">_self</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148600" xml-lang="en-US" l10n="U" oldref="68">The next document is created in the same frame.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153067" xml-lang="en-US" l10n="U" oldref="69">_top</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149174" xml-lang="en-US" l10n="U" oldref="70">The next document is created in a top-level window, that is, in the highest frame of the hierarchy; if the current frame is already a top window, the document is created in the current frame.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<paragraph role="note" id="par_id3156172" xml-lang="en-US" l10n="CHG" oldref="185">The Frame property is relevant for HTML forms, but not for database forms.</paragraph>
-</section>
-<section id="Section46">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGE_URL" id="bm_id3156191" localize="false"/><paragraph role="heading" id="hd_id3146950" xml-lang="en-US" level="2" l10n="U" oldref="114">Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3154344" xml-lang="en-US" l10n="U" oldref="115">An image button has a <emph>Graphics </emph>property. <ahelp hid="HID_PROP_IMAGE_URL">The<emph> Graphics</emph> property specifies the graphic's path and file name that you want to have displayed on the button.</ahelp> If you select the graphic file with the <emph>...</emph> button, the path and file name will be automatically included in the text box.</paragraph>
-</section>
-<section id="Section44">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPTEXT" id="bm_id3151131" localize="false"/><paragraph role="heading" id="hd_id3150530" xml-lang="en-US" level="2" l10n="U" oldref="208">Help text</paragraph>
-<paragraph role="paragraph" id="par_id3156310" xml-lang="en-US" l10n="U" oldref="209"><ahelp hid="HID_PROP_HELPTEXT">Provides the option of entering a help text that will be displayed as a tip on the control.</ahelp> The tip shows the text in user mode when the mouse is moved over the control.</paragraph>
-<paragraph role="paragraph" id="par_id3153287" xml-lang="en-US" l10n="U" oldref="210">For URL type buttons, the help text appears as the extended tip instead of the URL address entered under URL.</paragraph>
-</section>
-<section id="Section43">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPURL" id="bm_id3156336" localize="false"/><paragraph role="heading" id="hd_id3145377" xml-lang="en-US" level="2" l10n="U" oldref="212">Help URL</paragraph>
-<paragraph role="paragraph" id="par_id3148649" xml-lang="en-US" l10n="U" oldref="213"><ahelp hid="HID_PROP_HELPURL">Specifies a batch label in URL spelling which refers to a help document and which can be called with the help of the control field.</ahelp> The help for the control field help can be opened if the focus is positioned on the control field and the user presses F1.</paragraph>
-</section>
-<section id="Section42">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BACKGROUNDCOLOR" id="bm_id3149545" localize="false"/><paragraph role="heading" id="hd_id3152541" xml-lang="en-US" level="2" l10n="U" oldref="3">Background color</paragraph>
-<paragraph role="paragraph" id="par_id3155073" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_PROP_BACKGROUNDCOLOR" visibility="hidden">Sets the background color of the control field.</ahelp>A background color is available for most control fields. If you click on <emph>Background color</emph>, a list will open which enables you to select among various colors. The "Standard" option adopts the system setting. If the desired color is not listed, click the <emph>...</emph> button to define a color in the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog.</paragraph>
-</section>
-<section id="Section41">
+ </section>
+ <section id="Section52">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPIN" id="bm_id3145642" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156054" role="heading" level="2" l10n="U"
+ oldref="87">Spin Button</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="88"><ahelp hid="HID_PROP_SPIN" visibility="hidden">The "Yes" option transforms the control field into a spin button, where corresponding arrow buttons are added.</ahelp>Numerical fields, currency fields, date and time fields can be introduced as spin buttons in the form.</paragraph>
+ </section>
+ <section id="Section51">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TRISTATE" id="bm_id3150386" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159268" role="heading" level="2" l10n="U"
+ oldref="173">Tristate</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154254" role="paragraph" l10n="U" oldref="174"><ahelp hid="HID_PROP_TRISTATE">Specifies whether a check box can also represent ZERO values of a linked database apart from the TRUE and FALSE values.</ahelp> This function is only available if the database accepts three states: TRUE, FALSE and ZERO.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156712" role="note" l10n="U" oldref="183">The<emph> Tristate </emph>property is only defined for database forms, not for HTML forms.</paragraph>
+ </section>
+ <section id="Section50">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_PRINTABLE" id="bm_id3145228" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147324" role="heading" level="2" l10n="U"
+ oldref="89">Printable</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="90"><ahelp hid="HID_PROP_PRINTABLE">Specifies whether you want the control field to appear in a document's printout.</ahelp></paragraph>
+ </section>
+ <section id="Section88">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_POSITIONX" id="bm_id3145229" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153889" role="heading" level="2" l10n="NEW">PositionX</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200921153823" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the X position of the control, relative to the anchor.</ahelp></paragraph>
+ </section>
+ <section id="Section87">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_POSITIONY" id="bm_id3145230" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153814" role="heading" level="2" l10n="NEW">PositionY</paragraph>
+ <paragraph xml-lang="en-US" id="par_id040920092115387" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the Y position of the control, relative to the anchor.</ahelp></paragraph>
+ </section>
+ <section id="Section86">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ANCHOR_TYPE" id="bm_id3145231" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153833" role="heading" level="2" l10n="NEW">Anchor</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200921153855" role="paragraph" l10n="NEW"><ahelp hid=".">Defines where the control will be anchored.</ahelp></paragraph>
+ </section>
+ <section id="Section85">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WIDTH" id="bm_id3145238" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153836" role="heading" level="2" l10n="NEW">Width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200921153918" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the width of the control.</ahelp></paragraph>
+ </section>
+ <section id="Section84">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HEIGHT" id="bm_id3145248" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200921153980" role="heading" level="2" l10n="NEW">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200921153919" role="paragraph" l10n="NEW"><ahelp hid=".">Defines the height of the control.</ahelp></paragraph>
+ </section>
+ <section id="Section49">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_EDITMASK" id="bm_id3147001" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155962" role="heading" level="2" l10n="U"
+ oldref="91">Edit mask</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150938" role="paragraph" l10n="U" oldref="92"><ahelp hid="HID_PROP_EDITMASK" visibility="hidden">Defines the edit mask. By specifying a character code you can determine what the user can enter in the control field.</ahelp>By specifying the character code in pattern fields, you can determine what the user can enter in the pattern field.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148479" role="paragraph" l10n="U" oldref="184">The length of the edit mask determines the number of the possible input positions. If the user enters characters that do not correspond to the edit mask, the input is rejected when the user leaves the field. You can enter the following characters to define the edit mask:</paragraph>
+ <table id="tbl_id3155607">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147130" role="tablehead" l10n="U" oldref="93"> Character </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149815" role="tablehead" l10n="U" oldref="94">Meaning</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153774" role="tablecontent" l10n="U" oldref="95">L</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154660" role="tablecontent" l10n="U" oldref="96">A text constant. This position cannot be edited. The character is displayed at the corresponding position of the Literal Mask.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151346" role="tablecontent" l10n="U" oldref="97">a</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150829" role="tablecontent" l10n="U" oldref="98">The characters a-z and A-Z can be entered. Capital characters are not converted to lowercase characters.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149207" role="tablecontent" l10n="U" oldref="99">A</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156140" role="tablecontent" l10n="U" oldref="100">The characters A-Z can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153703" role="tablecontent" l10n="U" oldref="101">c</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148873" role="tablecontent" l10n="U" oldref="102">The characters a-z, A-Z, and 0-9 can be entered. Capital characters are not converted to lowercase characters.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153781" role="tablecontent" l10n="U" oldref="103">C</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154574" role="tablecontent" l10n="U" oldref="104">The characters A-Z and 0-9 can be entered. If a lowercase letter is entered, it is automatically converted to a capital letter</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153268" role="tablecontent" l10n="U" oldref="105">N</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150979" role="tablecontent" l10n="U" oldref="106">Only the characters 0-9 can be entered.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152769" role="tablecontent" l10n="U" oldref="107">x</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156064" role="tablecontent" l10n="U" oldref="108">All printable characters can be entered.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150517" role="tablecontent" l10n="U" oldref="109">X</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150429" role="tablecontent" l10n="U" oldref="110">All printable characters can be entered. If a lowercase letter is used, it is automatically converted to a capital letter.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="par_id3155081" role="paragraph" l10n="CHG" oldref="111">For the literal mask "__.__.2000", for example, define the "NNLNNLLLLL" edit mask so that the user can only enter four digits when entering a date.</paragraph>
+ </section>
+ <section id="Section48">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRICTFORMAT" id="bm_id3145588" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154818" role="heading" level="2" l10n="U"
+ oldref="112">Strict format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148750" role="paragraph" l10n="U" oldref="113">You can have a format check with control fields that accept formatted contents (date, time, and so on). <ahelp hid="HID_PROP_STRICTFORMAT">If the strict format function is activated (Yes), only the allowed characters are accepted.</ahelp> For example, in a date field, only numbers or date delimiters are accepted; all alphabet entries typed with your keyboard are ignored.</paragraph>
+ </section>
+ <section id="targetframe">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_FRAME" id="bm_id3149491" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147167" role="heading" level="2" l10n="CHG"
+ oldref="60">Frame</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154991" role="paragraph" l10n="CHG" oldref="61"><ahelp hid="HID_PROP_TARGET_FRAME" visibility="hidden">Specifies the target frame to display the document that is opened by the "Open document / web page" action.</ahelp>You can also specify the target frame to display a <emph>URL</emph> that you open when you click a button that has been assigned the Open document or web page action).</paragraph>
+ <section id="fuerformulareigenschaft">
+ <paragraph xml-lang="en-US" id="par_id3150521" role="paragraph" l10n="U" oldref="62">If you click the field, you can select an option from the list that specifies into which frame the next document should be loaded. The following possibilities exist:</paragraph>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148814" role="tablehead" l10n="U" oldref="226">Entry</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155500" role="tablehead" l10n="U" oldref="227">Meaning</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149408" role="paragraph" l10n="U" oldref="63">_blank</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146770" role="paragraph" l10n="U" oldref="64">The next document is created in a new empty frame.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149771" role="paragraph" l10n="U" oldref="65">_parent</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159143" role="paragraph" l10n="U" oldref="66">The next document is created in a parent frame. If no parent exists, the document is created in the same frame.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151374" role="paragraph" l10n="U" oldref="67">_self</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148600" role="paragraph" l10n="U" oldref="68">The next document is created in the same frame.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153067" role="paragraph" l10n="U" oldref="69">_top</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149174" role="paragraph" l10n="U" oldref="70">The next document is created in a top-level window, that is, in the highest frame of the hierarchy; if the current frame is already a top window, the document is created in the current frame.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156172" role="note" l10n="CHG" oldref="185">The Frame property is relevant for HTML forms, but not for database forms.</paragraph>
+ </section>
+ <section id="Section46">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_IMAGE_URL" id="bm_id3156191" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146950" role="heading" level="2" l10n="U"
+ oldref="114">Graphics</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154344" role="paragraph" l10n="U" oldref="115">An image button has a <emph>Graphics </emph>property. <ahelp hid="HID_PROP_IMAGE_URL">The<emph> Graphics</emph> property specifies the graphic's path and file name that you want to have displayed on the button.</ahelp> If you select the graphic file with the <emph>...</emph> button, the path and file name will be automatically included in the text box.</paragraph>
+ </section>
+ <section id="Section44">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPTEXT" id="bm_id3151131" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150530" role="heading" level="2" l10n="U"
+ oldref="208">Help text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156310" role="paragraph" l10n="U" oldref="209"><ahelp hid="HID_PROP_HELPTEXT">Provides the option of entering a help text that will be displayed as a tip on the control.</ahelp> The tip shows the text in user mode when the mouse is moved over the control.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153287" role="paragraph" l10n="U" oldref="210">For URL type buttons, the help text appears as the extended tip instead of the URL address entered under URL.</paragraph>
+ </section>
+ <section id="Section43">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HELPURL" id="bm_id3156336" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145377" role="heading" level="2" l10n="U"
+ oldref="212">Help URL</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148649" role="paragraph" l10n="U" oldref="213"><ahelp hid="HID_PROP_HELPURL">Specifies a batch label in URL spelling which refers to a help document and which can be called with the help of the control field.</ahelp> The help for the control field help can be opened if the focus is positioned on the control field and the user presses F1.</paragraph>
+ </section>
+ <section id="Section42">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BACKGROUNDCOLOR" id="bm_id3149545" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152541" role="heading" level="2" l10n="U" oldref="3">Background color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155073" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_PROP_BACKGROUNDCOLOR" visibility="hidden">Sets the background color of the control field.</ahelp>A background color is available for most control fields. If you click on <emph>Background color</emph>, a list will open which enables you to select among various colors. The "Standard" option adopts the system setting. If the desired color is not listed, click the <emph>...</emph> button to define a color in the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog.</paragraph>
+ </section>
+ <section id="Section41">
<bookmark xml-lang="en-US" branch="hid/HID_PROP_HSCROLL" id="bm_id3149895" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_VSCROLL" id="bm_id3149517" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_SCROLLBARS" id="bm_id6053651" localize="false"/><paragraph role="heading" id="hd_id3148971" xml-lang="en-US" level="2" l10n="CHG" oldref="40">Scrollbar</paragraph>
-<paragraph role="paragraph" id="par_id3144430" xml-lang="en-US" l10n="CHG" oldref="41"><ahelp hid="HID_PROP_HSCROLL" visibility="hidden">Adds the scrollbar type that you specify to a text box.</ahelp>Adds the scrollbar type that you specify to a text box.</paragraph>
-</section>
-<section id="Section78">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPININCREMENT" id="bm_id3022247" localize="false"/><paragraph role="heading" id="par_idN1110B" xml-lang="en-US" level="2" l10n="NEW">Incr./decrement value</paragraph>
-<paragraph role="paragraph" id="par_idN1110F" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Determines intervals to add or subtract with each activation of the spin button control.</ahelp></paragraph>
-</section>
-<section id="Section40">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUESTEP" id="bm_id3150624" localize="false"/><paragraph role="heading" id="hd_id3146779" xml-lang="en-US" level="2" l10n="U" oldref="85">Value step</paragraph>
-<paragraph role="paragraph" id="par_id3155096" xml-lang="en-US" l10n="CHG" oldref="86"><ahelp hid="HID_PROP_VALUESTEP" visibility="hidden">Determines spin button intervals.</ahelp>You can preset the value intervals for numerical and currency spin buttons. Use the up and down arrows of the spin button to increase or decrease the value.</paragraph>
-</section>
-<section id="Section39">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRINGITEMLIST" id="bm_id3153975" localize="false"/><paragraph role="heading" id="hd_id3145756" xml-lang="en-US" level="2" l10n="U" oldref="73">List entries</paragraph>
-<paragraph role="paragraph" id="par_id3151300" xml-lang="en-US" l10n="CHG" oldref="120"><ahelp hid="HID_PROP_STRINGITEMLIST" visibility="hidden">Defines the list entries visible in the document. Open this list and type your text. Use Shift+Enter for a new line. With list and combo boxes, you can define the list entries that will be visible in the document. Open the <emph>List entries</emph> field and type your text.</ahelp> Please note the <link href="text/shared/02/01170100.xhp" name="tips">tips</link> referring to the keyboard controls.</paragraph>
-<paragraph role="paragraph" id="par_id3152874" xml-lang="en-US" l10n="U" oldref="228">The predefined default list entry is entered into the <emph>Default selection combo</emph> box.</paragraph>
-<paragraph role="note" id="par_id3154610" xml-lang="en-US" l10n="U" oldref="186">Note that the list entries entered here are only incorporated into the form if, on the <emph>Data</emph> tab under <emph>List Content Type</emph>, the option "Value List" is selected.</paragraph>
-<paragraph role="paragraph" id="par_id3154767" xml-lang="en-US" l10n="U" oldref="188">If you do not want the list entries to be written to the database or transmitted to the recipient of the Web form, but rather assigned values that are not visible in the form, you can assign the list entries to other values in a value list. The value list is determined on the <link href="text/shared/02/01170102.xhp" name="Data"><emph>Data</emph></link> tab. Under <emph>Type of List Contents</emph>, select the option "Value List". Then enter the values under <emph>List Contents</emph> that are to be assigned to the corresponding visible list entries of the form. For the correct assignment, the order in the value list is relevant.</paragraph>
-<paragraph role="note" id="par_id3150511" xml-lang="en-US" l10n="U" oldref="189">For HTML documents, a list entry entered on the <emph>General</emph> tab corresponds to the HTML tag &lt;OPTION&gt;; an entry of the value list entered on the <emph>Data</emph> tab under <emph>List Contents</emph> corresponds to the &lt;OPTION VALUE=...&gt; tag.</paragraph>
-</section>
-<section id="Section38">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMAX" id="bm_id3154336" localize="false"/><paragraph role="heading" id="hd_id3154290" xml-lang="en-US" level="2" l10n="U" oldref="121">Date max</paragraph>
-<paragraph role="paragraph" id="par_id3148637" xml-lang="en-US" l10n="U" oldref="122"><ahelp hid="HID_PROP_DATEMAX" visibility="hidden">Determines a date which can not be exceeded by another value introduced by the user.</ahelp>Determines a date which can not be exceeded by another value introduced by the user.</paragraph>
-</section>
-<section id="Section37">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_MAXTEXTLEN" id="bm_id3149391" localize="false"/><paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="2" l10n="U" oldref="123">Max text length</paragraph>
-<paragraph role="paragraph" id="par_id3150776" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="HID_PROP_MAXTEXTLEN" visibility="hidden">Defines the maximum number of characters that the user can enter.</ahelp>For text and combo boxes, you can define the maximum number of characters that the user can enter. If this control field property is uncertain, the default setting will be zero.</paragraph>
-<paragraph role="paragraph" id="par_id3153813" xml-lang="en-US" l10n="U" oldref="190">If the control is linked to a database and the text length is to be accepted from the field definition of the database, you must not enter the text length here. The settings are only accepted from the database if the control property was not defined ("Not Defined" state).</paragraph>
-</section>
-<section id="Section36">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_SCROLLBARS" id="bm_id6053651" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148971" role="heading" level="2" l10n="CHG"
+ oldref="40">Scrollbar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144430" role="paragraph" l10n="CHG" oldref="41"><ahelp hid="HID_PROP_HSCROLL" visibility="hidden">Adds the scrollbar type that you specify to a text box.</ahelp>Adds the scrollbar type that you specify to a text box.</paragraph>
+ </section>
+ <section id="Section78">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPININCREMENT" id="bm_id3022247" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1110B" role="heading" level="2" l10n="NEW">Incr./decrement value</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1110F" role="paragraph" l10n="CHG"><ahelp hid=".">Determines intervals to add or subtract with each activation of the spin button control.</ahelp></paragraph>
+ </section>
+ <section id="Section40">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUESTEP" id="bm_id3150624" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146779" role="heading" level="2" l10n="U"
+ oldref="85">Value step</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155096" role="paragraph" l10n="CHG" oldref="86"><ahelp hid="HID_PROP_VALUESTEP" visibility="hidden">Determines spin button intervals.</ahelp>You can preset the value intervals for numerical and currency spin buttons. Use the up and down arrows of the spin button to increase or decrease the value.</paragraph>
+ </section>
+ <section id="Section39">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_STRINGITEMLIST" id="bm_id3153975" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145756" role="heading" level="2" l10n="U"
+ oldref="73">List entries</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151300" role="paragraph" l10n="CHG" oldref="120"><ahelp hid="HID_PROP_STRINGITEMLIST" visibility="hidden">Defines the list entries visible in the document. Open this list and type your text. Use Shift+Enter for a new line. With list and combo boxes, you can define the list entries that will be visible in the document. Open the <emph>List entries</emph> field and type your text.</ahelp> Please note the <link href="text/shared/02/01170100.xhp" name="tips">tips</link> referring to the keyboard controls.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152874" role="paragraph" l10n="U" oldref="228">The predefined default list entry is entered into the <emph>Default selection combo</emph> box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154610" role="note" l10n="U" oldref="186">Note that the list entries entered here are only incorporated into the form if, on the <emph>Data</emph> tab under <emph>List Content Type</emph>, the option "Value List" is selected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154767" role="paragraph" l10n="U" oldref="188">If you do not want the list entries to be written to the database or transmitted to the recipient of the Web form, but rather assigned values that are not visible in the form, you can assign the list entries to other values in a value list. The value list is determined on the <link href="text/shared/02/01170102.xhp" name="Data"><emph>Data</emph></link> tab. Under <emph>Type of List Contents</emph>, select the option "Value List". Then enter the values under <emph>List Contents</emph> that are to be assigned to the corresponding visible list entries of the form. For the correct assignment, the order in the value list is relevant.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150511" role="note" l10n="U" oldref="189">For HTML documents, a list entry entered on the <emph>General</emph> tab corresponds to the HTML tag &lt;OPTION&gt;; an entry of the value list entered on the <emph>Data</emph> tab under <emph>List Contents</emph> corresponds to the &lt;OPTION VALUE=...&gt; tag.</paragraph>
+ </section>
+ <section id="Section38">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMAX" id="bm_id3154336" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154290" role="heading" level="2" l10n="U"
+ oldref="121">Date max</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148637" role="paragraph" l10n="U" oldref="122"><ahelp hid="HID_PROP_DATEMAX" visibility="hidden">Determines a date which can not be exceeded by another value introduced by the user.</ahelp>Determines a date which can not be exceeded by another value introduced by the user.</paragraph>
+ </section>
+ <section id="Section37">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_MAXTEXTLEN" id="bm_id3149391" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149804" role="heading" level="2" l10n="U"
+ oldref="123">Max text length</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150776" role="paragraph" l10n="U" oldref="124"><ahelp hid="HID_PROP_MAXTEXTLEN" visibility="hidden">Defines the maximum number of characters that the user can enter.</ahelp>For text and combo boxes, you can define the maximum number of characters that the user can enter. If this control field property is uncertain, the default setting will be zero.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153813" role="paragraph" l10n="U" oldref="190">If the control is linked to a database and the text length is to be accepted from the field definition of the database, you must not enter the text length here. The settings are only accepted from the database if the control property was not defined ("Not Defined" state).</paragraph>
+ </section>
+ <section id="Section36">
<bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUEMAX" id="bm_id3145145" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_EFFECTIVEMAX" id="bm_id3155345" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MAX" id="bm_id5229956" localize="false"/><paragraph role="heading" id="hd_id3145599" xml-lang="en-US" level="2" l10n="U" oldref="125">Value max</paragraph>
-<paragraph role="paragraph" id="par_id3154733" xml-lang="en-US" l10n="U" oldref="126"><ahelp hid="HID_PROP_EFFECTIVEMAX" visibility="hidden">Defines a value for the control field which can not be exceeded by another value introduced by the user.</ahelp>For numerical and currency fields, you can determine the maximum value that the user can enter.</paragraph>
-</section>
-<section id="Section35">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMAX" id="bm_id3154712" localize="false"/><paragraph role="heading" id="hd_id3154835" xml-lang="en-US" level="2" l10n="U" oldref="127">Time max</paragraph>
-<paragraph role="paragraph" id="par_id3155762" xml-lang="en-US" l10n="U" oldref="128"><ahelp hid="HID_PROP_TIMEMAX" visibility="hidden">Determines a time which can not be exceeded by another value introduced by the user.</ahelp>Determines a time which can not be exceeded by another value introduced by the user.</paragraph>
-</section>
-<section id="Section34">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_MULTISELECTION" id="bm_id3154168" localize="false"/><paragraph role="heading" id="hd_id3150416" xml-lang="en-US" level="2" l10n="U" oldref="129">Multiselection</paragraph>
-<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="CHG" oldref="130"><ahelp hid="HID_PROP_MULTISELECTION" visibility="hidden">Allows you to select more than one item in a list box.</ahelp>Allows you to select more than one item in a list box.</paragraph>
-</section>
-<section id="Section33">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MAX" id="bm_id5229956" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145599" role="heading" level="2" l10n="U"
+ oldref="125">Value max</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154733" role="paragraph" l10n="U" oldref="126"><ahelp hid="HID_PROP_EFFECTIVEMAX" visibility="hidden">Defines a value for the control field which can not be exceeded by another value introduced by the user.</ahelp>For numerical and currency fields, you can determine the maximum value that the user can enter.</paragraph>
+ </section>
+ <section id="Section35">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMAX" id="bm_id3154712" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154835" role="heading" level="2" l10n="U"
+ oldref="127">Time max</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155762" role="paragraph" l10n="U" oldref="128"><ahelp hid="HID_PROP_TIMEMAX" visibility="hidden">Determines a time which can not be exceeded by another value introduced by the user.</ahelp>Determines a time which can not be exceeded by another value introduced by the user.</paragraph>
+ </section>
+ <section id="Section34">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_MULTISELECTION" id="bm_id3154168" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150416" role="heading" level="2" l10n="U"
+ oldref="129">Multiselection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143275" role="paragraph" l10n="CHG" oldref="130"><ahelp hid="HID_PROP_MULTISELECTION" visibility="hidden">Allows you to select more than one item in a list box.</ahelp>Allows you to select more than one item in a list box.</paragraph>
+ </section>
+ <section id="Section33">
<bookmark xml-lang="en-US" branch="index" id="bm_id4040955"><bookmark_value>rich text control</bookmark_value>
-<bookmark_value>controls;rich text control</bookmark_value>
+ <bookmark_value>controls;rich text control</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_MULTILINE" id="bm_id3156370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXTTYPE" id="bm_id6511734" localize="false"/><paragraph role="heading" id="hd_id3148527" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Text type<comment>UFI: now renamed to Text Type, see #i24386#</comment><comment>UFI: see dba spec prop_browser_enhancements.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id3153724" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="37933">Allows you to use line breaks and formatting in a control field, such as a text box or label. To manually enter a line break, press the Enter key. Select "Multi-line with formatting" to enter formatted text.</ahelp></paragraph>
-<paragraph role="warning" id="par_idN113D2" xml-lang="en-US" l10n="NEW">If you select the text type "Multi-line with formatting", you cannot bind this control to a database field.</paragraph>
-<paragraph role="note" id="par_idN11391" xml-lang="en-US" l10n="NEW">This control is named "Multiline input" for a text column inside a table control.</paragraph>
-</section>
-<section id="Section47">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_WORDBREAK" id="bm_id1313516" localize="false"/><paragraph role="heading" id="par_idN114EF" xml-lang="en-US" level="2" l10n="NEW">Word break<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN11505" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays text on more than one line.</ahelp> Allows you to use line breaks in a text box, so that you can enter more than one line of text. To manually enter a line break, press the <item type="keycode">Enter</item> key.</paragraph>
-</section>
-<section id="Section64">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TOGGLE" id="bm_id9645680" localize="false"/><paragraph role="heading" id="par_idN11538" xml-lang="en-US" level="2" l10n="NEW">Toggle<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN1154E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies if a Push Button behaves as a Toggle Button. If you set Toggle to "Yes", you can switch between the "selected" and "not selected" control states when you click the button or press the spacebar while the the control has the focus. A button in the "selected" state appears "pressed in".</ahelp></paragraph>
-</section>
-<section id="Section65">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FOCUSONCLICK" id="bm_id6996978" localize="false"/><paragraph role="heading" id="par_idN11558" xml-lang="en-US" level="2" l10n="NEW">Take Focus on Click<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN1156E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you set this option to "Yes", the Push Button receives the focus when you click the button.</ahelp></paragraph>
-</section>
-<section id="Section66">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDEINACTIVESELECTION" id="bm_id9755546" localize="false"/><paragraph role="heading" id="par_idN11578" xml-lang="en-US" level="2" l10n="NEW">Hide selection<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN1158E" xml-lang="en-US" l10n="NEW"><ahelp hid="37965">Specifies whether a text selection on a control remains selected when a the focus is no longer on a control.</ahelp> If you set <emph>Hide selection</emph> to "No", the selected text remains selected when the focus is no longer on the control that contains the text.</paragraph>
-</section>
-<section id="Section67">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISUALEFFECT" id="bm_id7896664" localize="false"/><paragraph role="heading" id="par_idN11598" xml-lang="en-US" level="2" l10n="NEW">Style<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN115AE" xml-lang="en-US" l10n="NEW"><ahelp hid="37966">Specifies whether Check boxes and Option buttons are displayed in a 3D look (default) or a flat look.</ahelp></paragraph>
-</section>
-<section id="Section68">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDERCOLOR" id="bm_id6106448" localize="false"/><paragraph role="heading" id="par_idN115B8" xml-lang="en-US" level="2" l10n="NEW">Border color<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_idN115CE" xml-lang="en-US" l10n="NEW"><ahelp hid="37967">Specifies the border color for controls that have the Border property set to "flat".</ahelp></paragraph>
-</section>
-<section id="Section79">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SYMBOLCOLOR" id="bm_id9707632" localize="false"/><paragraph role="heading" id="par_idN115B7" xml-lang="en-US" level="2" l10n="NEW">Symbol color</paragraph>
-<paragraph role="paragraph" id="par_idN115BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the color for symbols on controls, for example the arrows on a scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section32">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMIN" id="bm_id3155750" localize="false"/><paragraph role="heading" id="hd_id3149314" xml-lang="en-US" level="2" l10n="U" oldref="131">Date min</paragraph>
-<paragraph role="paragraph" id="par_id3155755" xml-lang="en-US" l10n="U" oldref="132"><ahelp hid="HID_PROP_DATEMIN" visibility="hidden">Determines the earliest date that a user can enter.</ahelp>Determines the earliest date that a user can enter.</paragraph>
-</section>
-<section id="Section31">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXTTYPE" id="bm_id6511734" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148527" role="heading" level="2" l10n="CHG"
+ oldref="21">Text type<comment>UFI: now renamed to Text Type, see #i24386#</comment><comment>UFI: see dba spec prop_browser_enhancements.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153724" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="37933">Allows you to use line breaks and formatting in a control field, such as a text box or label. To manually enter a line break, press the Enter key. Select "Multi-line with formatting" to enter formatted text.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN113D2" role="warning" l10n="NEW">If you select the text type "Multi-line with formatting", you cannot bind this control to a database field.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN11391" role="note" l10n="NEW">This control is named "Multiline input" for a text column inside a table control.</paragraph>
+ </section>
+ <section id="Section47">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WORDBREAK" id="bm_id1313516" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN114EF" role="heading" level="2" l10n="NEW">Word break<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN11505" role="paragraph" l10n="NEW"><ahelp hid=".">Displays text on more than one line.</ahelp> Allows you to use line breaks in a text box, so that you can enter more than one line of text. To manually enter a line break, press the Enter key.</paragraph>
+ </section>
+ <section id="Section64">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TOGGLE" id="bm_id9645680" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11538" role="heading" level="2" l10n="NEW">Toggle<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1154E" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies if a Push Button behaves as a Toggle Button. If you set Toggle to "Yes", you can switch between the "selected" and "not selected" control states when you click the button or press the spacebar while the the control has the focus. A button in the "selected" state appears "pressed in".</ahelp></paragraph>
+ </section>
+ <section id="Section65">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FOCUSONCLICK" id="bm_id6996978" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11558" role="heading" level="2" l10n="NEW">Take Focus on Click<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1156E" role="paragraph" l10n="NEW"><ahelp hid=".">If you set this option to "Yes", the Push Button receives the focus when you click the button.</ahelp></paragraph>
+ </section>
+ <section id="Section66">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDEINACTIVESELECTION" id="bm_id9755546" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11578" role="heading" level="2" l10n="NEW">Hide selection<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1158E" role="paragraph" l10n="NEW"><ahelp hid="37965">Specifies whether a text selection on a control remains selected when a the focus is no longer on a control.</ahelp> If you set <emph>Hide selection</emph> to "No", the selected text remains selected when the focus is no longer on the control that contains the text.</paragraph>
+ </section>
+ <section id="Section67">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISUALEFFECT" id="bm_id7896664" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11598" role="heading" level="2" l10n="NEW">Style<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN115AE" role="paragraph" l10n="NEW"><ahelp hid="37966">Specifies whether Check boxes and Option buttons are displayed in a 3D look (default) or a flat look.</ahelp></paragraph>
+ </section>
+ <section id="Section68">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDERCOLOR" id="bm_id6106448" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN115B8" role="heading" level="2" l10n="NEW">Border color<comment>UFI: see dba spec form_controls_interop_1.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN115CE" role="paragraph" l10n="NEW"><ahelp hid="37967">Specifies the border color for controls that have the Border property set to "flat".</ahelp></paragraph>
+ </section>
+ <section id="Section79">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SYMBOLCOLOR" id="bm_id9707632" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN115B7" role="heading" level="2" l10n="NEW">Symbol color</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN115BB" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the color for symbols on controls, for example the arrows on a scrollbar.</ahelp></paragraph>
+ </section>
+ <section id="Section32">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DATEMIN" id="bm_id3155750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149314" role="heading" level="2" l10n="U"
+ oldref="131">Date min</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155755" role="paragraph" l10n="U" oldref="132"><ahelp hid="HID_PROP_DATEMIN" visibility="hidden">Determines the earliest date that a user can enter.</ahelp>Determines the earliest date that a user can enter.</paragraph>
+ </section>
+ <section id="Section31">
<bookmark xml-lang="en-US" branch="hid/HID_PROP_VALUEMIN" id="bm_id3145321" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_EFFECTIVEMIN" id="bm_id3147499" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MIN" id="bm_id3649403" localize="false"/><paragraph role="heading" id="hd_id3152866" xml-lang="en-US" level="2" l10n="U" oldref="133">Value min</paragraph>
-<paragraph role="paragraph" id="par_id3147505" xml-lang="en-US" l10n="U" oldref="134"><ahelp hid="HID_PROP_EFFECTIVEMIN" visibility="hidden">You can determine here a value for the control field to prevent the user from entering a smaller value.</ahelp>For numerical and currency fields you can determine a minimum value to prevent the user from entering a smaller value.</paragraph>
-</section>
-<section id="Section30">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMIN" id="bm_id3148825" localize="false"/><paragraph role="heading" id="hd_id3153298" xml-lang="en-US" level="2" l10n="U" oldref="135">Time min</paragraph>
-<paragraph role="paragraph" id="par_id3148831" xml-lang="en-US" l10n="U" oldref="136"><ahelp hid="HID_PROP_TIMEMIN" visibility="hidden">Determines the minimum time that a user can enter.</ahelp>Determines the minimum time that a user can enter.</paragraph>
-</section>
-<section id="Section29">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DECIMAL_ACCURACY" id="bm_id3154402" localize="false"/><paragraph role="heading" id="hd_id3155746" xml-lang="en-US" level="2" l10n="U" oldref="137">Decimal accuracy</paragraph>
-<paragraph role="paragraph" id="par_id3146096" xml-lang="en-US" l10n="U" oldref="138"><ahelp hid="HID_PROP_DECIMAL_ACCURACY" visibility="hidden">Determines the number of digits displayed to the right of the decimal point.</ahelp>With numerical and currency fields you can determine the number of digits displayed to the right of the decimal point.</paragraph>
-</section>
-<section id="Section28">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAME" id="bm_id3152469" localize="false"/><paragraph role="heading" id="hd_id3151340" xml-lang="en-US" level="2" l10n="U" oldref="9">Name</paragraph>
-<paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_PROP_NAME" visibility="hidden">On the <emph>Properties</emph> tab page, this option specifies the name for the control field. On the <emph>Form Properties </emph>tab page, this option specifies the name for the form.</ahelp>Each control field and each form has a <emph>Name </emph>property through which it can be identified. The name will appear in the <link href="text/shared/02/01170600.xhp" name="Form Navigator">Form Navigator</link> and, using the name, the control field can be referred to from a macro. The default settings already specify a name which is constructed from using the field's label and number.</paragraph>
-<paragraph role="note" id="par_id3153025" xml-lang="en-US" l10n="U" oldref="191">If you work with macros, make sure that the names of the controls are unique.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SPINVALUE_MIN" id="bm_id3649403" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152866" role="heading" level="2" l10n="U"
+ oldref="133">Value min</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147505" role="paragraph" l10n="U" oldref="134"><ahelp hid="HID_PROP_EFFECTIVEMIN" visibility="hidden">You can determine here a value for the control field to prevent the user from entering a smaller value.</ahelp>For numerical and currency fields you can determine a minimum value to prevent the user from entering a smaller value.</paragraph>
+ </section>
+ <section id="Section30">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEMIN" id="bm_id3148825" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153298" role="heading" level="2" l10n="U"
+ oldref="135">Time min</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148831" role="paragraph" l10n="U" oldref="136"><ahelp hid="HID_PROP_TIMEMIN" visibility="hidden">Determines the minimum time that a user can enter.</ahelp>Determines the minimum time that a user can enter.</paragraph>
+ </section>
+ <section id="Section29">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DECIMAL_ACCURACY" id="bm_id3154402" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155746" role="heading" level="2" l10n="U"
+ oldref="137">Decimal accuracy</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146096" role="paragraph" l10n="U" oldref="138"><ahelp hid="HID_PROP_DECIMAL_ACCURACY" visibility="hidden">Determines the number of digits displayed to the right of the decimal point.</ahelp>With numerical and currency fields you can determine the number of digits displayed to the right of the decimal point.</paragraph>
+ </section>
+ <section id="Section28">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAME" id="bm_id3152469" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151340" role="heading" level="2" l10n="U" oldref="9">Name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149819" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_PROP_NAME" visibility="hidden">On the <emph>Properties</emph> tab page, this option specifies the name for the control field. On the <emph>Form Properties </emph>tab page, this option specifies the name for the form.</ahelp>Each control field and each form has a <emph>Name </emph>property through which it can be identified. The name will appear in the <link href="text/shared/02/01170600.xhp" name="Form Navigator">Form Navigator</link> and, using the name, the control field can be referred to from a macro. The default settings already specify a name which is constructed from using the field's label and number.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153025" role="note" l10n="U" oldref="191">If you work with macros, make sure that the names of the controls are unique.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3146325"><bookmark_value>controls; grouping</bookmark_value>
-<bookmark_value>groups;of controls</bookmark_value>
-<bookmark_value>forms; grouping controls</bookmark_value>
-</bookmark><comment>mw changed "grouping;" to "groups;"</comment><paragraph role="paragraph" id="par_id3146325" xml-lang="en-US" l10n="U" oldref="192">The name is also used to group different controls that belong together functionally, such as radio buttons. To do so, give the same name to all members of the group: controls with identical names form a group. Grouped controls can be represented visually by using a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link>.</paragraph>
-</section>
-<section id="Section27">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAVIGATIONBAR" id="bm_id3153020" localize="false"/><paragraph role="heading" id="hd_id3149720" xml-lang="en-US" level="2" l10n="U" oldref="197">Navigation bar</paragraph>
-<paragraph role="paragraph" id="par_id3149918" xml-lang="en-US" l10n="U" oldref="198"><ahelp hid="HID_PROP_NAVIGATIONBAR" visibility="hidden">Specifies whether to display the navigation bar on the lower border of the table control.</ahelp>Specifies whether to display the navigation bar on the lower border of table controls.</paragraph>
-</section>
-<section id="Section26">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_READONLY" id="bm_id3151173" localize="false"/><paragraph role="heading" id="hd_id3158426" xml-lang="en-US" level="2" l10n="U" oldref="42">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id3153215" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_PROP_READONLY" visibility="hidden">Determines if the control is read-only (Yes) or if it can be edited (No).</ahelp>The<emph> Read-only </emph>property can be assigned to all controls in which the user can enter text. If you assign the read-only property to an image field which uses graphics from a database, the user will not be able to insert new graphics into the database.</paragraph>
-</section>
-<section id="Section25">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDER" id="bm_id3154414" localize="false"/><paragraph role="heading" id="hd_id3148912" xml-lang="en-US" level="2" l10n="U" oldref="139">Border</paragraph>
-<paragraph role="paragraph" id="par_id3145637" xml-lang="en-US" l10n="U" oldref="140"><ahelp hid="HID_PROP_BORDER" visibility="hidden">Determines if the field's border should be displayed "Without frame", with a "3-D look" or "Flat".</ahelp>With control fields that have a frame, you can determine the border display on the form using the <emph>Border </emph>property. You can select among the "Without frame", "3-D look" or "Flat" options.</paragraph>
-</section>
-<section id="Section24">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABINDEX" id="bm_id3157872" localize="false"/><paragraph role="heading" id="hd_id3149266" xml-lang="en-US" level="2" l10n="CHG" oldref="44">Tab order</paragraph>
-<paragraph role="paragraph" id="par_id3147483" xml-lang="en-US" l10n="CHG" oldref="45"><ahelp hid="HID_PROP_TABINDEX">The <emph>Tab order</emph> property determines the order in which the controls are focused in the form when you press the Tab key.</ahelp> In a form that contains more than one control, the focus moves to the next control when you press the Tab key. You can specify the order in which the focus changes with an index under <emph>Tab order</emph>.</paragraph>
-<paragraph role="note" id="par_id3156207" xml-lang="en-US" l10n="CHG" oldref="193">The <emph>Tab order</emph> property is not available to <link href="text/shared/02/01170600.xhp" name="Hidden Controls">Hidden Controls</link>. If you want, you can also set this property for image buttons and image controls, so that you can select these controls with the Tab key.</paragraph>
-<paragraph role="paragraph" id="par_id3150378" xml-lang="en-US" l10n="U" oldref="46">When creating a form, an index is automatically assigned to the control fields that are added to this form; every control field added is assigned an index increased by 1. If you change the index of a control, the indices of the other controls are updated automatically. Elements that cannot be focused (Tabstop = No) are also assigned a value. However, these controls are skipped when using the Tab key.</paragraph>
-<paragraph role="paragraph" id="par_id3150640" xml-lang="en-US" l10n="U" oldref="47">You can also easily define the indices of the different controls in the <link href="text/shared/02/01170300.xhp" name="Tab Order"><emph>Tab Order</emph></link> dialog.</paragraph>
-</section>
-<section id="Section22">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_CHECKED" id="bm_id3109847" localize="false"/><paragraph role="heading" id="hd_id3154049" xml-lang="en-US" level="2" l10n="U" oldref="34">Default status</paragraph>
-<paragraph role="paragraph" id="par_id3150837" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_PROP_DEFAULT_CHECKED">Specifies whether an option or a check box is selected by default.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149242" xml-lang="en-US" l10n="U" oldref="201">For a reset type button, you can define the status of the control if the reset button is activated by the user.</paragraph>
-<paragraph role="paragraph" id="par_id3156266" xml-lang="en-US" l10n="U" oldref="202">For grouped option fields, the status of the group corresponding to the default setting is defined by the <emph>Default Status</emph> property.<comment>UFI: what does this mean? Cannot understand that sentence.</comment></paragraph>
-</section>
-<section id="Section21">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SELECT_SEQ" id="bm_id3147220" localize="false"/><paragraph role="heading" id="hd_id3156150" xml-lang="en-US" level="2" l10n="U" oldref="36">Default selection</paragraph>
-<paragraph role="paragraph" id="par_id3148730" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="HID_PROP_DEFAULT_SELECT_SEQ" visibility="hidden">Specifies the list box entry to mark as the default entry.</ahelp>Specifies the list box entry to mark as the default entry.</paragraph>
-<paragraph role="paragraph" id="par_id3150028" xml-lang="en-US" l10n="U" oldref="203">For a Reset type button, the<emph> Default selection</emph> entry defines the status of the list box if the reset button is activated by the user.</paragraph>
-<paragraph role="paragraph" id="par_id919217" xml-lang="en-US" l10n="NEW">For a List box that contains a value list, you can click the <emph>...</emph> button to open the <emph>Default selection</emph> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id50050" xml-lang="en-US" l10n="NEW">In the <emph>Default selection</emph> dialog, select the entries that you want to mark as selected when you open the form that contains the list box.</paragraph>
-</section>
-<section id="Section20">
+ <bookmark_value>groups;of controls</bookmark_value>
+ <bookmark_value>forms; grouping controls</bookmark_value>
+</bookmark><comment>mw changed "grouping;" to "groups;"</comment>
+<paragraph xml-lang="en-US" id="par_id3146325" role="paragraph" l10n="U" oldref="192">The name is also used to group different controls that belong together functionally, such as radio buttons. To do so, give the same name to all members of the group: controls with identical names form a group. Grouped controls can be represented visually by using a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link>.</paragraph>
+ </section>
+ <section id="Section27">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_NAVIGATIONBAR" id="bm_id3153020" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149720" role="heading" level="2" l10n="U"
+ oldref="197">Navigation bar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149918" role="paragraph" l10n="U" oldref="198"><ahelp hid="HID_PROP_NAVIGATIONBAR" visibility="hidden">Specifies whether to display the navigation bar on the lower border of the table control.</ahelp>Specifies whether to display the navigation bar on the lower border of table controls.</paragraph>
+ </section>
+ <section id="Section26">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_READONLY" id="bm_id3151173" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158426" role="heading" level="2" l10n="U"
+ oldref="42">Read-only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153215" role="paragraph" l10n="U" oldref="43"><ahelp hid="HID_PROP_READONLY" visibility="hidden">Determines if the control is read-only (Yes) or if it can be edited (No).</ahelp>The<emph> Read-only </emph>property can be assigned to all controls in which the user can enter text. If you assign the read-only property to an image field which uses graphics from a database, the user will not be able to insert new graphics into the database.</paragraph>
+ </section>
+ <section id="Section25">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BORDER" id="bm_id3154414" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148912" role="heading" level="2" l10n="U"
+ oldref="139">Border</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145637" role="paragraph" l10n="U" oldref="140"><ahelp hid="HID_PROP_BORDER" visibility="hidden">Determines if the field's border should be displayed "Without frame", with a "3-D look" or "Flat".</ahelp>With control fields that have a frame, you can determine the border display on the form using the <emph>Border </emph>property. You can select among the "Without frame", "3-D look" or "Flat" options.</paragraph>
+ </section>
+ <section id="Section24">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABINDEX" id="bm_id3157872" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149266" role="heading" level="2" l10n="CHG"
+ oldref="44">Tab order</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147483" role="paragraph" l10n="CHG" oldref="45"><ahelp hid="HID_PROP_TABINDEX">The <emph>Tab order</emph> property determines the order in which the controls are focused in the form when you press the Tab key.</ahelp> In a form that contains more than one control, the focus moves to the next control when you press the Tab key. You can specify the order in which the focus changes with an index under <emph>Tab order</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156207" role="note" l10n="CHG" oldref="193">The <emph>Tab order</emph> property is not available to <link href="text/shared/02/01170600.xhp" name="Hidden Controls">Hidden Controls</link>. If you want, you can also set this property for image buttons and image controls, so that you can select these controls with the Tab key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150378" role="paragraph" l10n="U" oldref="46">When creating a form, an index is automatically assigned to the control fields that are added to this form; every control field added is assigned an index increased by 1. If you change the index of a control, the indices of the other controls are updated automatically. Elements that cannot be focused (Tabstop = No) are also assigned a value. However, these controls are skipped when using the Tab key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150640" role="paragraph" l10n="U" oldref="47">You can also easily define the indices of the different controls in the <link href="text/shared/02/01170300.xhp" name="Tab Order"><emph>Tab Order</emph></link> dialog.</paragraph>
+ </section>
+ <section id="Section89">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_WHEEL_BEHAVIOR" id="bm_id0509200912044845" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0509200912114423" role="heading" level="2" l10n="NEW">Mouse wheel scroll</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0509200912114566" role="paragraph" l10n="NEW"><ahelp hid=".">Sets whether the value changes when the user scrolls a mouse wheel. Never: No change of the value. When focused: (default) The value changes when the control has the focus and the wheel is pointing at the control and gets scrolled. Always: The value changes when the wheel is pointing at the control and gets scrolled, no matter which control has the focus.</ahelp></paragraph>
+ </section>
+ <section id="Section22">
+<!-- removed HID HID_PROP_DEFAULT_CHECKED -->
+<paragraph xml-lang="en-US" id="hd_id3154049" role="heading" level="2" l10n="U"
+ oldref="34">Default status</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150837" role="paragraph" l10n="U" oldref="35"><ahelp hid="HID_PROP_DEFAULT_CHECKED">Specifies whether an option or a check box is selected by default.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149242" role="paragraph" l10n="U" oldref="201">For a reset type button, you can define the status of the control if the reset button is activated by the user.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156266" role="paragraph" l10n="U" oldref="202">For grouped option fields, the status of the group corresponding to the default setting is defined by the <emph>Default Status</emph> property.<comment>UFI: what does this mean? Cannot understand that sentence.</comment></paragraph>
+ </section>
+ <section id="Section21">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SELECT_SEQ" id="bm_id3147220" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156150" role="heading" level="2" l10n="U"
+ oldref="36">Default selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148730" role="paragraph" l10n="CHG" oldref="37"><ahelp hid="HID_PROP_DEFAULT_SELECT_SEQ" visibility="hidden">Specifies the list box entry to mark as the default entry.</ahelp>Specifies the list box entry to mark as the default entry.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="203">For a Reset type button, the<emph> Default selection</emph> entry defines the status of the list box if the reset button is activated by the user.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id919217" role="paragraph" l10n="NEW">For a List box that contains a value list, you can click the <emph>...</emph> button to open the <emph>Default selection</emph> dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id50050" role="paragraph" l10n="NEW">In the <emph>Default selection</emph> dialog, select the entries that you want to mark as selected when you open the form that contains the list box.</paragraph>
+ </section>
+ <section id="Section20">
<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULTVALUE" id="bm_id3153100" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PROP_EFFECTIVEDEFAULT" id="bm_id3143231" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SPINVALUE" id="bm_id4093447" localize="false"/><paragraph role="heading" id="hd_id3150460" xml-lang="en-US" level="2" l10n="U" oldref="38">Default value</paragraph>
-<paragraph role="paragraph" id="par_id3154222" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_PROP_EFFECTIVEDEFAULT">Sets the default value for the control field.</ahelp> For example, the default value will be entered when a form is opened.</paragraph>
-<paragraph role="paragraph" id="par_id3150740" xml-lang="en-US" l10n="U" oldref="199">For a Reset type button, the<emph> Default value entry </emph>defines the status of the control if the reset button is activated by the user.</paragraph>
-</section>
-<section id="Section45">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SCROLLVALUE" id="bm_id6967986" localize="false"/><paragraph role="heading" id="par_idN11B70" xml-lang="en-US" level="2" l10n="NEW">Default scroll value</paragraph>
-<paragraph role="paragraph" id="par_idN11B74" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_DEFAULT_SCROLLVALUE">Sets the default value for the scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section72">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MAX" id="bm_id3148873" localize="false"/><paragraph role="heading" id="hd_id3155440" xml-lang="en-US" level="2" l10n="U" oldref="252">Scroll value max.</paragraph>
-<paragraph role="paragraph" id="par_id3148877" xml-lang="en-US" l10n="U" oldref="251"><ahelp hid="HID_PROP_SCROLLVALUE_MAX">Specify the maximum value of a scrollbar control.</ahelp></paragraph>
-</section>
-<section id="Section71">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MIN" id="bm_id6626483" localize="false"/><paragraph role="heading" id="par_idN111E4" xml-lang="en-US" level="2" l10n="NEW">Scroll value min.</paragraph>
-<paragraph role="paragraph" id="par_idN111E8" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_SCROLLVALUE_MIN">Specify the minimum value of a scrollbar control.</ahelp></paragraph>
-</section>
-<section id="Section80">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEINCREMENT" id="bm_id6233100" localize="false"/><paragraph role="heading" id="par_idN11B51" xml-lang="en-US" level="2" l10n="NEW">Small change</paragraph>
-<paragraph role="paragraph" id="par_idN11B55" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks the arrow icon on the scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section81">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BLOCKINCREMENT" id="bm_id1151463" localize="false"/><paragraph role="heading" id="par_idN11B6F" xml-lang="en-US" level="2" l10n="NEW">Large change</paragraph>
-<paragraph role="paragraph" id="par_idN11B73" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks next to the slider on the scrollbar.</ahelp></paragraph>
-</section>
-<section id="Section19">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_TIME" id="bm_id3146878" localize="false"/><paragraph role="heading" id="hd_id7215491" xml-lang="en-US" level="2" l10n="NEW">Default time</paragraph>
-<paragraph role="paragraph" id="par_id2299874" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sets the default time.</ahelp></paragraph>
-<paragraph role="note" id="par_id3150482" xml-lang="en-US" l10n="CHG" oldref="200">If you do not enter a value, the current time is inserted.</paragraph>
-</section>
-<section id="Section18">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_DATE" id="bm_id3146874" localize="false"/><paragraph role="heading" id="hd_id1727347" xml-lang="en-US" level="2" l10n="NEW">Default date</paragraph>
-<paragraph role="paragraph" id="par_id2545548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Sets the default date.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id2360911" xml-lang="en-US" l10n="NEW">If you do not enter a value, the current date is inserted.</paragraph>
-</section>
-<section id="Section17">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXT" id="bm_id8406628" localize="false"/><paragraph role="heading" id="hd_id9207434" xml-lang="en-US" level="2" l10n="NEW">Default text</paragraph>
-<paragraph role="paragraph" id="par_id4563127" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Sets the default text for a text box or a combo box.</ahelp></paragraph>
-</section>
-<section id="Section16">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_BUTTON" id="bm_id3156300" localize="false"/><paragraph role="heading" id="hd_id3145206" xml-lang="en-US" level="2" l10n="U" oldref="144">Default button</paragraph>
-<paragraph role="paragraph" id="par_id3154681" xml-lang="en-US" l10n="U" oldref="145"><ahelp hid="HID_PROP_DEFAULT_BUTTON" visibility="hidden">The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key.</ahelp>The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key. If you open the dialog or form and do not carry out any further action, the button with this property is the default button.</paragraph>
-<paragraph role="note" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="175">This property should be assigned only to a single button within the document.</paragraph>
-<paragraph role="paragraph" id="par_id3150931" xml-lang="en-US" l10n="U" oldref="177">When using Web page forms, you might come across this property in search masks. These are edit masks that contain a text field and a Submit type button. The search term is entered in the text field and the search is started by activating the button. If the button is defined as the default button, however, simply hit Enter after entering the search term in order to start the search.</paragraph>
-</section>
-<section id="Section15">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRSYM_POSITION" id="bm_id3150265" localize="false"/><paragraph role="heading" id="hd_id3153389" xml-lang="en-US" level="2" l10n="U" oldref="221">Prefix symbol</paragraph>
-<paragraph role="paragraph" id="par_id3150271" xml-lang="en-US" l10n="U" oldref="222"><ahelp hid="HID_PROP_CURRSYM_POSITION">Determines if the currency symbol is displayed before or after the number when using currency fields.</ahelp> The default setting is currency symbols are not prefixed.</paragraph>
-</section>
-<section id="Section14">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABSTOP" id="bm_id3148938" localize="false"/><paragraph role="heading" id="hd_id3154548" xml-lang="en-US" level="2" l10n="U" oldref="48">Tabstop</paragraph>
-<paragraph role="paragraph" id="par_id3155361" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_PROP_TABSTOP">The <emph>Tabstop </emph>property determines if a control field can be selected with the tab key.</ahelp> The following options are available:<comment>UFI: Default entry row deleted from table</comment></paragraph>
-<table id="tbl_id3154843">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148627" xml-lang="en-US" l10n="U" oldref="52">No</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161673" xml-lang="en-US" l10n="U" oldref="53">When using the tab key, focusing skips the control.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159323" xml-lang="en-US" l10n="U" oldref="50">Yes</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148584" xml-lang="en-US" l10n="U" oldref="51">The control can be selected with the Tab key.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-<section id="Section13">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOWTHOUSANDSEP" id="bm_id3154931" localize="false"/><paragraph role="heading" id="hd_id3146909" xml-lang="en-US" level="2" l10n="U" oldref="147">Thousands separator</paragraph>
-<paragraph role="paragraph" id="par_id3154936" xml-lang="en-US" l10n="U" oldref="148"><ahelp hid="HID_PROP_SHOWTHOUSANDSEP" visibility="hidden">Inserts a thousands separator.</ahelp>With numerical and currency fields you can determine whether thousands separators are used.</paragraph>
-</section>
-<section id="Section12">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LABEL" id="bm_id3159212" localize="false"/><paragraph role="heading" id="hd_id3156256" xml-lang="en-US" level="2" l10n="U" oldref="7">Label</paragraph>
-<paragraph role="paragraph" id="par_id3156432" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_PROP_LABEL" visibility="hidden">The Label property sets the label of the control field that is displayed in the form.</ahelp>The Label property sets the label of the control field that is displayed in the form. This property determines the visible label or the column header of the data field in table control forms.</paragraph>
-<paragraph role="paragraph" id="par_id3154568" xml-lang="en-US" l10n="U" oldref="54">When you create a new control, the description predefined in the <emph>Name</emph> property is used as the default for labeling the control. The label consists of the control field name and an integer numbering the control (for example, CommandButton1). With the <emph>Title</emph> property, you can assign another description to the control so that the label reflects the function of the control. Change this entry in order to assign an expressive label to the control that is visible to the user.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SPINVALUE" id="bm_id4093447" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150460" role="heading" level="2" l10n="U"
+ oldref="38">Default value</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154222" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_PROP_EFFECTIVEDEFAULT">Sets the default value for the control field.</ahelp> For example, the default value will be entered when a form is opened.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150740" role="paragraph" l10n="U" oldref="199">For a Reset type button, the<emph> Default value entry </emph>defines the status of the control if the reset button is activated by the user.</paragraph>
+ </section>
+ <section id="Section45">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_SCROLLVALUE" id="bm_id6967986" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11B70" role="heading" level="2" l10n="NEW">Default scroll value</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN11B74" role="paragraph" l10n="NEW"><ahelp hid="HID_PROP_DEFAULT_SCROLLVALUE">Sets the default value for the scrollbar.</ahelp></paragraph>
+ </section>
+ <section id="Section72">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MAX" id="bm_id3148873" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155440" role="heading" level="2" l10n="U"
+ oldref="252">Scroll value max.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148877" role="paragraph" l10n="U" oldref="251"><ahelp hid="HID_PROP_SCROLLVALUE_MAX">Specify the maximum value of a scrollbar control.</ahelp></paragraph>
+ </section>
+ <section id="Section71">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCROLLVALUE_MIN" id="bm_id6626483" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN111E4" role="heading" level="2" l10n="NEW">Scroll value min.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN111E8" role="paragraph" l10n="NEW"><ahelp hid="HID_PROP_SCROLLVALUE_MIN">Specify the minimum value of a scrollbar control.</ahelp></paragraph>
+ </section>
+ <section id="Section80">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEINCREMENT" id="bm_id6233100" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11B51" role="heading" level="2" l10n="NEW">Small change</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN11B55" role="paragraph" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks the arrow icon on the scrollbar.</ahelp></paragraph>
+ </section>
+ <section id="Section81">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BLOCKINCREMENT" id="bm_id1151463" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11B6F" role="heading" level="2" l10n="NEW">Large change</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN11B73" role="paragraph" l10n="NEW"><ahelp hid=".">Specify the value to add or subtract when the user clicks next to the slider on the scrollbar.</ahelp></paragraph>
+ </section>
+ <section id="Section19">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_TIME" id="bm_id3146878" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7215491" role="heading" level="2" l10n="NEW">Default time</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2299874" role="paragraph" l10n="NEW"><ahelp hid=".">Sets the default time.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150482" role="note" l10n="CHG" oldref="200">If you do not enter a value, the current time is inserted.</paragraph>
+ </section>
+ <section id="Section18">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_DATE" id="bm_id3146874" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1727347" role="heading" level="2" l10n="NEW">Default date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2545548" role="paragraph" l10n="NEW"><ahelp hid=".">Sets the default date.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id2360911" role="paragraph" l10n="NEW">If you do not enter a value, the current date is inserted.</paragraph>
+ </section>
+ <section id="Section17">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TEXT" id="bm_id8406628" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9207434" role="heading" level="2" l10n="NEW">Default text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4563127" role="paragraph" l10n="CHG"><ahelp hid=".">Sets the default text for a text box or a combo box.</ahelp></paragraph>
+ </section>
+ <section id="Section16">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_DEFAULT_BUTTON" id="bm_id3156300" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145206" role="heading" level="2" l10n="U"
+ oldref="144">Default button</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154681" role="paragraph" l10n="U" oldref="145"><ahelp hid="HID_PROP_DEFAULT_BUTTON" visibility="hidden">The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key.</ahelp>The<emph> Default button</emph> property specifies that the corresponding button will be operated when you press the Return key. If you open the dialog or form and do not carry out any further action, the button with this property is the default button.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149750" role="note" l10n="U" oldref="175">This property should be assigned only to a single button within the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150931" role="paragraph" l10n="U" oldref="177">When using Web page forms, you might come across this property in search masks. These are edit masks that contain a text field and a Submit type button. The search term is entered in the text field and the search is started by activating the button. If the button is defined as the default button, however, simply hit Enter after entering the search term in order to start the search.</paragraph>
+ </section>
+ <section id="Section15">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRSYM_POSITION" id="bm_id3150265" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153389" role="heading" level="2" l10n="U"
+ oldref="221">Prefix symbol</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150271" role="paragraph" l10n="U" oldref="222"><ahelp hid="HID_PROP_CURRSYM_POSITION">Determines if the currency symbol is displayed before or after the number when using currency fields.</ahelp> The default setting is currency symbols are not prefixed.</paragraph>
+ </section>
+ <section id="Section14">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TABSTOP" id="bm_id3148938" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154548" role="heading" level="2" l10n="U"
+ oldref="48">Tabstop</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155361" role="paragraph" l10n="U" oldref="49"><ahelp hid="HID_PROP_TABSTOP">The <emph>Tabstop </emph>property determines if a control field can be selected with the tab key.</ahelp> The following options are available:<comment>UFI: Default entry row deleted from table</comment></paragraph>
+ <table id="tbl_id3154843">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148627" role="paragraph" l10n="U" oldref="52">No</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3161673" role="paragraph" l10n="U" oldref="53">When using the tab key, focusing skips the control.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159323" role="paragraph" l10n="U" oldref="50">Yes</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148584" role="paragraph" l10n="U" oldref="51">The control can be selected with the Tab key.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ <section id="Section13">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOWTHOUSANDSEP" id="bm_id3154931" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146909" role="heading" level="2" l10n="U"
+ oldref="147">Thousands separator</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154936" role="paragraph" l10n="U" oldref="148"><ahelp hid="HID_PROP_SHOWTHOUSANDSEP" visibility="hidden">Inserts a thousands separator.</ahelp>With numerical and currency fields you can determine whether thousands separators are used.</paragraph>
+ </section>
+ <section id="Section12">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LABEL" id="bm_id3159212" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156256" role="heading" level="2" l10n="U" oldref="7">Label</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156432" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_PROP_LABEL" visibility="hidden">The Label property sets the label of the control field that is displayed in the form.</ahelp>The Label property sets the label of the control field that is displayed in the form. This property determines the visible label or the column header of the data field in table control forms.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="54">When you create a new control, the description predefined in the <emph>Name</emph> property is used as the default for labeling the control. The label consists of the control field name and an integer numbering the control (for example, CommandButton1). With the <emph>Title</emph> property, you can assign another description to the control so that the label reflects the function of the control. Change this entry in order to assign an expressive label to the control that is visible to the user.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3163820"><bookmark_value>multi-line titles in forms</bookmark_value>
-<bookmark_value>names; multi-line titles</bookmark_value>
-<bookmark_value>controls; multi-line titles</bookmark_value>
+ <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+<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">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_URL" id="bm_id3154726" localize="false"/><paragraph role="heading" id="hd_id3150293" xml-lang="en-US" level="2" l10n="U" oldref="56">URL</paragraph>
-<paragraph role="paragraph" id="par_id3154358" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="HID_PROP_TARGET_URL" visibility="hidden">Specifies the URL address that opens when you click an "Open document / web page" button.</ahelp>Enter the URL address for a Open document or web page button type in the <emph>URL</emph> box. The address opens when you click the button.</paragraph>
-<paragraph role="paragraph" id="par_id3146074" xml-lang="en-US" l10n="U" oldref="211">If you move the mouse over the button in User mode, the URL appears as the extended tip, provided that no other Help text was entered.</paragraph>
-</section>
-<section id="Section10">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRENCYSYMBOL" id="bm_id3145154" localize="false"/><paragraph role="heading" id="hd_id3147134" xml-lang="en-US" level="2" l10n="U" oldref="149">Currency symbol</paragraph>
-<paragraph role="paragraph" id="par_id3145160" xml-lang="en-US" l10n="U" oldref="150"><ahelp hid="HID_PROP_CURRENCYSYMBOL" visibility="hidden">You can enter a character or a string for the currency symbol.</ahelp>In a currency field, you can pre-define the currency symbol by entering the character or string in the <emph>Currency symbol</emph> property.</paragraph>
-</section>
-<section id="Section9">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDDEN_VALUE" id="bm_id3156100" localize="false"/><paragraph role="heading" id="hd_id3144444" xml-lang="en-US" level="2" l10n="U" oldref="154">Value</paragraph>
-<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="155"><ahelp hid="HID_PROP_HIDDEN_VALUE" visibility="hidden">You can enter the data that is inherited by the hidden control.</ahelp>In a <link href="text/shared/02/01170600.xhp" name="hidden control">hidden control</link>, under <emph>Value</emph>, you can enter the data which is inherited by the hidden control. This data will be transferred when sending the form.</paragraph>
-</section>
-<section id="Section8">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ECHO_CHAR" id="bm_id3148694" localize="false"/><paragraph role="heading" id="hd_id3157315" xml-lang="en-US" level="2" l10n="U" oldref="156">Password characters</paragraph>
-<paragraph role="paragraph" id="par_id3155323" xml-lang="en-US" l10n="U" oldref="157"><ahelp hid="HID_PROP_ECHO_CHAR" visibility="hidden">If the text box is used as a password input, enter the ASCII-code of the display character. This character is displayed instead of the characters typed by the user for the password.</ahelp>If the user enters a password, you can determine the characters that will be displayed instead of the characters typed by the user. Under <emph>Password character</emph>, enter the ASCII code of the desired character. You can use the values from 0 to 255.</paragraph>
-<paragraph role="tip" id="par_id3152493" xml-lang="en-US" l10n="CHG" oldref="158">The characters and their ASCII codes can be seen in the <emph>Special Characters</emph> dialog (Insert - Special Character).</paragraph>
-</section>
-<section id="Section7">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LITERALMASK" id="bm_id3157547" localize="false"/><paragraph role="heading" id="hd_id3157884" xml-lang="en-US" level="2" l10n="U" oldref="159">Literal mask</paragraph>
-<paragraph role="paragraph" id="par_id3157557" xml-lang="en-US" l10n="U" oldref="160"><ahelp hid="HID_PROP_LITERALMASK" visibility="hidden">Defines the literal mask. The literal mask contains the initial values and is always visible after downloading a form.</ahelp>With masked fields you can specify a literal mask. A literal mask contains the initial values of a form, and is always visible after downloading a form. Using a character code for the Edit mask, you can determine the entries that the user can type into the masked field.</paragraph>
-<paragraph role="note" id="par_id3148513" xml-lang="en-US" l10n="U" oldref="161">The length of the literal mask should always correspond to the length of the edit mask. If this is not the case, the edit mask is either cut off or filled with blanks up to the length of the edit mask.</paragraph>
-</section>
-<section id="Section6">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FONT" id="bm_id3151032" localize="false"/><paragraph role="heading" id="hd_id3146762" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Font<comment>UFI: dba.features "Character set property renamed to Font"</comment></paragraph>
-<paragraph role="paragraph" id="par_id3151037" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_PROP_FONT" visibility="hidden">Select the font for the text that is in the control field.</ahelp>For control fields which have visible text or titles, select the display font that you want to use. To open the <link href="text/shared/01/05020100.xhp" name="Font"><emph>Font</emph></link> dialog, click the <emph>...</emph> button. The selected font is used in control fields names and to display data in table control fields.</paragraph>
-</section>
-<section id="Section5">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ROWHEIGHT" id="bm_id3160449" localize="false"/><paragraph role="heading" id="hd_id3156734" xml-lang="en-US" level="2" l10n="U" oldref="162">Row height</paragraph>
-<paragraph role="paragraph" id="par_id3160455" xml-lang="en-US" l10n="CHG" oldref="163"><ahelp hid="HID_PROP_ROWHEIGHT" visibility="hidden">Specifies the row height of a table control field.</ahelp>In table controls, enter a value for the row height. If you want, you can enter a value followed by valid measurement unit, for example, 2 cm.</paragraph>
-</section>
-<section id="Section77">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEEND_FORMAT" id="bm_id396130" localize="false"/><paragraph role="heading" id="par_idN11FB6" xml-lang="en-US" level="2" l10n="NEW">Text lines end with</paragraph>
-<paragraph role="paragraph" id="par_idN11FBA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For text fields, select the line end code to be used when writing text into a database column.</ahelp><comment>UFI: spec dba-features: "form text fields: New property Text lines end with"</comment></paragraph>
-</section>
-<section id="Section4">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEFORMAT" id="bm_id3145181" localize="false"/><paragraph role="heading" id="hd_id3160477" xml-lang="en-US" level="2" l10n="U" oldref="168">Time format</paragraph>
-<paragraph role="paragraph" id="par_id3145187" xml-lang="en-US" l10n="U" oldref="169"><ahelp hid="HID_PROP_TIMEFORMAT" visibility="hidden">You can define the desired format for the time display.</ahelp>You can define the desired format for the time display.</paragraph>
-</section>
-<section id="Section3">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_TAG" id="bm_id3158205" localize="false"/><paragraph role="heading" id="hd_id3158195" xml-lang="en-US" level="2" l10n="U" oldref="170">Help text</paragraph>
-<paragraph role="paragraph" id="par_id3146823" xml-lang="en-US" l10n="U" oldref="171"><ahelp hid="HID_PROP_TAG" visibility="hidden">Specifies additional information or a descriptive text for the control field.</ahelp>In each control field you can specify additional information or a descriptive text for the control field. This property helps the programmer to save additional information that can be used in the program code. This field can be used, for example, for variables or other evaluation parameters.</paragraph>
-</section>
-<section id="Section2">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FORMATKEY" id="bm_id3157839" localize="false"/><paragraph role="heading" id="hd_id3157828" xml-lang="en-US" level="2" l10n="U" oldref="232">Formatting</paragraph>
-<paragraph role="paragraph" id="par_id3146843" xml-lang="en-US" l10n="U" oldref="233"><ahelp hid="HID_PROP_FORMATKEY">Specifies the format code for the control. Click the <emph>...</emph> button to select the format code.</ahelp></paragraph>
-</section>
-<section id="Section69">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCALEIMAGE" id="bm_id1145054" localize="false"/><paragraph role="heading" id="par_idN122C4" xml-lang="en-US" level="2" l10n="NEW">Scale</paragraph>
-<paragraph role="paragraph" id="par_idN122C8" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_SCALEIMAGE">Resizes the image to fit the size of the control.</ahelp></paragraph>
-</section>
-<section id="Section23">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_RECORDACTIONS" id="bm_id7442243" localize="false"/><paragraph role="heading" id="par_idN1209F" xml-lang="en-US" level="2" l10n="NEW">Acting on a record</paragraph>
-<paragraph role="paragraph" id="par_idN120B1" xml-lang="en-US" l10n="NEW"><ahelp hid="37930">Specifies to show or hide the action items in a selected Navigation Bar control.</ahelp> Action items are the following: Save record, Undo, New record, Delete record, Refresh.</paragraph>
-</section>
-<section id="Section70">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_POSITION" id="bm_id9985961" localize="false"/><paragraph role="heading" id="par_idN120BE" xml-lang="en-US" level="2" l10n="NEW">Positioning</paragraph>
-<paragraph role="paragraph" id="par_idN120D9" xml-lang="en-US" l10n="NEW"><ahelp hid="37928">Specifies to show or hide the positioning items in a selected Navigation Bar control.</ahelp> Positioning items are the following: Record label, Record position, Record count label, Record count.</paragraph>
-</section>
-<section id="Section74">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_NAVIGATION" id="bm_id1122775" localize="false"/><paragraph role="heading" id="par_idN120D7" xml-lang="en-US" level="2" l10n="NEW">Navigation</paragraph>
-<paragraph role="paragraph" id="par_idN120DB" xml-lang="en-US" l10n="NEW"><ahelp hid="37929">Specifies to show or hide the navigation items in a selected Navigation Bar control.</ahelp> Navigation items are the following: First record, Previous record, Next record, Last record.</paragraph>
-</section>
-<section id="Section75">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_FILTERSORT" id="bm_id7137363" localize="false"/><paragraph role="heading" id="par_idN12156" xml-lang="en-US" level="2" l10n="NEW">Filtering / Sorting</paragraph>
-<paragraph role="paragraph" id="par_idN1215A" xml-lang="en-US" l10n="NEW"><ahelp hid="37931">Specifies to show or hide the filtering and sorting items in a selected Navigation Bar control.</ahelp> Filtering and sorting items are the following: Sort ascending, Sort descending, Sort, Automatic filter, Default filter, Apply filter, Remove filter/sort.</paragraph>
-</section>
-<section id="Section76">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ICONSIZE" id="bm_id7815790" localize="false"/><paragraph role="heading" id="par_idN12175" xml-lang="en-US" level="2" l10n="NEW">Icon Size</paragraph>
-<paragraph role="paragraph" id="par_idN12179" xml-lang="en-US" l10n="NEW"><ahelp hid="37927">Specifies whether the icons in a selected Navigation Bar should be small or large.</ahelp></paragraph>
-</section>
-<section id="Section82">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISIBLESIZE" id="bm_id5840937" localize="false"/><paragraph role="heading" id="par_idN12314" xml-lang="en-US" level="2" l10n="NEW">Visible size</paragraph>
-<paragraph role="paragraph" id="par_idN12318" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the size of scrollbar thumb in "value units". A value of ("Scroll value max." minus "Scroll value min." ) / 2 would result in a thumb which occupies half of the background area.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN12375" xml-lang="en-US" l10n="NEW">If set to 0, then the thumb's width will equal its height.</paragraph>
-</section>
-<section id="Section83">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_ORIENTATION" id="bm_id4076967" localize="false"/><paragraph role="heading" id="par_idN12332" xml-lang="en-US" level="2" l10n="NEW">Orientation</paragraph>
-<paragraph role="paragraph" id="par_idN12336" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the horizontal or vertical orientation for a scrollbar or spin button.</ahelp></paragraph>
-</section>
-</sort></body>
+<paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" 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 xml-lang="en-US" id="par_id3159407" role="note" 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">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TARGET_URL" id="bm_id3154726" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150293" role="heading" level="2" l10n="U"
+ oldref="56">URL</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154358" role="paragraph" l10n="CHG" oldref="57"><ahelp hid="HID_PROP_TARGET_URL" visibility="hidden">Specifies the URL address that opens when you click an "Open document / web page" button.</ahelp>Enter the URL address for a Open document or web page button type in the <emph>URL</emph> box. The address opens when you click the button.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146074" role="paragraph" l10n="U" oldref="211">If you move the mouse over the button in User mode, the URL appears as the extended tip, provided that no other Help text was entered.</paragraph>
+ </section>
+ <section id="Section10">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CURRENCYSYMBOL" id="bm_id3145154" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147134" role="heading" level="2" l10n="U"
+ oldref="149">Currency symbol</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145160" role="paragraph" l10n="U" oldref="150"><ahelp hid="HID_PROP_CURRENCYSYMBOL" visibility="hidden">You can enter a character or a string for the currency symbol.</ahelp>In a currency field, you can pre-define the currency symbol by entering the character or string in the <emph>Currency symbol</emph> property.</paragraph>
+ </section>
+ <section id="Section9">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_HIDDEN_VALUE" id="bm_id3156100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144444" role="heading" level="2" l10n="U"
+ oldref="154">Value</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152417" role="paragraph" l10n="U" oldref="155"><ahelp hid="HID_PROP_HIDDEN_VALUE" visibility="hidden">You can enter the data that is inherited by the hidden control.</ahelp>In a <link href="text/shared/02/01170600.xhp" name="hidden control">hidden control</link>, under <emph>Value</emph>, you can enter the data which is inherited by the hidden control. This data will be transferred when sending the form.</paragraph>
+ </section>
+ <section id="Section8">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ECHO_CHAR" id="bm_id3148694" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157315" role="heading" level="2" l10n="U"
+ oldref="156">Password characters</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155323" role="paragraph" l10n="U" oldref="157"><ahelp hid="HID_PROP_ECHO_CHAR" visibility="hidden">If the text box is used as a password input, enter the ASCII-code of the display character. This character is displayed instead of the characters typed by the user for the password.</ahelp>If the user enters a password, you can determine the characters that will be displayed instead of the characters typed by the user. Under <emph>Password character</emph>, enter the ASCII code of the desired character. You can use the values from 0 to 255.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152493" role="tip" l10n="CHG" oldref="158">The characters and their ASCII codes can be seen in the <emph>Special Characters</emph> dialog (Insert - Special Character).</paragraph>
+ </section>
+ <section id="Section7">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LITERALMASK" id="bm_id3157547" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157884" role="heading" level="2" l10n="U"
+ oldref="159">Literal mask</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157557" role="paragraph" l10n="U" oldref="160"><ahelp hid="HID_PROP_LITERALMASK" visibility="hidden">Defines the literal mask. The literal mask contains the initial values and is always visible after downloading a form.</ahelp>With masked fields you can specify a literal mask. A literal mask contains the initial values of a form, and is always visible after downloading a form. Using a character code for the Edit mask, you can determine the entries that the user can type into the masked field.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148513" role="note" l10n="U" oldref="161">The length of the literal mask should always correspond to the length of the edit mask. If this is not the case, the edit mask is either cut off or filled with blanks up to the length of the edit mask.</paragraph>
+ </section>
+ <section id="Section6">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FONT" id="bm_id3151032" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146762" role="heading" level="2" l10n="CHG"
+ oldref="5">Font<comment>UFI: dba.features "Character set property renamed to Font"</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151037" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="HID_PROP_FONT" visibility="hidden">Select the font for the text that is in the control field.</ahelp>For control fields which have visible text or titles, select the display font that you want to use. To open the <link href="text/shared/01/05020100.xhp" name="Font"><emph>Font</emph></link> dialog, click the <emph>...</emph> button. The selected font is used in control fields names and to display data in table control fields.</paragraph>
+ </section>
+ <section id="Section5">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ROWHEIGHT" id="bm_id3160449" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156734" role="heading" level="2" l10n="U"
+ oldref="162">Row height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3160455" role="paragraph" l10n="CHG" oldref="163"><ahelp hid="HID_PROP_ROWHEIGHT" visibility="hidden">Specifies the row height of a table control field.</ahelp>In table controls, enter a value for the row height. If you want, you can enter a value followed by valid measurement unit, for example, 2 cm.</paragraph>
+ </section>
+ <section id="Section77">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LINEEND_FORMAT" id="bm_id396130" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN11FB6" role="heading" level="2" l10n="NEW">Text lines end with</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN11FBA" role="paragraph" l10n="NEW"><ahelp hid=".">For text fields, select the line end code to be used when writing text into a database column.</ahelp><comment>UFI: spec dba-features: "form text fields: New property Text lines end with"</comment></paragraph>
+ </section>
+ <section id="Section4">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TIMEFORMAT" id="bm_id3145181" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3160477" role="heading" level="2" l10n="U"
+ oldref="168">Time format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145187" role="paragraph" l10n="U" oldref="169"><ahelp hid="HID_PROP_TIMEFORMAT" visibility="hidden">You can define the desired format for the time display.</ahelp>You can define the desired format for the time display.</paragraph>
+ </section>
+ <section id="Section3">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_TAG" id="bm_id3158205" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158195" role="heading" level="2" l10n="U"
+ oldref="170">Help text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146823" role="paragraph" l10n="U" oldref="171"><ahelp hid="HID_PROP_TAG" visibility="hidden">Specifies additional information or a descriptive text for the control field.</ahelp>In each control field you can specify additional information or a descriptive text for the control field. This property helps the programmer to save additional information that can be used in the program code. This field can be used, for example, for variables or other evaluation parameters.</paragraph>
+ </section>
+ <section id="Section2">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FORMATKEY" id="bm_id3157839" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157828" role="heading" level="2" l10n="U"
+ oldref="232">Formatting</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146843" role="paragraph" l10n="U" oldref="233"><ahelp hid="HID_PROP_FORMATKEY">Specifies the format code for the control. Click the <emph>...</emph> button to select the format code.</ahelp></paragraph>
+ </section>
+ <section id="Section69">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SCALEIMAGE" id="bm_id1145054" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN122C4" role="heading" level="2" l10n="NEW">Scale</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN122C8" role="paragraph" l10n="NEW"><ahelp hid="HID_PROP_SCALEIMAGE">Resizes the image to fit the size of the control.</ahelp></paragraph>
+ </section>
+ <section id="Section23">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_RECORDACTIONS" id="bm_id7442243" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1209F" role="heading" level="2" l10n="NEW">Acting on a record</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN120B1" role="paragraph" l10n="NEW"><ahelp hid="37930">Specifies to show or hide the action items in a selected Navigation Bar control.</ahelp> Action items are the following: Save record, Undo, New record, Delete record, Refresh.</paragraph>
+ </section>
+ <section id="Section70">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_POSITION" id="bm_id9985961" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN120BE" role="heading" level="2" l10n="NEW">Positioning</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN120D9" role="paragraph" l10n="NEW"><ahelp hid="37928">Specifies to show or hide the positioning items in a selected Navigation Bar control.</ahelp> Positioning items are the following: Record label, Record position, Record count label, Record count.</paragraph>
+ </section>
+ <section id="Section74">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_NAVIGATION" id="bm_id1122775" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN120D7" role="heading" level="2" l10n="NEW">Navigation</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN120DB" role="paragraph" l10n="NEW"><ahelp hid="37929">Specifies to show or hide the navigation items in a selected Navigation Bar control.</ahelp> Navigation items are the following: First record, Previous record, Next record, Last record.</paragraph>
+ </section>
+ <section id="Section75">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_SHOW_FILTERSORT" id="bm_id7137363" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12156" role="heading" level="2" l10n="NEW">Filtering / Sorting</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1215A" role="paragraph" l10n="NEW"><ahelp hid="37931">Specifies to show or hide the filtering and sorting items in a selected Navigation Bar control.</ahelp> Filtering and sorting items are the following: Sort ascending, Sort descending, Sort, Automatic filter, Default filter, Apply filter, Remove filter/sort.</paragraph>
+ </section>
+ <section id="Section76">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ICONSIZE" id="bm_id7815790" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12175" role="heading" level="2" l10n="NEW">Icon Size</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN12179" role="paragraph" l10n="NEW"><ahelp hid="37927">Specifies whether the icons in a selected Navigation Bar should be small or large.</ahelp></paragraph>
+ </section>
+ <section id="Section73">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ENABLE_VISIBLE" id="bm_id7815890" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0409200920593864" role="heading" level="2" l10n="NEW">Visible</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200920593851" role="paragraph" l10n="NEW"><ahelp hid=".">Defines whether the control will be visible in live mode. In design mode, the control is always visible.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200921154683" role="paragraph" l10n="NEW">Note that if this property is set to "Yes" (the default), this does not necessarily mean the control will really appear on the screen. Additional constraints are applied when calculating a control's effective visibility. For instance, a control placed in a hidden section in Writer will never be visible at all, until at least the section itself becomes visible.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200921154691" role="paragraph" l10n="NEW">If the property is set to "No", then the control will always be hidden in live mode.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200921154614" role="paragraph" l10n="NEW">Older OpenOffice.org versions up to 3.1 will silently ignore this property when reading documents which make use of it.</paragraph>
+ </section>
+ <section id="Section82">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VISIBLESIZE" id="bm_id5840937" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12314" role="heading" level="2" l10n="NEW">Visible size</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN12318" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the size of scrollbar thumb in "value units". A value of ("Scroll value max." minus "Scroll value min." ) / 2 would result in a thumb which occupies half of the background area.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN12375" role="paragraph" l10n="NEW">If set to 0, then the thumb's width will equal its height.</paragraph>
+ </section>
+ <section id="Section83">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_ORIENTATION" id="bm_id4076967" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN12332" role="heading" level="2" l10n="NEW">Orientation</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN12336" role="paragraph" l10n="CHG"><ahelp hid=".">Specifies the horizontal or vertical orientation for a scrollbar or spin button.</ahelp></paragraph>
+ </section>
+</sort>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170102.xhp b/helpcontent2/source/text/shared/02/01170102.xhp
index 4343301582..5fec40802b 100644
--- a/helpcontent2/source/text/shared/02/01170102.xhp
+++ b/helpcontent2/source/text/shared/02/01170102.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170102.xhp,v $
- * $Revision: 1.15.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170103.xhp b/helpcontent2/source/text/shared/02/01170103.xhp
index c42ce96d80..93d7b59b45 100755..100644
--- a/helpcontent2/source/text/shared/02/01170103.xhp
+++ b/helpcontent2/source/text/shared/02/01170103.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01170103.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,59 +31,87 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0201170103xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Events</title>
-<filename>/text/shared/02/01170103.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="ereignisse">
+ <topic id="textshared0201170103xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Events</title>
+ <filename>/text/shared/02/01170103.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="ereignisse">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148643"><bookmark_value>controls; events</bookmark_value>
-<bookmark_value>events; controls</bookmark_value>
-<bookmark_value>macros; assigning to events in forms</bookmark_value>
+ <bookmark_value>events; controls</bookmark_value>
+ <bookmark_value>macros; assigning to events in forms</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3148643" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170103.xhp" name="Events">Events</link></paragraph>
-<paragraph role="paragraph" id="par_id3152350" xml-lang="en-US" l10n="U" oldref="2">On the<emph> Events </emph>tab page you can link macros to events that occur in a form's control fields.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="40">When the event occurs, the linked macro will be called. To assign a macro to an event, press the <emph>...</emph> button. An <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05060700.xhp" name="Assign Macro">Assign Macro</link>
+<paragraph xml-lang="en-US" id="hd_id3148643" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170103.xhp" name="Events">Events</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152350" role="paragraph" l10n="U" oldref="2">On the<emph> Events </emph>tab page you can link macros to events that occur in a form's control fields.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="40">When the event occurs, the linked macro will be called. To assign a macro to an event, press the <emph>...</emph> button. An <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05060700.xhp" name="Assign Macro">Assign Macro</link>
</caseinline><defaultinline>dialog</defaultinline></switchinline> opens.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#controleigenschaftenereignisse"/>
-</section>
-<paragraph role="paragraph" id="par_id3149732" xml-lang="en-US" l10n="U" oldref="3">Depending on the control, different events are available. Only the available events for the selected control and context are listed on the <emph>Events</emph> tab page. The following events are defined:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEACTIONPERFORMED" id="bm_id3153252" localize="false"/><paragraph role="heading" id="hd_id3149191" xml-lang="en-US" level="2" l10n="U" oldref="12">Before commencing</paragraph>
-<paragraph role="paragraph" id="par_id3153717" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_EVT_APPROVEACTIONPERFORMED">This event takes place before an action is triggered by clicking the control.</ahelp> For example, clicking a "Submit" button initiates a send action; however, the actual "send" process is started only when the <emph>When initiating</emph> event occurs. The <emph>Before commencing</emph> event allows you to kill the process. If the linked method sends back FALSE, <emph>When initiating</emph> will not be executed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_ACTIONPERFORMED" id="bm_id3155923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="36">When initiating</paragraph>
-<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="HID_EVT_ACTIONPERFORMED">The<emph> When initiating </emph>event occurs when an action is started.</ahelp> For example, if you have a "Submit" button in your form, the send process represents the action to be initiated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_CHANGED" id="bm_id3154924" localize="false"/><paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="41">Changed</paragraph>
-<paragraph role="paragraph" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="HID_EVT_CHANGED">The<emph> Changed </emph>event takes place when the control loses the focus and the content of the control has changed since it lost the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_TEXTCHANGED" id="bm_id3147084" localize="false"/><paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="10">Text modified</paragraph>
-<paragraph role="paragraph" id="par_id3150495" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_EVT_TEXTCHANGED">The<emph> Text modified </emph>event takes place if you enter or modify a text in an input field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_ITEMSTATECHANGED" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="2" l10n="U" oldref="8">Item status changed</paragraph>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_EVT_ITEMSTATECHANGED" visibility="hidden">The<emph> Item status changed </emph>event takes place if the status of the control field has changed.</ahelp>The<emph> Item status changed</emph> event takes place if he status of the control field has changed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSGAINED" id="bm_id3158407" localize="false"/><paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="16">When receiving focus</paragraph>
-<paragraph role="paragraph" id="par_id3154218" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_EVT_FOCUSGAINED">The<emph> When receiving focus </emph>event takes place if a control field receives the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSLOST" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="2" l10n="U" oldref="18">When losing focus</paragraph>
-<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_EVT_FOCUSLOST">The<emph> When losing focus </emph>event takes place if a control field looses the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYTYPED" id="bm_id3145787" localize="false"/><paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="2" l10n="U" oldref="20">Key pressed</paragraph>
-<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_EVT_KEYTYPED">The <emph>Key pressed </emph>event occurs when the user presses any key while the control has the focus.</ahelp> This event may be linked to a macro for checking entries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYUP" id="bm_id3145264" localize="false"/><paragraph role="heading" id="hd_id3154127" xml-lang="en-US" level="2" l10n="U" oldref="43">Key released</paragraph>
-<paragraph role="paragraph" id="par_id3154150" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_EVT_KEYUP">The<emph> Key released </emph>event occurs when the user releases any key while the control has the focus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEENTERED" id="bm_id3155368" localize="false"/><paragraph role="heading" id="hd_id3154921" xml-lang="en-US" level="2" l10n="U" oldref="26">Mouse inside</paragraph>
-<paragraph role="paragraph" id="par_id3148618" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_EVT_MOUSEENTERED">The<emph> Mouse inside </emph>event takes place if the mouse is inside the control field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEDRAGGED" id="bm_id3159180" localize="false"/><paragraph role="heading" id="hd_id3148576" xml-lang="en-US" level="2" l10n="U" oldref="30">Mouse moved while key pressed</paragraph>
-<paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="HID_EVT_MOUSEDRAGGED">The<emph> Mouse moved while key pressed </emph>event takes place when the mouse is dragged while a key is pressed.</ahelp> An example is when, during drag-and-drop, an additional key determines the mode (move or copy).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEMOVED" id="bm_id3147443" localize="false"/><paragraph role="heading" id="hd_id3149262" xml-lang="en-US" level="2" l10n="U" oldref="32">Mouse moved</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_EVT_MOUSEMOVED">The<emph> Mouse moved </emph>event occurs if the mouse moves over the control.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEPRESSED" id="bm_id3145366" localize="false"/><paragraph role="heading" id="hd_id3159197" xml-lang="en-US" level="2" l10n="U" oldref="22">Mouse button pressed</paragraph>
-<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_EVT_MOUSEPRESSED">The<emph> Mouse button pressed </emph>event occurs if the mouse button is pressed while the mouse pointer is on the control.</ahelp></paragraph>
-<paragraph role="note" id="par_idN108BD" xml-lang="en-US" l10n="NEW">Note that this event is also used for notifying requests for a popup context menu on the control. If you are using this event by a program macro, you find more information in the "StarOffice 8 Programming Guide for BASIC".<comment>UFI: see #i40558#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSERELEASED" id="bm_id3144766" localize="false"/><paragraph role="heading" id="hd_id3148880" xml-lang="en-US" level="2" l10n="U" oldref="24">Mouse button released</paragraph>
-<paragraph role="paragraph" id="par_id3150659" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_EVT_MOUSERELEASED">The<emph> Mouse button released </emph>event occurs if the mouse button is released while the mouse pointer is on the control.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEEXITED" id="bm_id3150094" localize="false"/><paragraph role="heading" id="hd_id3156286" xml-lang="en-US" level="2" l10n="U" oldref="28">Mouse outside</paragraph>
-<paragraph role="paragraph" id="par_id3149582" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_EVT_MOUSEEXITED">The<emph> Mouse outside </emph>event takes place when the mouse is outside the control field.</ahelp></paragraph>
-<embed href="text/shared/02/01170202.xhp#reset_update"/>
-</body>
-</helpdocument>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040501.xhp#controleigenschaftenereignisse"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149732" role="paragraph" l10n="U" oldref="3">Depending on the control, different events are available. Only the available events for the selected control and context are listed on the <emph>Events</emph> tab page. The following events are defined:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEACTIONPERFORMED" id="bm_id3153252" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149191" role="heading" level="2" l10n="CHG"
+ oldref="12">Approve action<comment>renamed from Before commencing, issue 97356</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153717" role="paragraph" l10n="CHG" oldref="13"><ahelp hid="HID_EVT_APPROVEACTIONPERFORMED">This event takes place before an action is triggered by clicking the control.</ahelp> For example, clicking a "Submit" button initiates a send action; however, the actual "send" process is started only when the <emph>When initiating</emph> event occurs. The <emph>Approve action</emph> event allows you to kill the process. If the linked method sends back FALSE, <emph>When initiating</emph> will not be executed.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_ACTIONPERFORMED" id="bm_id3155923" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156024" role="heading" level="2" l10n="CHG"
+ oldref="36">Execute action<comment>renamed from When initiated, issue 97356</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145609" role="paragraph" l10n="CHG" oldref="37"><ahelp hid="HID_EVT_ACTIONPERFORMED">The <emph>Execute action</emph> event occurs when an action is started.</ahelp> For example, if you have a "Submit" button in your form, the send process represents the action to be initiated.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_CHANGED" id="bm_id3154924" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156343" role="heading" level="2" l10n="U"
+ oldref="41">Changed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148755" role="paragraph" l10n="U" oldref="42"><ahelp hid="HID_EVT_CHANGED">The<emph> Changed </emph>event takes place when the control loses the focus and the content of the control has changed since it lost the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_TEXTCHANGED" id="bm_id3147084" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="2" l10n="U"
+ oldref="10">Text modified</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150495" role="paragraph" l10n="U" oldref="11"><ahelp hid="HID_EVT_TEXTCHANGED">The<emph> Text modified </emph>event takes place if you enter or modify a text in an input field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_ITEMSTATECHANGED" id="bm_id3154910" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154123" role="heading" level="2" l10n="U" oldref="8">Item status changed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150870" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_EVT_ITEMSTATECHANGED" visibility="hidden">The<emph> Item status changed </emph>event takes place if the status of the control field has changed.</ahelp>The<emph> Item status changed</emph> event takes place if he status of the control field has changed.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSGAINED" id="bm_id3158407" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151176" role="heading" level="2" l10n="U"
+ oldref="16">When receiving focus</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154218" role="paragraph" l10n="U" oldref="17"><ahelp hid="HID_EVT_FOCUSGAINED">The<emph> When receiving focus </emph>event takes place if a control field receives the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_FOCUSLOST" id="bm_id3154684" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150447" role="heading" level="2" l10n="U"
+ oldref="18">When losing focus</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_EVT_FOCUSLOST">The<emph> When losing focus </emph>event takes place if a control field looses the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYTYPED" id="bm_id3145787" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147287" role="heading" level="2" l10n="U"
+ oldref="20">Key pressed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152940" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_EVT_KEYTYPED">The <emph>Key pressed </emph>event occurs when the user presses any key while the control has the focus.</ahelp> This event may be linked to a macro for checking entries.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_KEYUP" id="bm_id3145264" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154127" role="heading" level="2" l10n="U"
+ oldref="43">Key released</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="U" oldref="44"><ahelp hid="HID_EVT_KEYUP">The<emph> Key released </emph>event occurs when the user releases any key while the control has the focus.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEENTERED" id="bm_id3155368" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154921" role="heading" level="2" l10n="U"
+ oldref="26">Mouse inside</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148618" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_EVT_MOUSEENTERED">The<emph> Mouse inside </emph>event takes place if the mouse is inside the control field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEDRAGGED" id="bm_id3159180" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148576" role="heading" level="2" l10n="U"
+ oldref="30">Mouse moved while key pressed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155411" role="paragraph" l10n="U" oldref="31"><ahelp hid="HID_EVT_MOUSEDRAGGED">The<emph> Mouse moved while key pressed </emph>event takes place when the mouse is dragged while a key is pressed.</ahelp> An example is when, during drag-and-drop, an additional key determines the mode (move or copy).</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEMOVED" id="bm_id3147443" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149262" role="heading" level="2" l10n="U"
+ oldref="32">Mouse moved</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="33"><ahelp hid="HID_EVT_MOUSEMOVED">The<emph> Mouse moved </emph>event occurs if the mouse moves over the control.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEPRESSED" id="bm_id3145366" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159197" role="heading" level="2" l10n="U"
+ oldref="22">Mouse button pressed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145271" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_EVT_MOUSEPRESSED">The<emph> Mouse button pressed </emph>event occurs if the mouse button is pressed while the mouse pointer is on the control.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN108BD" role="note" l10n="NEW">Note that this event is also used for notifying requests for a popup context menu on the control.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSERELEASED" id="bm_id3144766" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148880" role="heading" level="2" l10n="U"
+ oldref="24">Mouse button released</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150659" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_EVT_MOUSERELEASED">The<emph> Mouse button released </emph>event occurs if the mouse button is released while the mouse pointer is on the control.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSEEXITED" id="bm_id3150094" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156286" role="heading" level="2" l10n="U"
+ oldref="28">Mouse outside</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149582" role="paragraph" l10n="U" oldref="29"><ahelp hid="HID_EVT_MOUSEEXITED">The<emph> Mouse outside </emph>event takes place when the mouse is outside the control field.</ahelp></paragraph>
+ <embed href="text/shared/02/01170202.xhp#reset_update"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01170200.xhp b/helpcontent2/source/text/shared/02/01170200.xhp
index 6c8f560e4c..3b7be0119b 100644
--- a/helpcontent2/source/text/shared/02/01170200.xhp
+++ b/helpcontent2/source/text/shared/02/01170200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170201.xhp b/helpcontent2/source/text/shared/02/01170201.xhp
index 04c549430a..c596d9f2a0 100755
--- a/helpcontent2/source/text/shared/02/01170201.xhp
+++ b/helpcontent2/source/text/shared/02/01170201.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170201.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170202.xhp b/helpcontent2/source/text/shared/02/01170202.xhp
index fc0441e815..55bfee19bb 100755
--- a/helpcontent2/source/text/shared/02/01170202.xhp
+++ b/helpcontent2/source/text/shared/02/01170202.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170202.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,143 +29,155 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0201170202xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Events</title>
-<filename>/text/shared/02/01170202.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T16:48:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="ereignisse">
+ <topic id="textshared0201170202xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Events</title>
+ <filename>/text/shared/02/01170202.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="ereignisse">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150499"><bookmark_value>forms; events</bookmark_value>
-<bookmark_value>events;in forms</bookmark_value>
+ <bookmark_value>events;in forms</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170202.xhp" name="Events">Events</link></paragraph>
-<paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="2">The<emph> Events </emph>tab page, allows you to assign a macro to certain events which occur in a form.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#formulareigenschaftenereignisse"/>
-</section>
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="3">To link an event with a macro, first write a macro that contains all the commands to be executed when the event happens. Then assign this macro to the respective event by clicking the <emph>... </emph>button beside the corresponding event. The<emph> Assign Macro </emph>dialog opens, where you can select the macro.</paragraph>
-<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="29">The following actions can be configured individually, meaning that you can use your own dialogs to depict an action:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="30">Displaying an error message,</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="31">Confirming a delete process (for data records),</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="32">Querying parameters,</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155261" xml-lang="en-US" l10n="U" oldref="33">Checking input when saving a data record.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153127" xml-lang="en-US" l10n="U" oldref="34">For example, you can issue a "confirm deletion" request such as "Really delete customer xyz?" when deleting a data record.</paragraph>
-<paragraph role="paragraph" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="4">The following lists and describes all events in a form that can be linked to a macro:</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170202.xhp" name="Events">Events</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147043" role="paragraph" l10n="U" oldref="2">The<emph> Events </emph>tab page, allows you to assign a macro to certain events which occur in a form.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040501.xhp#formulareigenschaftenereignisse"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="3">To link an event with a macro, first write a macro that contains all the commands to be executed when the event happens. Then assign this macro to the respective event by clicking the <emph>... </emph>button beside the corresponding event. The<emph> Assign Macro </emph>dialog opens, where you can select the macro.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149182" role="paragraph" l10n="U" oldref="29">The following actions can be configured individually, meaning that you can use your own dialogs to depict an action:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="listitem" l10n="U" oldref="30">Displaying an error message,</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152996" role="listitem" l10n="U" oldref="31">Confirming a delete process (for data records),</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153541" role="listitem" l10n="U" oldref="32">Querying parameters,</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155261" role="listitem" l10n="U" oldref="33">Checking input when saving a data record.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3153127" role="paragraph" l10n="U" oldref="34">For example, you can issue a "confirm deletion" request such as "Really delete customer xyz?" when deleting a data record.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0409200920562590" role="note" l10n="NEW">The events that are shown in the Events dialog cannot be edited directly. You can delete an event from the list by pressing the Del key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150986" role="paragraph" l10n="U" oldref="4">The following lists and describes all events in a form that can be linked to a macro:</paragraph>
<sort order="asc">
-<section id="reset_update"><comment>UFI: removed help id</comment>
-<paragraph role="heading" id="hd_id3147559" xml-lang="en-US" level="2" l10n="U" oldref="17">Before update</paragraph>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="56"><ahelp hid=".">The Before update event occurs before the control content changed by the user is written into the data source.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
+<section id="reset_update">
+ <paragraph xml-lang="en-US" id="hd_id3147559" role="heading" level="2" l10n="U"
+ oldref="17">Before update</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="56"><ahelp hid=".">The Before update event occurs before the control content changed by the user is written into the data source.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_EVT_AFTERUPDATE" id="bm_id3154073" localize="false"/>
-<paragraph role="heading" id="hd_id3153779" xml-lang="en-US" level="2" l10n="U" oldref="19">After update</paragraph>
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="HID_EVT_AFTERUPDATE">The After update event occurs after the control content changed by the user has been written into the data source.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153779" role="heading" level="2" l10n="U"
+ oldref="19">After update</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="U" oldref="57"><ahelp hid="HID_EVT_AFTERUPDATE">The After update event occurs after the control content changed by the user has been written into the data source.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVERESETTED" id="bm_id3154851" localize="false"/>
-<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="2" l10n="U" oldref="36">Prior to reset</paragraph>
-<paragraph role="paragraph" id="par_id3155390" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="HID_EVT_APPROVERESETTED">The<emph> Prior to reset </emph>event occurs before a form is reset.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
-<paragraph role="paragraph" id="par_id3149236" xml-lang="en-US" l10n="U" oldref="52">A form is reset if one of the following conditions is met:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="53">The user presses an (HTML) button that is defined as a reset button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="54">A new and empty record is created in a form that is linked to a data source. For example, in the last record, the <emph>Next Record</emph> button may be pressed.</paragraph>
-</listitem>
-</list>
+<paragraph xml-lang="en-US" id="hd_id3157909" role="heading" level="2" l10n="U"
+ oldref="36">Prior to reset</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="U" oldref="51"><ahelp hid="HID_EVT_APPROVERESETTED">The<emph> Prior to reset </emph>event occurs before a form is reset.</ahelp> The linked macro can, for example, prevent this action by returning "FALSE".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149236" role="paragraph" l10n="U" oldref="52">A form is reset if one of the following conditions is met:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="U" oldref="53">The user presses an (HTML) button that is defined as a reset button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153666" role="listitem" l10n="U" oldref="54">A new and empty record is created in a form that is linked to a data source. For example, in the last record, the <emph>Next Record</emph> button may be pressed.</paragraph>
+ </listitem>
+ </list>
<bookmark xml-lang="en-US" branch="hid/HID_EVT_RESETTED" id="bm_id3152473" localize="false"/>
-<paragraph role="heading" id="hd_id3156119" xml-lang="en-US" level="2" l10n="U" oldref="37">After resetting</paragraph>
-<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_EVT_RESETTED">The<emph> After resetting </emph>event occurs after a form has been reset.</ahelp></paragraph>
-</section>
-<section id="Section13">
+<paragraph xml-lang="en-US" id="hd_id3156119" role="heading" level="2" l10n="U"
+ oldref="37">After resetting</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="55"><ahelp hid="HID_EVT_RESETTED">The<emph> After resetting </emph>event occurs after a form has been reset.</ahelp></paragraph>
+ </section>
+ <section id="Section13">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_SUBMITTED" id="bm_id3147084" localize="false"/>
-<paragraph role="heading" id="hd_id3150870" xml-lang="en-US" level="2" l10n="U" oldref="27">Before submitting</paragraph>
-<paragraph role="paragraph" id="par_id3159152" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_EVT_SUBMITTED">The<emph> Before submitting </emph>event occurs before the form data is sent.</ahelp></paragraph>
-</section>
-<section id="Section12">
+<paragraph xml-lang="en-US" id="hd_id3150870" role="heading" level="2" l10n="U"
+ oldref="27">Before submitting</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159152" role="paragraph" l10n="U" oldref="28"><ahelp hid="HID_EVT_SUBMITTED">The<emph> Before submitting </emph>event occurs before the form data is sent.</ahelp></paragraph>
+ </section>
+ <section id="Section12">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_LOADED" id="bm_id3151383" localize="false"/>
-<paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="2" l10n="U" oldref="5">When loading</paragraph>
-<paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_EVT_LOADED">The<emph> When loading </emph>event occurs directly after the form has been loaded.</ahelp></paragraph>
-</section>
-<section id="Section11">
+<paragraph xml-lang="en-US" id="hd_id3149167" role="heading" level="2" l10n="U" oldref="5">When loading</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156423" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_EVT_LOADED">The<emph> When loading </emph>event occurs directly after the form has been loaded.</ahelp></paragraph>
+ </section>
+ <section id="Section11">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_RELOADING" id="bm_id3157320" localize="false"/>
-<paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="38">Before reloading</paragraph>
-<paragraph role="paragraph" id="par_id3154218" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_EVT_RELOADING">The<emph> Before reloading </emph>event occurs before the form is reloaded.</ahelp> The data content has not yet been refreshed.</paragraph>
-</section>
-<section id="Section10">
+<paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="2" l10n="U"
+ oldref="38">Before reloading</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154218" role="paragraph" l10n="U" oldref="39"><ahelp hid="HID_EVT_RELOADING">The<emph> Before reloading </emph>event occurs before the form is reloaded.</ahelp> The data content has not yet been refreshed.</paragraph>
+ </section>
+ <section id="Section10">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_RELOADED" id="bm_id3154946" localize="false"/>
-<paragraph role="heading" id="hd_id3155102" xml-lang="en-US" level="2" l10n="U" oldref="40">When reloading</paragraph>
-<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="HID_EVT_RELOADED">The<emph> When reloading </emph>event occurs directly after the form has been reloaded.</ahelp> The data content has already been refreshed.</paragraph>
-</section>
-<section id="Section9">
+<paragraph xml-lang="en-US" id="hd_id3155102" role="heading" level="2" l10n="U"
+ oldref="40">When reloading</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157895" role="paragraph" l10n="U" oldref="41"><ahelp hid="HID_EVT_RELOADED">The<emph> When reloading </emph>event occurs directly after the form has been reloaded.</ahelp> The data content has already been refreshed.</paragraph>
+ </section>
+ <section id="Section9">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_UNLOADING" id="bm_id3151116" localize="false"/>
-<paragraph role="heading" id="hd_id3152792" xml-lang="en-US" level="2" l10n="U" oldref="42">Before unloading</paragraph>
-<paragraph role="paragraph" id="par_id3152598" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_EVT_UNLOADING">The<emph> Before unloading </emph>event occurs before the form is unloaded; that is, separated from its data source.</ahelp></paragraph>
-</section>
-<section id="Section8">
+<paragraph xml-lang="en-US" id="hd_id3152792" role="heading" level="2" l10n="U"
+ oldref="42">Before unloading</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152598" role="paragraph" l10n="U" oldref="43"><ahelp hid="HID_EVT_UNLOADING">The<emph> Before unloading </emph>event occurs before the form is unloaded; that is, separated from its data source.</ahelp></paragraph>
+ </section>
+ <section id="Section8">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_UNLOADED" id="bm_id3152938" localize="false"/>
-<paragraph role="heading" id="hd_id3154145" xml-lang="en-US" level="2" l10n="U" oldref="44">When unloading</paragraph>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_EVT_UNLOADED">The<emph> When unloading </emph>event occurs directly after the form has been unloaded; that is, separated from its data source.</ahelp></paragraph>
-</section>
-<section id="Section7">
+<paragraph xml-lang="en-US" id="hd_id3154145" role="heading" level="2" l10n="U"
+ oldref="44">When unloading</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="45"><ahelp hid="HID_EVT_UNLOADED">The<emph> When unloading </emph>event occurs directly after the form has been unloaded; that is, separated from its data source.</ahelp></paragraph>
+ </section>
+ <section id="Section7">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_CONFIRMDELETE" id="bm_id3154127" localize="false"/>
-<paragraph role="heading" id="hd_id3147426" xml-lang="en-US" level="2" l10n="U" oldref="25">Confirm deletion</paragraph>
-<paragraph role="paragraph" id="par_id3154988" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="HID_EVT_CONFIRMDELETE">The<emph> Confirm deletion </emph>event occurs as soon as data has been deleted from the form.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
-</section>
-<section id="Section6">
+<paragraph xml-lang="en-US" id="hd_id3147426" role="heading" level="2" l10n="U"
+ oldref="25">Confirm deletion</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154988" role="paragraph" l10n="U" oldref="26"><ahelp hid="HID_EVT_CONFIRMDELETE">The<emph> Confirm deletion </emph>event occurs as soon as data has been deleted from the form.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
+ </section>
+ <section id="Section6">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEROWCHANGE" id="bm_id3151351" localize="false"/>
-<paragraph role="heading" id="hd_id3149481" xml-lang="en-US" level="2" l10n="U" oldref="46">Before record action</paragraph>
-<paragraph role="paragraph" id="par_id3156007" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_EVT_APPROVEROWCHANGE">The<emph> Before record action </emph>event occurs before the current record is changed.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
-</section>
-<section id="Section5">
+<paragraph xml-lang="en-US" id="hd_id3149481" role="heading" level="2" l10n="U"
+ oldref="46">Before record action</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156007" role="paragraph" l10n="U" oldref="58"><ahelp hid="HID_EVT_APPROVEROWCHANGE">The<emph> Before record action </emph>event occurs before the current record is changed.</ahelp> For example, the linked macro can request confirmation in a dialog.</paragraph>
+ </section>
+ <section id="Section5">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_ROWCHANGE" id="bm_id3150685" localize="false"/>
-<paragraph role="heading" id="hd_id3145749" xml-lang="en-US" level="2" l10n="U" oldref="47">After record action</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="HID_EVT_ROWCHANGE">The<emph> After record action </emph>event occurs directly after the current record has been changed.</ahelp></paragraph>
-</section>
-<section id="Section4">
+<paragraph xml-lang="en-US" id="hd_id3145749" role="heading" level="2" l10n="U"
+ oldref="47">After record action</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="59"><ahelp hid="HID_EVT_ROWCHANGE">The<emph> After record action </emph>event occurs directly after the current record has been changed.</ahelp></paragraph>
+ </section>
+ <section id="Section4">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_POSITIONING" id="bm_id3155413" localize="false"/>
-<paragraph role="heading" id="hd_id3154012" xml-lang="en-US" level="2" l10n="U" oldref="48">Before record change</paragraph>
-<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="HID_EVT_POSITIONING">The<emph> Before record change </emph>event occurs before the current record pointer is changed.</ahelp>. For example, the linked macro can prevent this action by returning "FALSE".</paragraph>
-</section>
-<section id="Section3">
+<paragraph xml-lang="en-US" id="hd_id3154012" role="heading" level="2" l10n="U"
+ oldref="48">Before record change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="60"><ahelp hid="HID_EVT_POSITIONING">The<emph> Before record change </emph>event occurs before the current record pointer is changed.</ahelp>. For example, the linked macro can prevent this action by returning "FALSE".</paragraph>
+ </section>
+ <section id="Section3">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_POSITIONED" id="bm_id3150420" localize="false"/>
-<paragraph role="heading" id="hd_id3157975" xml-lang="en-US" level="2" l10n="U" oldref="49">After record change</paragraph>
-<paragraph role="paragraph" id="par_id3154098" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="HID_EVT_POSITIONED">The<emph> After record change </emph>event occurs directly after the current record pointer has been changed.</ahelp>.</paragraph>
-</section>
-<section id="Section2">
+<paragraph xml-lang="en-US" id="hd_id3157975" role="heading" level="2" l10n="U"
+ oldref="49">After record change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154098" role="paragraph" l10n="U" oldref="61"><ahelp hid="HID_EVT_POSITIONED">The<emph> After record change </emph>event occurs directly after the current record pointer has been changed.</ahelp>.</paragraph>
+ </section>
+ <section id="Section2">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_APPROVEPARAMETER" id="bm_id3149298" localize="false"/>
-<paragraph role="heading" id="hd_id3151076" xml-lang="en-US" level="2" l10n="U" oldref="50">Fill parameters</paragraph>
-<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_EVT_APPROVEPARAMETER">The<emph> Fill parameters </emph>event occurs when the form to be loaded has parameters that must be filled out.</ahelp> For example, the data source of the form can be the following SQL command:</paragraph>
-<paragraph role="paragraph" id="par_id3148773" xml-lang="en-US" l10n="U" oldref="63">SELECT * FROM address WHERE name=:name</paragraph>
-<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="64">Here :name is a parameter that must be filled out when loading. The parameter is automatically filled out from the parent form if possible. If the parameter cannot be filled out, this event is called and a linked macro can fill out the parameter.</paragraph>
-</section>
-<section id="Section1">
+<paragraph xml-lang="en-US" id="hd_id3151076" role="heading" level="2" l10n="U"
+ oldref="50">Fill parameters</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147396" role="paragraph" l10n="U" oldref="62"><ahelp hid="HID_EVT_APPROVEPARAMETER">The<emph> Fill parameters </emph>event occurs when the form to be loaded has parameters that must be filled out.</ahelp> For example, the data source of the form can be the following SQL command:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148773" role="paragraph" l10n="U" oldref="63">SELECT * FROM address WHERE name=:name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149581" role="paragraph" l10n="U" oldref="64">Here :name is a parameter that must be filled out when loading. The parameter is automatically filled out from the parent form if possible. If the parameter cannot be filled out, this event is called and a linked macro can fill out the parameter.</paragraph>
+ </section>
+ <section id="Section1">
<bookmark xml-lang="en-US" branch="hid/HID_EVT_ERROROCCURED" id="bm_id3148387" localize="false"/>
-<paragraph role="heading" id="hd_id3146926" xml-lang="en-US" level="2" l10n="U" oldref="9">Error occurred</paragraph>
-<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_EVT_ERROROCCURED">The<emph> Error occurred </emph>event is activated if an error occurs when accessing the data source.</ahelp> This applies to forms, list boxes and combo boxes.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3146926" role="heading" level="2" l10n="U" oldref="9">Error occurred</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149485" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_EVT_ERROROCCURED">The<emph> Error occurred </emph>event is activated if an error occurs when accessing the data source.</ahelp> This applies to forms, list boxes and combo boxes.</paragraph>
+ </section>
</sort>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/01170203.xhp b/helpcontent2/source/text/shared/02/01170203.xhp
index f7d90b0d5e..c3340b3f86 100644
--- a/helpcontent2/source/text/shared/02/01170203.xhp
+++ b/helpcontent2/source/text/shared/02/01170203.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170203.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,7 +73,7 @@
<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="106"><ahelp hid="HID_PROP_ESCAPE_PROCESSING">Specifies whether the SQL statement is to be analyzed by %PRODUCTNAME.</ahelp> If set to Yes, you can click the <emph>...</emph> button next to the <emph>Content</emph> list box. This will open a window where you can graphically create a database query. When you close that window, the SQL statement for the created query will be inserted in the <emph>Content</emph> list box.</paragraph>
</section>
<section id="Section5">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FILTER_CRITERIA" id="bm_id3149810" localize="false"/><paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="81">Filter</paragraph>
+<!-- removed HID HID_PROP_FILTER_CRITERIA --><paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="81">Filter</paragraph>
<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="CHG" oldref="82"><ahelp hid="HID_PROP_FILTER_CRITERIA">Enter the required conditions for filtering the data in the form. The filter specifications follow SQL rules without using the WHERE clause.</ahelp> For example, if you want to display all records with the "Mike" forename, type into the data field: Forename = 'Mike'. You can also combine conditions: Forename = 'Mike' OR Forename = 'Peter'. All records matching either of these two conditions will be displayed.</paragraph>
<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="CHG" oldref="83">The filter function is available in user mode through the <link href="text/shared/02/12030000.xhp" name="AutoFilter"><emph>AutoFilter</emph></link> and <link href="text/shared/02/12090000.xhp" name="Default Filter"><emph>Default Filter</emph></link> icons on the <link href="text/shared/main0213.xhp" name="Form Navigation Bar"><emph>Form Navigation</emph> Bar</link>.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/02/01170300.xhp b/helpcontent2/source/text/shared/02/01170300.xhp
index bad329e00b..8411c40e2f 100644
--- a/helpcontent2/source/text/shared/02/01170300.xhp
+++ b/helpcontent2/source/text/shared/02/01170300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170300.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,14 +54,14 @@
<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="CHG" oldref="13">A radio button inside a group can only be accessed by the Tab key when one of the radio buttons is set to "selected". If you have designed a group of radio buttons where no button is set to "selected", then the user will not be able to access the group or any of the radio buttons by keyboard.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TABORDER_CONTROLS" id="bm_id3153114" localize="false"/><paragraph role="heading" id="hd_id3149140" xml-lang="en-US" level="2" l10n="U" oldref="4">Controls</paragraph>
<paragraph role="paragraph" id="par_id3150789" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_TABORDER_CONTROLS">Lists all controls in the form. These controls can be selected with the tab key in the given order from top to bottom.</ahelp> Select a control from the <emph>Controls </emph>list to assign the desired position in the tab order.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_UP" id="bm_id3147399" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_UP" id="bm_id5646229" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="6">Move Up</paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_UP -->
+<!-- removed HID pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_UP --><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="6">Move Up</paragraph>
<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_UP">Click the<emph> Move Up</emph> button to shift the selected control one position higher in the tab order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_DOWN" id="bm_id3149389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_DOWN" id="bm_id4586016" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="8">Move Down</paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_DOWN -->
+<!-- removed HID pcr_PushButton_RID_DLG_TABORDER_PB_MOVE_DOWN --><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="8">Move Down</paragraph>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_MOVE_DOWN">Click the<emph> Move Down</emph> button to shift the selected control one position lower in the tab order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_AUTO_ORDER" id="bm_id3153312" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/pcr_PushButton_RID_DLG_TABORDER_PB_AUTO_ORDER" id="bm_id6983245" localize="false"/><paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="2" l10n="U" oldref="10">Automatic Sort</paragraph>
+<!-- removed HID SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_AUTO_ORDER -->
+<!-- removed HID pcr_PushButton_RID_DLG_TABORDER_PB_AUTO_ORDER --><paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="2" l10n="U" oldref="10">Automatic Sort</paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_TAB_ORDER_PB_AUTO_ORDER">Click the<emph> Automatic Sort</emph> button to automatically sort the controls according to their position in the document.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170400.xhp b/helpcontent2/source/text/shared/02/01170400.xhp
index 7f5d364371..17b94ac63a 100644
--- a/helpcontent2/source/text/shared/02/01170400.xhp
+++ b/helpcontent2/source/text/shared/02/01170400.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170400.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170500.xhp b/helpcontent2/source/text/shared/02/01170500.xhp
index a038eca54c..4f66c0fa85 100644
--- a/helpcontent2/source/text/shared/02/01170500.xhp
+++ b/helpcontent2/source/text/shared/02/01170500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170500.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170600.xhp b/helpcontent2/source/text/shared/02/01170600.xhp
index 1ac56f776a..89ba2de7d4 100644
--- a/helpcontent2/source/text/shared/02/01170600.xhp
+++ b/helpcontent2/source/text/shared/02/01170600.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170600.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170700.xhp b/helpcontent2/source/text/shared/02/01170700.xhp
index d5c96e01a1..f97e6538c8 100755
--- a/helpcontent2/source/text/shared/02/01170700.xhp
+++ b/helpcontent2/source/text/shared/02/01170700.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170700.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170800.xhp b/helpcontent2/source/text/shared/02/01170800.xhp
index d1a6c6f317..7fcc850bb0 100644
--- a/helpcontent2/source/text/shared/02/01170800.xhp
+++ b/helpcontent2/source/text/shared/02/01170800.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170800.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170801.xhp b/helpcontent2/source/text/shared/02/01170801.xhp
index 274ce9dd60..3c1b9f082c 100755
--- a/helpcontent2/source/text/shared/02/01170801.xhp
+++ b/helpcontent2/source/text/shared/02/01170801.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170801.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,10 +47,10 @@
<section id="howtoget">
<embed href="text/shared/00/00040501.xhp#aupitab1"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_DATASOURCE" id="bm_id3149205" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_DATASOURCE -->
<paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="5">Data source</paragraph>
<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_DATASOURCE">Specifies the data source that contains the desired table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_TABLE" id="bm_id3147291" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_TABLE -->
<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="2" l10n="U" oldref="7">Table</paragraph>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBP_LISTBOX_RID_PAGE_TABLESELECTION_LB_TABLE">Specifies the desired table.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/01170802.xhp b/helpcontent2/source/text/shared/02/01170802.xhp
index f39cf41664..9caade7109 100755
--- a/helpcontent2/source/text/shared/02/01170802.xhp
+++ b/helpcontent2/source/text/shared/02/01170802.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170802.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
<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"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS -->
<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>
</body>
diff --git a/helpcontent2/source/text/shared/02/01170900.xhp b/helpcontent2/source/text/shared/02/01170900.xhp
index 7affd3f45b..ac859e7763 100644
--- a/helpcontent2/source/text/shared/02/01170900.xhp
+++ b/helpcontent2/source/text/shared/02/01170900.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170900.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01170901.xhp b/helpcontent2/source/text/shared/02/01170901.xhp
index 3360275c92..1197f128d7 100755
--- a/helpcontent2/source/text/shared/02/01170901.xhp
+++ b/helpcontent2/source/text/shared/02/01170901.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170901.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
</section>
<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="8">For list boxes, a table that can be linked with the current form table is indicated. The link table must have at least one field in common with the table of the current form. This makes it possible to establish an unambiguous reference.</paragraph>
<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">For combo boxes, there must be a relationship between the form table and the table containing the data to be displayed in the combo box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE" id="bm_id3154751" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE -->
<paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="2" l10n="U" oldref="6">Table</paragraph>
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE">In the<emph> Table </emph>field, select the table containing the data field whose content should be displayed in the control field.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="10">The table given here appears in the <link href="text/shared/02/01170102.xhp" name="Control properties">Control properties</link> as an element of an SQL statement in the <emph>List Contents</emph> field.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170902.xhp b/helpcontent2/source/text/shared/02/01170902.xhp
index b2c2c7b971..fcad12f334 100755
--- a/helpcontent2/source/text/shared/02/01170902.xhp
+++ b/helpcontent2/source/text/shared/02/01170902.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170902.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,9 +47,9 @@
<section id="howtoget">
<embed href="text/shared/00/00040501.xhp#aupikomli2"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="10">Available Fields</paragraph>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD --><paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="10">Available Fields</paragraph>
<paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBP_LISTBOX_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD">Displays all table fields chosen on the previous Wizard page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_EDIT_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD" id="bm_id3152425" localize="false"/><paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="12">Display Field</paragraph>
+<!-- removed HID DBP_EDIT_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD --><paragraph role="heading" id="hd_id3145669" xml-lang="en-US" level="2" l10n="U" oldref="12">Display Field</paragraph>
<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBP_EDIT_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD">Specifies the field whose data are to be shown in the combo or list boxes.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="19">The field name given here appears in the <link href="text/shared/02/01170102.xhp" name="Control properties">Control properties</link> as an element of an SQL statement in the <emph>List Contents</emph> field.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/01170903.xhp b/helpcontent2/source/text/shared/02/01170903.xhp
index 4dcd6099ec..b6a361e4e1 100755
--- a/helpcontent2/source/text/shared/02/01170903.xhp
+++ b/helpcontent2/source/text/shared/02/01170903.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170903.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,10 +48,10 @@
<section id="howtoget">
<embed href="text/shared/00/00040501.xhp#aupikomli3a"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD" id="bm_id3153910" localize="false"/><paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="16">Value table field</paragraph>
+<!-- removed HID DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD --><paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="16">Value table field</paragraph>
<paragraph role="paragraph" id="par_id3150789" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD">Specifies the current form data field which should be related to a field in the linked table.</ahelp> In addition, click the desired data field in the list field below.</paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="25">In <link href="text/shared/02/01170102.xhp" name="Control - Properties">Control - Properties</link>, the specified field will appear as an entry in the <emph>Data</emph> tab page under <emph>Data field</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="U" oldref="18">List table field</paragraph>
+<!-- removed HID DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD --><paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="U" oldref="18">List table field</paragraph>
<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="DBP_COMBOBOX_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD">Specifies the linked table data field, which is related to the specified value table field.</ahelp> In addition, click the data field in the lower list field.</paragraph>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="26">In <link href="text/shared/02/01170102.xhp" name="Control - Properties">Control - Properties</link>, the specified field will appear in the <emph>Data</emph> tab page of a SQL statement under <emph>List Contents</emph>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/01170904.xhp b/helpcontent2/source/text/shared/02/01170904.xhp
index 49698d6be6..1912461274 100755
--- a/helpcontent2/source/text/shared/02/01170904.xhp
+++ b/helpcontent2/source/text/shared/02/01170904.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170904.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,14 +50,14 @@
</section>
<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="2" l10n="U" oldref="3">Do you want to save the value in a database field?</paragraph>
<paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="4">Two options are available for this question:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES" id="bm_id3154751" localize="false"/>
+<!-- removed HID DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES -->
<paragraph role="heading" id="hd_id3153394" xml-lang="en-US" level="3" l10n="U" oldref="5">Yes, I want to save it in the following database field</paragraph>
<paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES">Specifies whether the user's entered or selected combination field value should be saved in a database field.</ahelp> Several database table fields are offered which can be accessed in the current form.</paragraph>
<paragraph role="paragraph" id="par_id3145212" xml-lang="en-US" l10n="U" oldref="11">In <link href="text/shared/02/01170102.xhp" name="Control - Properties">Control - Properties</link> the selected field appears as an entry in the <emph>Data</emph> tab page under <emph>Data field</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD" id="bm_id3154318" localize="false"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD -->
<paragraph role="heading" id="hd_id3149177" xml-lang="en-US" level="3" l10n="U" oldref="7">List field</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBP_LISTBOX_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD">Specifies the data field where the combination field value should be saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO" id="bm_id3147243" localize="false"/>
+<!-- removed HID DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO -->
<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="9">No, I only want to save the value in the form</paragraph>
<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO">Specifies that the value of this combination field will not be written in the database and will only be saved in the form.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/01171000.xhp b/helpcontent2/source/text/shared/02/01171000.xhp
index 3394ebbc8d..b2d6bb7fde 100644
--- a/helpcontent2/source/text/shared/02/01171000.xhp
+++ b/helpcontent2/source/text/shared/02/01171000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01171000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171100.xhp b/helpcontent2/source/text/shared/02/01171100.xhp
index b896b84647..7bed8bd55a 100644
--- a/helpcontent2/source/text/shared/02/01171100.xhp
+++ b/helpcontent2/source/text/shared/02/01171100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01171100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171200.xhp b/helpcontent2/source/text/shared/02/01171200.xhp
index b58bebdb85..65aeeaf7bc 100644
--- a/helpcontent2/source/text/shared/02/01171200.xhp
+++ b/helpcontent2/source/text/shared/02/01171200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01171200.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171300.xhp b/helpcontent2/source/text/shared/02/01171300.xhp
index 5f6bc5c943..c826b8ef13 100644
--- a/helpcontent2/source/text/shared/02/01171300.xhp
+++ b/helpcontent2/source/text/shared/02/01171300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01171300.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01171400.xhp b/helpcontent2/source/text/shared/02/01171400.xhp
index 613a5bbd70..032ee0e427 100644
--- a/helpcontent2/source/text/shared/02/01171400.xhp
+++ b/helpcontent2/source/text/shared/02/01171400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01171400.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/01220000.xhp b/helpcontent2/source/text/shared/02/01220000.xhp
index c7378a509d..8c348eb77c 100644
--- a/helpcontent2/source/text/shared/02/01220000.xhp
+++ b/helpcontent2/source/text/shared/02/01220000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="E">
-<image id="img_id3149095" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149095" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3149095" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149095" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/02/01230000.xhp b/helpcontent2/source/text/shared/02/01230000.xhp
index e063651fbd..e2c73c7c2c 100644
--- a/helpcontent2/source/text/shared/02/01230000.xhp
+++ b/helpcontent2/source/text/shared/02/01230000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01230000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02010000.xhp b/helpcontent2/source/text/shared/02/02010000.xhp
index 817d01798b..a71f31abb6 100644
--- a/helpcontent2/source/text/shared/02/02010000.xhp
+++ b/helpcontent2/source/text/shared/02/02010000.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02010000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,44 +27,41 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0202010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Apply Style</title>
-<filename>/text/shared/02/02010000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-26T08:12:45">UFI fix to #i21144# - FPE: added missing section
-DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0202010000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Apply Style</title>
+ <filename>/text/shared/02/02010000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/HID_STYLE_LISTBOX" id="bm_id3154232" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_STYLE_APPLY" id="bm_id3361219" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_STYLE_APPLY" id="bm_id3361219" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:StyleApply" id="bm_id3154863" localize="false"/>
<section id="benvor">
-<paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02010000.xhp" name="Apply Style">Apply Style</link></paragraph>
-<section id="benvortext">
-<paragraph role="paragraph" id="par_id3155351" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:StyleApply">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp></paragraph>
-</section>
-</section>
-<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW">To reset the selected objects to the default paragraph style , select <item type="literal">Clear formatting</item>. Select <item type="literal">More</item> to open the <emph>Styles and Formatting</emph> window.</paragraph>
-<section id="sylistenfeld">
-<table id="tbl_id3156042">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="E">
-<image id="img_id3152801" src="res/helpimg/zellvor.png" width="4.471cm" height="1.244cm" localize="true"><alt id="alt_id3152801" xml-lang="en-US">Cell Styles</alt>
+ <paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02010000.xhp" name="Apply Style">Apply Style</link></paragraph>
+ <section id="benvortext">
+ <paragraph xml-lang="en-US" id="par_id3155351" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:StyleApply">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp></paragraph>
+ </section>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10621" role="paragraph" l10n="NEW">To reset the selected objects to the default paragraph style, select Clear formatting. Select More to open the Styles and Formatting window.</paragraph>
+ <section id="sylistenfeld">
+ <table id="tbl_id3156042">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="E">
+<image id="img_id3152801" src="res/helpimg/zellvor.png" width="1.0402in" height="0.2098in" localize="true"><alt xml-lang="en-US" id="alt_id3152801">Apply Style</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">Apply Style</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
-</body>
-</helpdocument>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145345" role="paragraph" l10n="U" oldref="3">Apply Style</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02020000.xhp b/helpcontent2/source/text/shared/02/02020000.xhp
index 76100b9eaf..6695de62cf 100644
--- a/helpcontent2/source/text/shared/02/02020000.xhp
+++ b/helpcontent2/source/text/shared/02/02020000.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02020000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,60 +27,50 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
-
-
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Font Name</title>
-<filename>/text/shared/02/02020000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-13T09:30:43">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Font Name</title>
+ <filename>/text/shared/02/02020000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<section id="schriftart">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>fonts; specifying several</bookmark_value>
<bookmark_value>alternative fonts</bookmark_value>
<bookmark_value>characters; alternative fonts</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="E" oldref="9" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148983" role="paragraph" l10n="E" oldref="9" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_FONT" id="bm_id4814517" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CharFontName" id="bm_id3150789" localize="false"/>
-<paragraph role="heading" id="hd_id3150808" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02020000.xhp" name="Font Name">Font Name</link></paragraph>
-<paragraph role="paragraph" id="par_id3156414" xml-lang="en-US" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150808" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02020000.xhp" name="Font Name">Font Name</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3156414" role="paragraph" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp></variable></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
-<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph>Tools - Options - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
<section id="syschriftart">
-<table id="tbl_id3159399">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="E">
-<image id="img_id3154810" src="res/helpimg/swh00055.png" width="31.75mm" height="6.09mm"><alt id="alt_id3154810" xml-lang="en-US">Icon</alt>
+ <table id="tbl_id3159399">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145315" role="paragraph" l10n="E">
+<image id="img_id3154810" src="res/helpimg/swh00055.png" width="1.25in" height="0.2398in"><alt xml-lang="en-US" id="alt_id3154810">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="3">Font Name</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-<paragraph role="note" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer.
-</caseinline><defaultinline>In order to install a printer as the default printer please refer to your operating system documentation.</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link>.
-</variable></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150085" role="paragraph" l10n="U" oldref="3">Font Name</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156024" role="note" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer. </caseinline><defaultinline>In order to install a printer as the default printer please refer to your operating system documentation.</defaultinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link> in the Options dialog box.</variable></paragraph>
<switch select="sys">
<case select="WIN">
-<paragraph role="warning" id="par_id3154125" xml-lang="en-US" l10n="U" oldref="6">If you receive an error message that states that certain fonts have not been found, you can install them with <emph>$[officename] Setup</emph> in the <emph>Repair</emph> mode if it is a $[officename] font.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154125" role="warning" l10n="U" oldref="6">If you receive an error message that states that certain fonts have not been found, you can install them with <emph>$[officename] Setup</emph> in the <emph>Repair</emph> mode if it is a $[officename] font.</paragraph>
</case>
</switch>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02030000.xhp b/helpcontent2/source/text/shared/02/02030000.xhp
index 6ec7e7f43f..0a294ef755 100644
--- a/helpcontent2/source/text/shared/02/02030000.xhp
+++ b/helpcontent2/source/text/shared/02/02030000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02030000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02040000.xhp b/helpcontent2/source/text/shared/02/02040000.xhp
index f62be80979..9194bb74e2 100644
--- a/helpcontent2/source/text/shared/02/02040000.xhp
+++ b/helpcontent2/source/text/shared/02/02040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02040000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02050000.xhp b/helpcontent2/source/text/shared/02/02050000.xhp
index cee1cffae3..db8a8765b3 100644
--- a/helpcontent2/source/text/shared/02/02050000.xhp
+++ b/helpcontent2/source/text/shared/02/02050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02050000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index 9bd966ebbb..6af2fcdeb2 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 02130000.xhp,v $
- * $Revision: 1.7.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -46,18 +43,17 @@
<section id="einzvermindern">
<bookmark xml-lang="en-US" branch="hid/SID_DEC_INDENT" id="bm_id8935294" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DecrementIndent" id="bm_id3153089" localize="false"/><paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02130000.xhp" name="Decrease Indent">Decrease Indent</link></paragraph>
-<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid=".uno:DecrementIndent">Click the<emph> Decrease Indent </emph>icon to reduce the left indent of the current paragraph or cell content and set it to the previous tab position.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid=".uno:DecrementIndent">Click the <emph>Decrease Indent</emph> icon to reduce the left indent of the current paragraph or cell content and set it to the previous default tab position.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="CHG" oldref="7"><switchinline select="appl"><caseinline select="WRITER">If you previously increased the indentation for several collectively selected paragraphs, this command can decrease the indentation for all of the selected paragraphs.
-</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
+<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="CHG" oldref="7"><switchinline select="appl"><caseinline select="WRITER">If you previously increased the indentation for several collectively selected paragraphs, this command can decrease the indentation for all of the selected paragraphs.
+</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
</caseinline></switchinline></paragraph>
<section id="syeinzvermindern">
<table id="tbl_id3147576">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="E">
-<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155942" xml-lang="en-US" l10n="U" oldref="4">Decrease Indent</paragraph>
@@ -65,7 +61,6 @@
</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 <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>
+<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="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index 18f60c0ecb..e7397aba90 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 02140000.xhp,v $
- * $Revision: 1.7.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,82 +31,77 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0202140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Increase Indent</title>
-<filename>/text/shared/02/02140000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="einzerhoehen">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148520"><bookmark_value>paragraphs; increasing indents of</bookmark_value>
-</bookmark>
+ <topic id="textshared0202140000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Increase Indent</title>
+ <filename>/text/shared/02/02140000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="einzerhoehen">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148520"><bookmark_value>paragraphs; increasing indents of</bookmark_value></bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_INC_INDENT" id="bm_id636827" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/><paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
-<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:IncrementIndent"><switchinline select="appl"><caseinline select="WRITER">Increases the left indent of the current paragraph and sets it to the next tab stop.
-</caseinline><caseinline select="CALC">Click the<emph> Increase Indent </emph>icon to increase the indentation of the cell content of the selected cells.
-</caseinline></switchinline></ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
-</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
-</caseinline></switchinline></paragraph>
-<section id="syeinzerhoehen">
-<table id="tbl_id3155535">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="E">
-<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149388" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="4">Increase Indent</paragraph>
-</tablecell>
-</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 <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>
-<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm:
+<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151330" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Click the Increase Indent icon to increase the left indent of the current paragraph or cell content and set it to the next default tab position.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
+</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
</caseinline></switchinline></paragraph>
+ <section id="syeinzerhoehen">
+ <table id="tbl_id3155535">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="E">
+<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149388">Icon</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="4">Increase Indent</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" 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="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157910" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153698" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm:</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="WRITER"><table id="tbl_id3150943">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="8">Original indent</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<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>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="11">0.25 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147265" xml-lang="en-US" l10n="U" oldref="12">2 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="13">2.25 cm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161657" xml-lang="en-US" l10n="U" oldref="14">0.5 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="15">2 cm</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="16">2.5 cm</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<case select="WRITER">
+<table id="tbl_id3150943">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154047" role="paragraph" l10n="U" oldref="8">Original indent</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Indent increased</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153126" role="paragraph" 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>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="11">0.25 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147265" role="paragraph" l10n="U" oldref="12">2 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="13">2.25 cm</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3161657" role="paragraph" l10n="U" oldref="14">0.5 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="U" oldref="15">2 cm</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="16">2.5 cm</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02160000.xhp b/helpcontent2/source/text/shared/02/02160000.xhp
index ffde2de3b5..f7d2e5bb61 100755
--- a/helpcontent2/source/text/shared/02/02160000.xhp
+++ b/helpcontent2/source/text/shared/02/02160000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02160000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/02170000.xhp b/helpcontent2/source/text/shared/02/02170000.xhp
index 7ae2829d95..e799729336 100644
--- a/helpcontent2/source/text/shared/02/02170000.xhp
+++ b/helpcontent2/source/text/shared/02/02170000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02170000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03110000.xhp b/helpcontent2/source/text/shared/02/03110000.xhp
index bb5d2af571..5955ef7f12 100644
--- a/helpcontent2/source/text/shared/02/03110000.xhp
+++ b/helpcontent2/source/text/shared/02/03110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03110000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03120000.xhp b/helpcontent2/source/text/shared/02/03120000.xhp
index ff6d52d24c..6378ea83bf 100644
--- a/helpcontent2/source/text/shared/02/03120000.xhp
+++ b/helpcontent2/source/text/shared/02/03120000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03120000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03130000.xhp b/helpcontent2/source/text/shared/02/03130000.xhp
index aac052774c..432b366a75 100644
--- a/helpcontent2/source/text/shared/02/03130000.xhp
+++ b/helpcontent2/source/text/shared/02/03130000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03130000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03140000.xhp b/helpcontent2/source/text/shared/02/03140000.xhp
index 45aa83660f..7921d76b9e 100644
--- a/helpcontent2/source/text/shared/02/03140000.xhp
+++ b/helpcontent2/source/text/shared/02/03140000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03140000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03150000.xhp b/helpcontent2/source/text/shared/02/03150000.xhp
index 0777a5db9b..fe50ab00af 100644
--- a/helpcontent2/source/text/shared/02/03150000.xhp
+++ b/helpcontent2/source/text/shared/02/03150000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03150000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/03200000.xhp b/helpcontent2/source/text/shared/02/03200000.xhp
index 14d1ac51d0..74a654065b 100644
--- a/helpcontent2/source/text/shared/02/03200000.xhp
+++ b/helpcontent2/source/text/shared/02/03200000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 03200000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/04210000.xhp b/helpcontent2/source/text/shared/02/04210000.xhp
index 00ea6c78bc..734b5357fe 100644
--- a/helpcontent2/source/text/shared/02/04210000.xhp
+++ b/helpcontent2/source/text/shared/02/04210000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* 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
diff --git a/helpcontent2/source/text/shared/02/05020000.xhp b/helpcontent2/source/text/shared/02/05020000.xhp
index b34c081445..26f9f308bb 100644
--- a/helpcontent2/source/text/shared/02/05020000.xhp
+++ b/helpcontent2/source/text/shared/02/05020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/05090000.xhp b/helpcontent2/source/text/shared/02/05090000.xhp
index 6dca701913..77aa28b3cb 100644
--- a/helpcontent2/source/text/shared/02/05090000.xhp
+++ b/helpcontent2/source/text/shared/02/05090000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05090000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/05110000.xhp b/helpcontent2/source/text/shared/02/05110000.xhp
index 95b009ebc8..958f09aea5 100644
--- a/helpcontent2/source/text/shared/02/05110000.xhp
+++ b/helpcontent2/source/text/shared/02/05110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05110000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06050000.xhp b/helpcontent2/source/text/shared/02/06050000.xhp
index d40cd39f0d..7e8525cf66 100644
--- a/helpcontent2/source/text/shared/02/06050000.xhp
+++ b/helpcontent2/source/text/shared/02/06050000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06060000.xhp b/helpcontent2/source/text/shared/02/06060000.xhp
index 66b9749b50..492bd13470 100644
--- a/helpcontent2/source/text/shared/02/06060000.xhp
+++ b/helpcontent2/source/text/shared/02/06060000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06060000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06100000.xhp b/helpcontent2/source/text/shared/02/06100000.xhp
index e1331c755b..739abc6ae3 100644
--- a/helpcontent2/source/text/shared/02/06100000.xhp
+++ b/helpcontent2/source/text/shared/02/06100000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06100000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06110000.xhp b/helpcontent2/source/text/shared/02/06110000.xhp
index d4bb49c6b2..740bfc4264 100644
--- a/helpcontent2/source/text/shared/02/06110000.xhp
+++ b/helpcontent2/source/text/shared/02/06110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06110000.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/06120000.xhp b/helpcontent2/source/text/shared/02/06120000.xhp
index 0853e98a99..8079ea3a09 100644
--- a/helpcontent2/source/text/shared/02/06120000.xhp
+++ b/helpcontent2/source/text/shared/02/06120000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06120000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07010000.xhp b/helpcontent2/source/text/shared/02/07010000.xhp
index 9f66388a0b..5280cca7f7 100644
--- a/helpcontent2/source/text/shared/02/07010000.xhp
+++ b/helpcontent2/source/text/shared/02/07010000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07010000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
<section id="urlladen">
<bookmark xml-lang="en-US" branch="hid/SID_OPENURL" id="bm_id7760961" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OpenUrl" id="bm_id3151100" localize="false"/><paragraph role="heading" id="hd_id3149119" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/07010000.xhp" name="Load URL">Load URL</link></paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Loads a document specified by an entered URL. You can type a new URL or select one that is already registered. %PRODUCTNAME automatically converts file paths into URL notation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Loads a document specified by an entered URL. You can type a new URL or select one from the list. %PRODUCTNAME automatically converts file paths into URL notation.</ahelp></paragraph>
<paragraph role="tip" id="par_idN108C6" xml-lang="en-US" l10n="CHG">Enable Load URL with the Visible Buttons command (click the arrow at the end of the toolbar).<comment>i73505</comment></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/02/07060000.xhp b/helpcontent2/source/text/shared/02/07060000.xhp
index 31f5465aef..23d833537d 100644
--- a/helpcontent2/source/text/shared/02/07060000.xhp
+++ b/helpcontent2/source/text/shared/02/07060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07060000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07070000.xhp b/helpcontent2/source/text/shared/02/07070000.xhp
index a4b1d277b9..566c614eea 100644
--- a/helpcontent2/source/text/shared/02/07070000.xhp
+++ b/helpcontent2/source/text/shared/02/07070000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07070000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07070100.xhp b/helpcontent2/source/text/shared/02/07070100.xhp
index 77a1267f25..c08ce49b16 100644
--- a/helpcontent2/source/text/shared/02/07070100.xhp
+++ b/helpcontent2/source/text/shared/02/07070100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07070100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07070200.xhp b/helpcontent2/source/text/shared/02/07070200.xhp
index 993b79f90c..5df5eb265a 100755
--- a/helpcontent2/source/text/shared/02/07070200.xhp
+++ b/helpcontent2/source/text/shared/02/07070200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07070200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07080000.xhp b/helpcontent2/source/text/shared/02/07080000.xhp
index 34375cc137..d1dbc2ae86 100644
--- a/helpcontent2/source/text/shared/02/07080000.xhp
+++ b/helpcontent2/source/text/shared/02/07080000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07080000.xhp,v $
- * $Revision: 1.5.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/07090000.xhp b/helpcontent2/source/text/shared/02/07090000.xhp
index ac2f143901..4ef9301e41 100644
--- a/helpcontent2/source/text/shared/02/07090000.xhp
+++ b/helpcontent2/source/text/shared/02/07090000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 07090000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/08010000.xhp b/helpcontent2/source/text/shared/02/08010000.xhp
index 8bf2a94b37..051a8878da 100644
--- a/helpcontent2/source/text/shared/02/08010000.xhp
+++ b/helpcontent2/source/text/shared/02/08010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 08010000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/08020000.xhp b/helpcontent2/source/text/shared/02/08020000.xhp
index 9731bff28f..312183a218 100644
--- a/helpcontent2/source/text/shared/02/08020000.xhp
+++ b/helpcontent2/source/text/shared/02/08020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 08020000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09010000.xhp b/helpcontent2/source/text/shared/02/09010000.xhp
index c1a80a3010..983671dfcc 100644
--- a/helpcontent2/source/text/shared/02/09010000.xhp
+++ b/helpcontent2/source/text/shared/02/09010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09010000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09020000.xhp b/helpcontent2/source/text/shared/02/09020000.xhp
index 553071b68f..90bb3dead9 100755
--- a/helpcontent2/source/text/shared/02/09020000.xhp
+++ b/helpcontent2/source/text/shared/02/09020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09020000.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09030000.xhp b/helpcontent2/source/text/shared/02/09030000.xhp
index e9b1aff2ee..027a5dc659 100644
--- a/helpcontent2/source/text/shared/02/09030000.xhp
+++ b/helpcontent2/source/text/shared/02/09030000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09030000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09050000.xhp b/helpcontent2/source/text/shared/02/09050000.xhp
index 5db8b89a3c..23221d0fee 100644
--- a/helpcontent2/source/text/shared/02/09050000.xhp
+++ b/helpcontent2/source/text/shared/02/09050000.xhp
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09050000.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,29 +25,21 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************-->
+<helpdocument version="1.0">
<meta>
<topic id="textshared0209050000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Find</title>
<filename>/text/shared/02/09050000.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="search">
<bookmark branch="hid/HID_OFA_HYPERLINK_SEARCH" xml-lang="en-US" id="bm_id3156211"/><paragraph id="hd_id3154228" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/09050000.xhp" name="Find">Find</link></paragraph>
- <paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find </emph>submenu is defined in <link href="text/shared/optionen/01020200.xhp" name="Tools - Options - Internet - Search"><emph>Tools - Options - Internet - Search</emph></link>.</paragraph>
+<paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find</emph> submenu is defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Internet - Search">Internet - Search</link></emph>.</paragraph>
</section>
<section id="sysearch">
<table id="tbl_id3147261">
-
-
-
<tablerow>
<tablecell>
<paragraph l10n="E" role="paragraph" id="par_id3152801" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_recsearch.png" id="img_id3153750"><alt xml-lang="en-US" id="alt_id3153750">Icon</alt></image></paragraph>
@@ -60,11 +48,9 @@
<paragraph role="paragraph" id="par_id3147008" l10n="U" xml-lang="en-US" oldref="3">Find</paragraph>
</tablecell>
</tablerow>
-
</table>
</section>
<paragraph role="heading" level="2" id="hd_id3153683" l10n="U" xml-lang="en-US" oldref="4">List of search engines</paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3147576" l10n="U" oldref="5">When you have selected a search engine, $[officename] transfers the search request to your standard web browser, which then establishes an Internet connection to the search engine and displays the result. See also <link href="text/shared/02/09010000.xhp" name="URL Name">URL Name</link>.</paragraph>
-
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/09060000.xhp b/helpcontent2/source/text/shared/02/09060000.xhp
index eeec8f370e..75178bc75c 100644
--- a/helpcontent2/source/text/shared/02/09060000.xhp
+++ b/helpcontent2/source/text/shared/02/09060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09060000.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/09070000.xhp b/helpcontent2/source/text/shared/02/09070000.xhp
index 8ddd24ce4c..b0aa90d2ce 100644
--- a/helpcontent2/source/text/shared/02/09070000.xhp
+++ b/helpcontent2/source/text/shared/02/09070000.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09070000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,69 +27,73 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0209070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink Dialog</title>
-<filename>/text/shared/02/09070000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-02T12:01:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
+ <topic id="textshared0209070000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Hyperlink Dialog</title>
+ <filename>/text/shared/02/09070000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="hyperlink">
<bookmark xml-lang="en-US" branch="hid/SID_HYPERLINK_DIALOG" id="bm_id4087126" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HyperlinkDialog" id="bm_id3149748" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_EDIT_HYPERLINK" id="bm_id6121214" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id3151097" localize="false"/>
-<paragraph role="heading" id="hd_id3145759" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink</link>
+<paragraph xml-lang="en-US" id="hd_id3145759" role="heading" level="1" l10n="U" oldref="1"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156183" xml-lang="en-US" l10n="U" oldref="2"><variable id="hyperdiatext"><ahelp hid=".uno:EditHyperlink">Opens a dialog that enables you to create and edit hyperlinks.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3156183" role="paragraph" l10n="U" oldref="2"><variable id="hyperdiatext"><ahelp hid=".uno:EditHyperlink">Opens a dialog that enables you to create and edit hyperlinks.</ahelp>
</variable></paragraph>
-</section>
-<section id="syhyperdia">
-<table id="tbl_id3158405">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154927" xml-lang="en-US" l10n="E">
-<image id="img_id3093440" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3093440" xml-lang="en-US">Icon</alt>
+ </section>
+ <section id="syhyperdia">
+ <table id="tbl_id3158405">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154927" role="paragraph" l10n="E">
+<image id="img_id3093440" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3093440">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="3">Hyperlink Dialog</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph" l10n="U" oldref="3">Hyperlink Dialog</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_CHOICECTRL" id="bm_id3149177" localize="false"/>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_ICCDIALOG_CHOICECTRL">Select the type of hyperlink to be inserted.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3155391" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_ICCDIALOG_CHOICECTRL">Select the type of hyperlink to be inserted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_OPEN_HYPERLINK" id="bm_id7868083" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OpenHyperlinkOnCursor" id="bm_id3145345" localize="false"/>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink at the cursor position.</ahelp></paragraph>
-<embed href="text/shared/02/09070100.xhp#internet"/>
-<embed href="text/shared/02/09070200.xhp#mailnews"/>
-<embed href="text/shared/02/09070300.xhp#dokument"/>
-<embed href="text/shared/02/09070400.xhp#neuesdokument"/>
+<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="CHG" oldref="16"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink in your default web browser.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_EDIT_HYPERLINK" id="bm_id0122200902201484" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id0122200902201587" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231573" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Hyperlink dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_COPY_HYPERLINK_LOCATION" id="bm_id0122200902224858" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231660" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Copies the URL to the clipboard.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FN_REMOVE_HYPERLINK" id="bm_id0122200902230774" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0122200902231630" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the hyperlink, leaving plain text.</ahelp></paragraph>
+ <embed href="text/shared/02/09070100.xhp#internet"/>
+ <embed href="text/shared/02/09070200.xhp#mailnews"/>
+ <embed href="text/shared/02/09070300.xhp#dokument"/>
+ <embed href="text/shared/02/09070400.xhp#neuesdokument"/>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_OK_BTN" id="bm_id3149811" localize="false"/>
-<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="7">Apply</paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_ICCDIALOG_OK_BTN">Applies the data to your document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3166410" role="heading" level="3" l10n="U" oldref="7">Apply</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_ICCDIALOG_OK_BTN">Applies the data to your document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_CANCEL_BTN" id="bm_id3159166" localize="false"/>
-<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="9">Close</paragraph>
-<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_ICCDIALOG_CANCEL_BTN">Closes the dialog without saving.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153700" xml-lang="en-US" level="3" l10n="U" oldref="11">Help</paragraph>
-<paragraph role="paragraph" id="par_id3150943" xml-lang="en-US" l10n="U" oldref="12">Opens the Help.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149398" role="heading" level="3" l10n="U" oldref="9">Close</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149734" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_ICCDIALOG_CANCEL_BTN">Closes the dialog without saving.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153700" role="heading" level="3" l10n="U"
+ oldref="11">Help</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150943" role="paragraph" l10n="U" oldref="12">Opens the Help.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_ICCDIALOG_RESET_BTN" id="bm_id3155434" localize="false"/>
-<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="13">Back</paragraph>
-<paragraph role="paragraph" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_ICCDIALOG_RESET_BTN">Resets the entries in the dialog to their original state.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156192" role="heading" level="3" l10n="U"
+ oldref="13">Back</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149234" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_ICCDIALOG_RESET_BTN">Resets the entries in the dialog to their original state.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/09070100.xhp b/helpcontent2/source/text/shared/02/09070100.xhp
index f3428e310c..a3583f2ebf 100755
--- a/helpcontent2/source/text/shared/02/09070100.xhp
+++ b/helpcontent2/source/text/shared/02/09070100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09070100.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,53 +49,53 @@
</section>
<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="3">The fields for the login name, password and anonymous user are only available for FTP addresses.</paragraph>
<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="4">Type of hyperlink</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET" id="bm_id3154823" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="CHG" oldref="6">Web</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET" id="bm_id3154823" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="CHG" oldref="6">Web</paragraph>
<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET">Creates an http hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="8">FTP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="8">FTP</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP">Creates an FTP hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET" id="bm_id3154749" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="10">Telnet</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET" id="bm_id3154749" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="10">Telnet</paragraph>
<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET">Creates a Telnet hyperlink.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HYPERDLG_INET_PATH" id="bm_id3146797" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="12">Target</paragraph>
<paragraph role="paragraph" id="par_id9887081" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</ahelp><comment>see i48946</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE" id="bm_id3158432" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="13">WWW Browser</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE" id="bm_id3158432" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="13">WWW Browser</paragraph>
<paragraph role="paragraph" id="par_id3153760" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE">Opens a web browser, into which you can load the desired URL.</ahelp> You can then copy and paste the URL into the <emph>Target</emph> field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET" id="bm_id3149578" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="31">Target in document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET" id="bm_id3149578" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="31">Target in document</paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET">Opens the <emph>Target in Document</emph> dialog.</ahelp> There you can select the destination within a document and add it to the target URL with the <emph>Insert</emph> button.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HYPERLINK_MARKWND_TREE" id="bm_id3159167" localize="false"/><paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_HYPERLINK_MARKWND_TREE" visibility="hidden">Specifies the position in the target document where you wish to jump to.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HYPERLINK_MARKWND_APPLY" id="bm_id3159177" localize="false"/><paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_HYPERLINK_MARKWND_APPLY" visibility="hidden">Inserts the target in the <emph>Target</emph> field of the <emph>Hyperlink</emph> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HYPERLINK_MARKWND_CLOSE" id="bm_id3145416" localize="false"/><paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_HYPERLINK_MARKWND_CLOSE" visibility="hidden">Once the hyperlink has been completely entered, click on <emph>Close</emph> to set the link and leave the dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN" id="bm_id3154307" localize="false"/><paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="15">Login name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN" id="bm_id3154307" localize="false"/><paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="15">Login name</paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN">Specifies your login name, if you are working with FTP addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="17">Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="17">Password</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD">Specifies your password, if you are working with FTP addresses.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="19">Anonymous user</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="19">Anonymous user</paragraph>
<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS">Allows you to log in to the FTP address as an anonymous user.</ahelp></paragraph>
<section id="weitere">
<paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="2" l10n="U" oldref="21">Further settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME" id="bm_id3153778" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME" id="bm_id3154072" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME" id="bm_id3154138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME" id="bm_id7259437" localize="false"/><paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="23">Frame</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME" id="bm_id3153778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME" id="bm_id3154072" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME" id="bm_id3154138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME" id="bm_id7259437" localize="false"/><paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="23">Frame</paragraph>
<paragraph role="paragraph" id="par_id2052980" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM" id="bm_id3154819" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM" id="bm_id3144433" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM" id="bm_id3156424" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3155101" xml-lang="en-US" level="3" l10n="U" oldref="24">Form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM" id="bm_id3154819" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM" id="bm_id3144433" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM" id="bm_id3156424" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3155101" xml-lang="en-US" level="3" l10n="U" oldref="24">Form</paragraph>
<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM">Specifies whether the hyperlink is inserted as text or as a button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT" id="bm_id3150871" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT" id="bm_id3157321" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT" id="bm_id3148678" localize="false"/><paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="3" l10n="U" oldref="26">Events</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT" id="bm_id3150871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT" id="bm_id3125863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT" id="bm_id3157321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT" id="bm_id3148678" localize="false"/><paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="3" l10n="U" oldref="26">Events</paragraph>
<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT">Opens the <emph>Assign Macro</emph> dialog, in which you can give events such as "mouse over object" or "trigger hyperlink" their own program codes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION" id="bm_id3151383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION" id="bm_id3154685" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION" id="bm_id3154684" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION" id="bm_id3149983" localize="false"/><paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="28">Text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION" id="bm_id3151383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION" id="bm_id3154685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION" id="bm_id3154684" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION" id="bm_id3149983" localize="false"/><paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="28">Text</paragraph>
<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION">Specifies the visible text or button caption for the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT" id="bm_id3152598" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT" id="bm_id3159198" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT" id="bm_id3146121" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_HYPERLINK_INTERNET_ED_TEXT" id="bm_id2681356" localize="false"/><paragraph role="heading" id="hd_id3147354" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT" id="bm_id3152598" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT" id="bm_id3159198" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT" id="bm_id3146121" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT" id="bm_id2681356" localize="false"/><paragraph role="heading" id="hd_id3147354" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
<paragraph role="paragraph" id="par_id2801599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink.</paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/02/09070200.xhp b/helpcontent2/source/text/shared/02/09070200.xhp
index fde0e22fca..4944267d6b 100755
--- a/helpcontent2/source/text/shared/02/09070200.xhp
+++ b/helpcontent2/source/text/shared/02/09070200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09070200.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,15 +48,15 @@
<embed href="text/shared/00/00000403.xhp#hypdiamailnews"/>
</section>
<paragraph role="heading" id="hd_id3153528" xml-lang="en-US" level="2" l10n="U" oldref="3">Mail &amp; News</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="3" l10n="U" oldref="4">E-mail</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="3" l10n="U" oldref="4">E-mail</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL">Assigns the specified e-mail address to the hyperlink.</ahelp> Clicking the new hyperlink in the document will open a new message document, addressed to the receiver specified in the <emph>E-mail</emph> field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_NEWS" id="bm_id3145673" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="6">News</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS" id="bm_id3145673" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="6">News</paragraph>
<paragraph role="paragraph" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_NEWS">Assigns a news address to the hyperlink.</ahelp> Clicking the hyperlink in the document will open a new message document to the news group you entered in the <emph>Receiver</emph> field.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HYPERDLG_MAIL_PATH" id="bm_id3144438" localize="false"/><paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="3" l10n="U" oldref="8">Receiver</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_HYPERDLG_MAIL_PATH">Specifies the full URL of the addressee, in the form mailto:name@provider.com or news:group.server.com.</ahelp> You can also use drag-and-drop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_BTN_ADRESSBOOK" id="bm_id3155449" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="14">Data Sources</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK" id="bm_id3155449" localize="false"/><paragraph role="heading" id="hd_id3143270" xml-lang="en-US" level="3" l10n="U" oldref="14">Data Sources</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXPAGE_HYPERLINK_MAIL_BTN_ADRESSBOOK">Hides or shows the data source browser.</ahelp> Drag the receiver's <emph>E-mail</emph> data field from the data source browser into the <emph>Receiver</emph> text field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_HYPERLINK_MAIL_ED_SUBJECT" id="bm_id3154852" localize="false"/><paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="12">Subject</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT" id="bm_id3154852" localize="false"/><paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="12">Subject</paragraph>
<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX_EDIT_RID_SVXPAGE_HYPERLINK_MAIL_ED_SUBJECT">Specifies the subject that is inserted in the subject line of the new message document.</ahelp></paragraph>
<embed href="text/shared/02/09070100.xhp#weitere"/>
</body>
diff --git a/helpcontent2/source/text/shared/02/09070300.xhp b/helpcontent2/source/text/shared/02/09070300.xhp
index 59524f12f9..7198da82aa 100755
--- a/helpcontent2/source/text/shared/02/09070300.xhp
+++ b/helpcontent2/source/text/shared/02/09070300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09070300.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,12 +50,12 @@
<paragraph role="heading" id="hd_id3150808" xml-lang="en-US" level="2" l10n="U" oldref="3">Document</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_HYPERDLG_DOC_PATH" id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3150710" xml-lang="en-US" level="3" l10n="U" oldref="5">Path</paragraph>
<paragraph role="paragraph" id="par_id9462263" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN" id="bm_id3147571" localize="false"/><paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="3" l10n="U" oldref="6">Open File</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN" id="bm_id3147571" localize="false"/><paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="3" l10n="U" oldref="6">Open File</paragraph>
<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN">Opens the <emph>Open dialog,</emph> where you can select a file.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149828" xml-lang="en-US" level="2" l10n="U" oldref="8">Target in document</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC" id="bm_id3150693" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="3" l10n="U" oldref="10">Target</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC" id="bm_id3150693" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="3" l10n="U" oldref="10">Target</paragraph>
<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:EDIT:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC">Specifies a target for the hyperlink into the document specified under <emph>Path</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="12">Target in Document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="12">Target in Document</paragraph>
<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE">Opens the <emph>Target in Document</emph> dialog.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153320" xml-lang="en-US" level="3" l10n="U" oldref="14">URL</paragraph>
<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="15">Specifies the URL, which results from the entries in <emph>Path</emph> and <emph>Destination</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/09070400.xhp b/helpcontent2/source/text/shared/02/09070400.xhp
index 5e6bb14ea3..72cc63b41e 100755
--- a/helpcontent2/source/text/shared/02/09070400.xhp
+++ b/helpcontent2/source/text/shared/02/09070400.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09070400.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,15 +49,15 @@
</section>
<paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="2" l10n="U" oldref="3">New Document</paragraph>
<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4">Specifies the name, path and type of the new document in this area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="5">Edit now</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="5">Edit now</paragraph>
<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW">Specifies that the new document is created and immediately opened for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="7">Edit later</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="3" l10n="U" oldref="7">Edit later</paragraph>
<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER">Specifies that the document is created but it is not immediately opened.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC" id="bm_id3149182" localize="false"/><paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC" id="bm_id3149182" localize="false"/><paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="9">File</paragraph>
<paragraph role="paragraph" id="par_id8894009" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a URL for the file that you want to open when you click the hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE" id="bm_id3166460" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="10">Select Path</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE" id="bm_id3166460" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="10">Select Path</paragraph>
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE">Opens the <emph>Select Path</emph> dialog, where you can select a path.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES" id="bm_id3153698" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="12">File type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES" id="bm_id3153698" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="12">File type</paragraph>
<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES">Specifies the file type for the new document.</ahelp></paragraph>
<embed href="text/shared/02/09070100.xhp#weitere"/>
</body>
diff --git a/helpcontent2/source/text/shared/02/10010000.xhp b/helpcontent2/source/text/shared/02/10010000.xhp
index bc9a90478f..d01b16450f 100644
--- a/helpcontent2/source/text/shared/02/10010000.xhp
+++ b/helpcontent2/source/text/shared/02/10010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 10010000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10020000.xhp b/helpcontent2/source/text/shared/02/10020000.xhp
index 552f85be5e..0342496843 100644
--- a/helpcontent2/source/text/shared/02/10020000.xhp
+++ b/helpcontent2/source/text/shared/02/10020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 10020000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10030000.xhp b/helpcontent2/source/text/shared/02/10030000.xhp
index 29d081f74f..817843f940 100644
--- a/helpcontent2/source/text/shared/02/10030000.xhp
+++ b/helpcontent2/source/text/shared/02/10030000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 10030000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10040000.xhp b/helpcontent2/source/text/shared/02/10040000.xhp
index 266da49ca3..4b26aa7b03 100644
--- a/helpcontent2/source/text/shared/02/10040000.xhp
+++ b/helpcontent2/source/text/shared/02/10040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 10040000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/10100000.xhp b/helpcontent2/source/text/shared/02/10100000.xhp
index 79a756ebfa..bd88cf0aae 100644
--- a/helpcontent2/source/text/shared/02/10100000.xhp
+++ b/helpcontent2/source/text/shared/02/10100000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 10100000.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12000000.xhp b/helpcontent2/source/text/shared/02/12000000.xhp
index 7e50fc04b7..581fbbc704 100644
--- a/helpcontent2/source/text/shared/02/12000000.xhp
+++ b/helpcontent2/source/text/shared/02/12000000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12000000.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,25 +36,20 @@
<title id="tit" xml-lang="en-US">Explorer On/Off</title>
<filename>/text/shared/02/12000000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-15T12:33:43">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="explorer">
<bookmark xml-lang="en-US" branch="hid/SID_DSBROWSER_EXPLORER" id="bm_id6761446" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBrowserExplorer" id="bm_id3154682" localize="false"/>
<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/12000000.xhp" name="Explorer On/Off">Explorer On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off </emph>icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off</emph> icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
</section>
<section id="syexplorer">
<table id="tbl_id3153894">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="E">
-<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="3">Explorer On/Off</paragraph>
@@ -67,20 +59,20 @@
</section>
<embed href="text/shared/guide/database_main.xhp#database_main"/>
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their links, queries and tables.</paragraph>
+<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their queries and tables.</paragraph>
<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="53">
<emph>Establishing a connection</emph> - As soon as you select an individual table or query, a connection to the data source is established. Once the connection is opened, the name of the data source, the Queries or Tables entry, and the name of the query or table selected is shown in bold type.</paragraph>
<section id="kontextmenue">
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_CLOSECONN" id="bm_id3155135" localize="false"/>
-<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>%PRODUCTNAME Base - Connections</emph> in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_RENAME_ENTRY" id="bm_id3156192" localize="false"/>
-<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name.. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_DSADMINISTRATE" id="bm_id189825" localize="false"/>
+<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
+<!-- removed HID HID_BROWSER_DSADMINISTRATE -->
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_EDIT_DATABASE" id="bm_id189826" localize="false"/>
<paragraph role="paragraph" id="par_id273445" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the selected database file for editing.</ahelp></paragraph><comment>i66574 new command "Database Registrations" / but name in UI is "Registered databases"</comment>
-<bookmark xml-lang="en-US" branch="hid/39064" id="bm_id321665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ADMINISTRATE" id="bm_id321665" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ADMINISTRATE" id="bm_id5135044" localize="false"/>
-<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>%PRODUCTNAME Base - Databases</emph> in the Options dialog box.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/12010000.xhp b/helpcontent2/source/text/shared/02/12010000.xhp
index 53fde58763..04361f2275 100644
--- a/helpcontent2/source/text/shared/02/12010000.xhp
+++ b/helpcontent2/source/text/shared/02/12010000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12010000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12020000.xhp b/helpcontent2/source/text/shared/02/12020000.xhp
index f97af8599f..25d6cc32c7 100644
--- a/helpcontent2/source/text/shared/02/12020000.xhp
+++ b/helpcontent2/source/text/shared/02/12020000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12020000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12030000.xhp b/helpcontent2/source/text/shared/02/12030000.xhp
index 298bb0a686..6fcf44a284 100644
--- a/helpcontent2/source/text/shared/02/12030000.xhp
+++ b/helpcontent2/source/text/shared/02/12030000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12030000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12040000.xhp b/helpcontent2/source/text/shared/02/12040000.xhp
index 19258942a3..2619ec6346 100644
--- a/helpcontent2/source/text/shared/02/12040000.xhp
+++ b/helpcontent2/source/text/shared/02/12040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12040000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12050000.xhp b/helpcontent2/source/text/shared/02/12050000.xhp
index 17c300f64f..10c9311116 100644
--- a/helpcontent2/source/text/shared/02/12050000.xhp
+++ b/helpcontent2/source/text/shared/02/12050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12050000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12070000.xhp b/helpcontent2/source/text/shared/02/12070000.xhp
index eb2f35db47..7eead3d52b 100644
--- a/helpcontent2/source/text/shared/02/12070000.xhp
+++ b/helpcontent2/source/text/shared/02/12070000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12070000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12070100.xhp b/helpcontent2/source/text/shared/02/12070100.xhp
index 648f90c5ee..c4b631dec5 100644
--- a/helpcontent2/source/text/shared/02/12070100.xhp
+++ b/helpcontent2/source/text/shared/02/12070100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12070100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,47 +40,47 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1">Table</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3156183"><bookmark_value>database contents; inserting as tables</bookmark_value>
</bookmark>
<paragraph role="paragraph" id="par_id3156183" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE" visibility="hidden">Inserts data selected from the data source browser into the document as a table.</ahelp>In the <emph>Insert Database Columns</emph> dialog, select the <emph>Table</emph> option to insert the selected data into the document as a table. In the dialog, you can decide which database fields or columns are transferred, and how the text table is formatted.</paragraph>
<paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="2" l10n="U" oldref="2">Table</paragraph>
<paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="U" oldref="19">In the <emph>Table</emph> area, use the arrow keys to select the columns of the database table that you want to apply to the text table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="3" l10n="U" oldref="3">Database columns</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="3" l10n="U" oldref="3">Database columns</paragraph>
<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN">Specifies the database columns to be inserted into the text table.</ahelp> All database table columns that have not been accepted in the <emph>Table column(s)</emph> list box are listed here. The entries are sorted alphabetically. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="3" l10n="U" oldref="4">Table column(s)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL" id="bm_id3157959" localize="false"/><paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="3" l10n="U" oldref="4">Table column(s)</paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL">Lists all database columns to be inserted into the document.</ahelp> A column will be assigned to each corresponding entry in the table. The entry order in the <emph>Table column(s)</emph> list box determines the data order in the text table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_TO" id="bm_id3159234" localize="false"/><paragraph role="heading" id="hd_id3146958" xml-lang="en-US" level="3" l10n="U" oldref="5">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO" id="bm_id3159234" localize="false"/><paragraph role="heading" id="hd_id3146958" xml-lang="en-US" level="3" l10n="U" oldref="5">&gt;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_TO">Moves all listed database fields into the <emph>Table column(s)</emph> list box.</ahelp> All fields listed in the <emph>Table column(s)</emph> list box are inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_TO" id="bm_id3148539" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="6">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO" id="bm_id3148539" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="6">&gt;</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_TO">Moves the selected database field into the <emph>Table column(s)</emph> list box. </ahelp> You can also double click an entry to move it to the <emph>Table column(s)</emph> list box. All fields listed in the <emph>Table column(s)</emph> list box are inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_FROM" id="bm_id3148992" localize="false"/><paragraph role="heading" id="hd_id3149732" xml-lang="en-US" level="3" l10n="U" oldref="7">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM" id="bm_id3148992" localize="false"/><paragraph role="heading" id="hd_id3149732" xml-lang="en-US" level="3" l10n="U" oldref="7">&lt;</paragraph>
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_FROM">Removes the selected database field from the<emph> Table column(s)</emph> list box</ahelp> The removed field is not inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_FROM" id="bm_id3154286" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="8">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM" id="bm_id3154286" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="8">&lt;&lt;</paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_FROM">Removes all database fields from the <emph>Table column(s)</emph> list box.</ahelp></paragraph>
<section id="format">
<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="13">Format</paragraph>
<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="30">Specifies the format for inserting the database fields into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB" id="bm_id3146948" localize="false"/><paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="3" l10n="U" oldref="14">From database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB" id="bm_id3146948" localize="false"/><paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="3" l10n="U" oldref="14">From database</paragraph>
<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB">Accepts the database formats.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR" id="bm_id3151378" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR" id="bm_id3159177" localize="false"/><paragraph role="heading" id="hd_id3159148" xml-lang="en-US" level="3" l10n="U" oldref="15">Select</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR" id="bm_id3151378" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR" id="bm_id3159177" localize="false"/><paragraph role="heading" id="hd_id3159148" xml-lang="en-US" level="3" l10n="U" oldref="15">Select</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW:LISTBOX:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR">Specifies a format from the list, if the format information of certain data fields is not accepted.</ahelp> The formats supplied here are only available for certain database fields, such as numeric or Boolean fields. If you select a database field in text format, you will not be able to select any format from the selection list, since the text format will be automatically maintained.</paragraph>
<paragraph role="paragraph" id="par_id3144511" xml-lang="en-US" l10n="U" oldref="33">If the format you want is not listed, select "Other Formats..." and define the desired format in the <link href="text/shared/01/05020300.xhp" name="Number Format"><emph>Number Format</emph></link> dialog.</paragraph>
<paragraph role="paragraph" id="par_id3154282" xml-lang="en-US" l10n="U" oldref="34">The number format assigned using the selection list always refers to the database field selected in the <emph>Database columns</emph> list box.</paragraph>
</section>
<paragraph role="note" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="35">To insert the data into the document in the form of a table, the correct <emph>Table</emph> option must be active. You can then select a database field from the <emph>Table column(s)</emph> list box to define the formatting of the database field. The changes to the number formats will be applied to the last selection. It does not matter whether the database field was selected from the <emph>Database columns</emph> list box or from the <emph>Table column(s)</emph> list box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="10">Insert table heading</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="10">Insert table heading</paragraph>
<paragraph role="paragraph" id="par_id3150497" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:CHECKBOX:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON">Specifies whether to insert a heading line for the columns in the text table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS" id="bm_id3145606" localize="false"/><paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="11">Apply column name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS" id="bm_id3145606" localize="false"/><paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="11">Apply column name</paragraph>
<paragraph role="paragraph" id="par_id3152922" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS">Uses the field names of the database table as headings for each of the text table columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY" id="bm_id3148920" localize="false"/><paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="12">Create row only</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY" id="bm_id3148920" localize="false"/><paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="12">Create row only</paragraph>
<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY">Inserts an empty heading line into the text table.</ahelp> Using the<emph> Create row only </emph>option, you can define headings in the document, which do not correspond to the database field names.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT" id="bm_id3155133" localize="false"/><paragraph role="heading" id="hd_id3153369" xml-lang="en-US" level="3" l10n="U" oldref="16">Properties</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT" id="bm_id3155133" localize="false"/><paragraph role="heading" id="hd_id3153369" xml-lang="en-US" level="3" l10n="U" oldref="16">Properties</paragraph>
<paragraph role="paragraph" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT">Opens the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05090000.xhp" name="Table Format"><emph>Table Format</emph></link>
</caseinline><defaultinline>
<emph>Table Format</emph></defaultinline></switchinline> dialog, which enables you to define the table properties such as borders, background, and column width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT" id="bm_id3155411" localize="false"/><paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="17">AutoFormat</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT" id="bm_id3155411" localize="false"/><paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="17">AutoFormat</paragraph>
<paragraph role="paragraph" id="par_id3154988" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW:PUSHBUTTON:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT">Opens the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/05150101.xhp" name="AutoFormat"><emph>AutoFormat</emph></link>
</caseinline><defaultinline>
<emph>AutoFormat</emph></defaultinline></switchinline> dialog, in which you can select format styles that are immediately applied when inserting the table.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/02/12070200.xhp b/helpcontent2/source/text/shared/02/12070200.xhp
index 1900716052..1998f310da 100644
--- a/helpcontent2/source/text/shared/02/12070200.xhp
+++ b/helpcontent2/source/text/shared/02/12070200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12070200.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,21 +42,21 @@
<switch select="appl"><case select="WRITER">
- <bookmark branch="hid/SW_RADIOBUTTON_DLG_AP_INSERT_DB_SEL_RB_AS_FIELD" xml-lang="en-US" id="bm_id3153116"/><paragraph role="heading" level="1" id="hd_id3149991" l10n="U" xml-lang="en-US" oldref="1">Fields</paragraph>
+ <bookmark branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD" xml-lang="en-US" id="bm_id3153116"/><paragraph role="heading" level="1" id="hd_id3149991" l10n="U" xml-lang="en-US" oldref="1">Fields</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149987"><bookmark_value>database contents; inserting as fields</bookmark_value></bookmark><paragraph l10n="U" xml-lang="en-US" oldref="8" id="par_id3149987" role="paragraph"><ahelp hid="SW_RADIOBUTTON_DLG_AP_INSERT_DB_SEL_RB_AS_FIELD" visibility="hidden">Inserts data selected from the data source browser into the document as fields.</ahelp>In the <emph>Insert Database Columns</emph> dialog, select the <link href="text/swriter/01/04090000.xhp" name="Fields">Fields</link> to insert the selected data into the document as fields. These <link href="text/swriter/01/04090006.xhp" name="database fields">database fields</link> work as wildcards for the individual database columns and can be used for form letters. Click the <link href="text/shared/02/12080000.xhp" name="Data to Fields"><emph>Data to Fields</emph></link> icon to match the contents of the fields to the currently selected record.</paragraph>
<paragraph xml-lang="en-US" role="note" id="par_id3153114" l10n="U" oldref="9">If several records are selected when you choose the <emph>Data to Text</emph> function, the mail merge fields will be inserted according to the number of records. Also, a field command such as "Next record" will be inserted automatically between individual field command blocks.</paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3145090" l10n="U" oldref="10">The <emph>Insert Database Columns</emph> dialog lets you define which database fields to insert into the document and how to format the paragraphs.</paragraph>
<paragraph role="heading" level="2" id="hd_id3156136" l10n="U" xml-lang="en-US" oldref="2">Fields</paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3147571" l10n="U" oldref="11">In the <emph>Fields</emph> area, use the arrow button to select the database table columns into which you want to insert field contents.</paragraph>
<section id="ankerfuertextoption">
- <bookmark branch="hid/SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_TXT_DB_COLUMN" xml-lang="en-US" id="bm_id3156411"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="3">Database columns</paragraph>
+ <bookmark branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN" xml-lang="en-US" id="bm_id3156411"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="3">Database columns</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155535" xml-lang="en-US" oldref="12">Lists all columns of the database table, which can be accepted in the selection list box to insert them into the document. <ahelp hid="SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_TXT_DB_COLUMN" visibility="visible">Select the database columns that you want to insert it in the document.</ahelp></paragraph>
- <bookmark branch="hid/SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_TOEDIT" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3152551" l10n="U" xml-lang="en-US" oldref="4">&gt;</paragraph>
+ <bookmark branch="hid/sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT" xml-lang="en-US" id="bm_id3149178"/><paragraph role="heading" level="3" id="hd_id3152551" l10n="U" xml-lang="en-US" oldref="4">&gt;</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3145345" xml-lang="en-US" oldref="13"><ahelp visibility="visible" hid="SW_IMAGEBUTTON_DLG_AP_INSERT_DB_SEL_IB_DBCOL_TOEDIT">Moves the fields that you selected in the <emph>Database columns</emph> list box into the selection field.</ahelp> You can also double-click the entry to select it.</paragraph>
- <bookmark branch="hid/SW_MULTILINEEDIT_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT" xml-lang="en-US" id="bm_id3152997"/><paragraph role="heading" level="3" id="hd_id3166411" l10n="U" xml-lang="en-US" oldref="5">Select</paragraph>
+ <bookmark branch="hid/sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT" xml-lang="en-US" id="bm_id3152997"/><paragraph role="heading" level="3" id="hd_id3166411" l10n="U" xml-lang="en-US" oldref="5">Select</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3163802" xml-lang="en-US" oldref="14"><ahelp hid="SW_MULTILINEEDIT_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT" visibility="visible">Lists the database columns that you selected to be inserted into the document. You can also enter text here. This text will be also inserted into the document.</ahelp> The entries' order in the selection field corresponds to the data order in the document.</paragraph>
<embed href="text/shared/02/12070100.xhp#format"/>
- <bookmark branch="hid/SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_DB_PARA_COLL" xml-lang="en-US" id="bm_id3154852"/><paragraph role="heading" level="3" id="hd_id3153257" l10n="U" xml-lang="en-US" oldref="7">Paragraph Style</paragraph>
+ <bookmark branch="hid/sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL" xml-lang="en-US" id="bm_id3154852"/><paragraph role="heading" level="3" id="hd_id3153257" l10n="U" xml-lang="en-US" oldref="7">Paragraph Style</paragraph>
<paragraph xml-lang="en-US" oldref="15" id="par_id3158430" l10n="U" role="paragraph">By default, the inserted paragraphs are formatted with the current Paragraph Styles. This format corresponds to the "none" entry in the <emph>Paragraph Style</emph> list box. <ahelp hid="SW_LISTBOX_DLG_AP_INSERT_DB_SEL_LB_DB_PARA_COLL" visibility="visible">This is where you can select other Paragraph Styles to apply to the paragraph you want to insert into the document.</ahelp> The list box displays the available Paragraph Styles defined in <item type="productname">%PRODUCTNAME</item> and managed in the <link href="text/swriter/01/05130000.xhp" name="Style Catalog">Style Catalog</link>.</paragraph>
</section>
</case></switch>
diff --git a/helpcontent2/source/text/shared/02/12070300.xhp b/helpcontent2/source/text/shared/02/12070300.xhp
index 482b2d0e79..4fee7f50cc 100755
--- a/helpcontent2/source/text/shared/02/12070300.xhp
+++ b/helpcontent2/source/text/shared/02/12070300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12070300.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
<body>
- <bookmark branch="hid/SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT" xml-lang="en-US" id="bm_id3146938"/><paragraph role="heading" level="1" id="hd_id3154873" l10n="U" xml-lang="en-US" oldref="1">Text</paragraph>
+ <bookmark branch="hid/sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT" xml-lang="en-US" id="bm_id3146938"/><paragraph role="heading" level="1" id="hd_id3154873" l10n="U" xml-lang="en-US" oldref="1">Text</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3143284"><bookmark_value>database contents; inserting as text</bookmark_value></bookmark><paragraph l10n="U" xml-lang="en-US" oldref="3" role="paragraph" id="par_id3143284"><ahelp hid="SW:RADIOBUTTON:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT" visibility="hidden">Inserts data selected from the data source browser into the document as text.</ahelp>If you select the <emph>Text</emph> option in the <emph>Insert Database Columns</emph> dialog, the content of the data selected in the data source browser is inserted into the document as text. In the dialog, you can decide which database fields or columns are transferred, and how the text is formatted.</paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3154289" l10n="U" oldref="4">If several records are selected when you choose the <emph>Data to Text</emph> function, the mail merge fields will be inserted according to the number of records.</paragraph>
<paragraph role="heading" level="2" id="hd_id3155392" l10n="U" xml-lang="en-US" oldref="2">Text</paragraph>
diff --git a/helpcontent2/source/text/shared/02/12080000.xhp b/helpcontent2/source/text/shared/02/12080000.xhp
index b45f5506ef..407ab8f2e7 100644
--- a/helpcontent2/source/text/shared/02/12080000.xhp
+++ b/helpcontent2/source/text/shared/02/12080000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12080000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12090000.xhp b/helpcontent2/source/text/shared/02/12090000.xhp
index 73660376e8..6a8106add7 100644
--- a/helpcontent2/source/text/shared/02/12090000.xhp
+++ b/helpcontent2/source/text/shared/02/12090000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 12090000.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,53 +29,50 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0212090000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Standard Filter</title>
-<filename>/text/shared/02/12090000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-06T15:41:19">UFI: changed name, see #i39874#</lastedited>
-</history>
-</meta>
-<body>
-<section id="standardfilter1">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3109850"><bookmark_value>default filters; databases</bookmark_value>
-<bookmark_value>databases; standard filters</bookmark_value>
-<bookmark_value>standard filters in databases</bookmark_value>
-</bookmark><comment>mw made "standard filters;..." a one level entry</comment>
+ <topic id="textshared0212090000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Standard Filter</title>
+ <filename>/text/shared/02/12090000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="standardfilter1">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3109850"><bookmark_value>default filters, see standard filters</bookmark_value>
+ <bookmark_value>databases; standard filters</bookmark_value>
+ <bookmark_value>standard filters;databases</bookmark_value>
+</bookmark><comment>mw converted "standard filters..." into a two level entry and "default filters;" into a cross reference</comment>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_FILTERCRIT" id="bm_id3154894" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_FM_FILTERCRIT" id="bm_id2784060" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FilterCrit" id="bm_id3154094" localize="false"/>
-<paragraph role="heading" id="hd_id3109850" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/12090000.xhp" name="Standard Filter">Standard Filter</link></paragraph>
-<paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="2"><variable id="standardfilter"><ahelp hid=".uno:FilterCrit">Allows you to set the filtering options.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3109850" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/02/12090000.xhp" name="Standard Filter">Standard Filter</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143281" role="paragraph" l10n="U" oldref="2"><variable id="standardfilter"><ahelp hid=".uno:FilterCrit">Allows you to set the filtering options.</ahelp>
</variable></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="8">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</paragraph>
-<section id="systandardfilter">
-<table id="tbl_id3152924">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="E">
-<image id="img_id3147291" src="res/commandimagelist/sc_formfiltered.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147291" xml-lang="en-US">Icon</alt>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="U" oldref="8">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</paragraph>
+ <section id="systandardfilter">
+ <table id="tbl_id3152924">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="E">
+<image id="img_id3147291" src="res/commandimagelist/sc_formfiltered.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147291">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149183" xml-lang="en-US" l10n="U" oldref="3">Standard Filter</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149183" role="paragraph" l10n="U" oldref="3">Standard Filter</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<section id="filterdialog">
-<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="6">$[officename] saves the current filter settings for the next time that you open this dialog.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="CHG" oldref="7">To remove the current filter, click <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting"><emph>Remove Filter/Sorting</emph></link> icon.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="C"><link href="text/shared/02/12030000.xhp" name="AutoFilter">AutoFilter</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ </section>
+ <section id="filterdialog">
+ <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="U" oldref="6">$[officename] saves the current filter settings for the next time that you open this dialog.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="CHG" oldref="7">To remove the current filter, click <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting"><emph>Remove Filter/Sorting</emph></link> icon.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" l10n="C"><link href="text/shared/02/12030000.xhp" name="AutoFilter">AutoFilter</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12090100.xhp b/helpcontent2/source/text/shared/02/12090100.xhp
index 0575be96c8..7c0a8a0810 100644
--- a/helpcontent2/source/text/shared/02/12090100.xhp
+++ b/helpcontent2/source/text/shared/02/12090100.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12090100.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,74 +27,72 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0212090100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Filter</title>
-<filename>/text/shared/02/12090100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T12:30:05">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0212090100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Standard Filter</title>
+ <filename>/text/shared/02/12090100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/SID_FILTER" id="bm_id9065823" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DataFilterStandardFilter" id="bm_id3154232" localize="false"/>
-<paragraph role="heading" id="hd_id3151097" xml-lang="en-US" level="1" l10n="U" oldref="1">Filter</paragraph>
-<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DataFilterStandardFilter">Specifies the logical conditions to filter your table data.</ahelp> This dialog is called <emph>Standard Filter</emph> in Spreadsheet documents and <emph>Filter</emph> in database tables or database forms. The <emph>Filter</emph> dialog does not contain the <emph>More</emph> button.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000409.xhp#dnfitdf"/>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3151097" role="heading" level="1" l10n="U" oldref="1">Standard Filter</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:DataFilterStandardFilter">Specifies the logical conditions to filter your table data.</ahelp> This dialog is available for spreadsheet documents, database tables and database forms. The dialog for databases does not contain the <emph>More Options</emph> button.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000409.xhp#dnfitdf"/>
+ </section>
<switch select="appl">
<case select="CALC">
-<paragraph role="paragraph" id="par_idN105EE" xml-lang="en-US" l10n="NEW">
-<embedvar href="text/scalc/guide/filters.xhp#filters"/>
-</paragraph>
+<paragraph xml-lang="en-US" id="par_idN105EE" role="paragraph" l10n="NEW">
+ <embedvar href="text/scalc/guide/filters.xhp#filters"/>
+ </paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="3">Filter criteria</paragraph>
-<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="4">You can define a filter by indicating the type of line, the name of the field, a logical condition and a value or a combination of arguments.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_OP1" id="bm_id3153683" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_OP2" id="bm_id3147577" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND2" id="bm_id3155892" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND3" id="bm_id3150774" localize="false"/>
-<paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Operator</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND3">For the following arguments, you can choose between the logical operators AND / OR.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_FIELD1" id="bm_id3153682" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_FIELD2" id="bm_id3155942" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_FIELD3" id="bm_id3150693" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD1" id="bm_id3153345" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD2" id="bm_id3155535" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD3" id="bm_id3148538" localize="false"/>
-<paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="3" l10n="U" oldref="7">Field name</paragraph>
-<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD3">Specifies the field names from the current table to set them in the argument.</ahelp> You will see the column identifiers if no text is available for the field names.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_COND1" id="bm_id3149811" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_COND2" id="bm_id3153760" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_FILTER:LB_COND3" id="bm_id3153126" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP1" id="bm_id3159270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP2" id="bm_id3148990" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP3" id="bm_id3153252" localize="false"/>
-<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="3" l10n="U" oldref="9">Condition</paragraph>
-<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP3">Specifies the <link href="text/shared/02/12090101.xhp" name="comparative operators">comparative operators</link> through which the entries in the <emph>Field name</emph> and <emph>Value</emph> fields can be linked.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_FILTER:ED_VAL1" id="bm_id3155136" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_FILTER:ED_VAL2" id="bm_id3148492" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_FILTER:ED_VAL3" id="bm_id3150276" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE1" id="bm_id3146949" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE2" id="bm_id3153700" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE3" id="bm_id3159400" localize="false"/>
-<paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="11">Value</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE3">Specifies a value to filter the field.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="14">The<emph> Value </emph>list box contains all possible values for the specified <emph>Field name</emph> . Choose the value to be used in the filter. You can also choose the <emph>- empty -</emph> or <emph>-not empty -</emph> entries..</paragraph>
-<paragraph role="paragraph" id="par_id3156118" xml-lang="en-US" l10n="U" oldref="15">If you use the filter function in database tables or forms, then type the value in the <emph>Value </emph>text box to be used for filtering.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155555" role="heading" level="2" l10n="U" oldref="3">Filter criteria</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147834" role="paragraph" l10n="U" oldref="4">You can define a filter by indicating the type of line, the name of the field, a logical condition and a value or a combination of arguments.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_OP1" id="bm_id3153683" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_OP2" id="bm_id3147577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2" id="bm_id3155892" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3" id="bm_id3150774" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149751" role="heading" level="2" l10n="U" oldref="5">Operator</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="6"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOND3">For the following arguments, you can choose between the logical operators AND / OR.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1" id="bm_id3153682" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2" id="bm_id3155942" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3" id="bm_id3150693" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1" id="bm_id3153345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2" id="bm_id3155535" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3" id="bm_id3148538" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149182" role="heading" level="2" l10n="U" oldref="7">Field name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149398" role="paragraph" l10n="U" oldref="8"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHEREFIELD3">Specifies the field names from the current table to set them in the argument.</ahelp> You will see the column identifiers if no text is available for the field names.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COND1" id="bm_id3149811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COND2" id="bm_id3153760" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COND3" id="bm_id3153126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1" id="bm_id3159270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2" id="bm_id3148990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3" id="bm_id3153252" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="2" l10n="U" oldref="9">Condition</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="10"><ahelp hid="DBACCESS_LISTBOX_DLG_FILTERCRIT_LB_WHERECOMP3">Specifies the <link href="text/shared/02/12090101.xhp" name="comparative operators">comparative operators</link> through which the entries in the <emph>Field name</emph> and <emph>Value</emph> fields can be linked.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1" id="bm_id3155136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2" id="bm_id3148492" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3" id="bm_id3150276" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1" id="bm_id3146949" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2" id="bm_id3153700" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3" id="bm_id3159400" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149166" role="heading" level="2" l10n="U"
+ oldref="11">Value</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="12"><ahelp hid="DBACCESS_EDIT_DLG_FILTERCRIT_ET_WHEREVALUE3">Specifies a value to filter the field.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150976" role="paragraph" l10n="U" oldref="14">The<emph> Value </emph>list box contains all possible values for the specified <emph>Field name</emph> . Choose the value to be used in the filter. You can also choose the <emph>- empty -</emph> or <emph>-not empty -</emph> entries..</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156118" role="paragraph" l10n="U" oldref="15">If you use the filter function in database tables or forms, then type the value in the <emph>Value </emph>text box to be used for filtering.</paragraph>
<switch select="appl">
<case select="CALC">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="16">The <emph>Filter</emph> dialog does not contain the <emph>Options</emph> button.</paragraph>
-<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="13"><link href="text/scalc/01/12040201.xhp" name="More&gt;&gt;">More&gt;&gt;</link></paragraph>
-<embed href="text/scalc/01/12040201.xhp#zusaetzetext"/>
+<paragraph xml-lang="en-US" id="hd_id3153061" role="heading" level="2" l10n="U"
+ oldref="13"><link href="text/scalc/01/12040201.xhp" name="More Options">More Options</link></paragraph>
+ <embed href="text/scalc/01/12040201.xhp#zusaetzetext"/>
</case>
</switch>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12090101.xhp b/helpcontent2/source/text/shared/02/12090101.xhp
index f299a8c57c..414780557e 100755
--- a/helpcontent2/source/text/shared/02/12090101.xhp
+++ b/helpcontent2/source/text/shared/02/12090101.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 12090101.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,114 +31,115 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0212090101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Comparison Operators</title>
-<filename>/text/shared/02/12090101.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>comparisons;operators in default filter dialog</bookmark_value>
-<bookmark_value>operators; default filters</bookmark_value>
-<bookmark_value>default filters; comparison operators</bookmark_value>
-<bookmark_value>filters; comparison operators</bookmark_value>
-<bookmark_value>equal sign, see also operators</bookmark_value>
-</bookmark><comment>mw added "equal sign,..."</comment><paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="1" l10n="U" oldref="1">Comparison Operators</paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="2">The following comparative operators can be set under <emph>Condition</emph> in the <emph>Default Filter</emph> dialog.</paragraph>
-<table id="tbl_id3149760">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="3">
-<emph>Comparative operator</emph>
-</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="4">
-<emph>Effect</emph>
-</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="5">Equal (=)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="6">Shows values equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="7">Less than (&lt;)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153761" xml-lang="en-US" l10n="U" oldref="8">Shows values less than the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146807" xml-lang="en-US" l10n="U" oldref="9">Greater than (&gt;)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154852" xml-lang="en-US" l10n="U" oldref="10">Shows values greater than the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="U" oldref="11">Less than or equal to (&lt; =)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154381" xml-lang="en-US" l10n="U" oldref="12">Shows values that are less than or equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="13">Greater than or equal to (&gt; =)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="14">Shows values that are greater than or equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154811" xml-lang="en-US" l10n="U" oldref="15">Not equal (&lt; &gt;)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="16">Shows the values not equal to the condition.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="17">Largest</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="18">Shows the N (numeric value as parameter) largest values.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="19">Smallest</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161657" xml-lang="en-US" l10n="U" oldref="20">Shows the N (numeric value as parameter) smallest values.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="21">Largest %</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3161645" xml-lang="en-US" l10n="U" oldref="22">Shows the largest N% (numeric value as parameter) of the total values.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="23">Smallest %</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="24">Shows the smallest N% (numeric value as parameter) of the entire values.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</body>
-</helpdocument>
+ <topic id="textshared0212090101xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Comparison Operators</title>
+ <filename>/text/shared/02/12090101.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>comparisons;operators in standard filter dialog</bookmark_value>
+ <bookmark_value>operators;standard filters</bookmark_value>
+ <bookmark_value>standard filters;comparison operators</bookmark_value>
+ <bookmark_value>filters; comparison operators</bookmark_value>
+ <bookmark_value>equal sign, see also operators</bookmark_value>
+</bookmark><comment>mw added "equal sign,..."</comment><comment>MW changed "default filters;" into "standard filters;"</comment><comment>mw changed "comparisons;" and "operators;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3148983" role="heading" level="1" l10n="U" oldref="1">Comparison Operators</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="2">The following comparative operators can be set under <item type="menuitem">Condition</item> in the <item type="menuitem">Standard Filter</item> dialog.</paragraph>
+ <table id="tbl_id3149760">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145313" role="paragraph" l10n="U" oldref="3">
+ <emph>Comparative operator</emph>
+ </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147089" role="paragraph" l10n="U" oldref="4">
+ <emph>Effect</emph>
+ </paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="5">Equal (=)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146797" role="paragraph" l10n="U" oldref="6">Shows values equal to the condition.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="7">Less than (&lt;)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153761" role="paragraph" l10n="U" oldref="8">Shows values less than the condition.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146807" role="paragraph" l10n="U" oldref="9">Greater than (&gt;)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154852" role="paragraph" l10n="U" oldref="10">Shows values greater than the condition.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155342" role="paragraph" l10n="U" oldref="11">Less than or equal to (&lt; =)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154381" role="paragraph" l10n="U" oldref="12">Shows values that are less than or equal to the condition.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153823" role="paragraph" l10n="U" oldref="13">Greater than or equal to (&gt; =)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154143" role="paragraph" l10n="U" oldref="14">Shows values that are greater than or equal to the condition.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154811" role="paragraph" l10n="U" oldref="15">Not equal (&lt; &gt;)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="16">Shows the values not equal to the condition.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="paragraph" l10n="U" oldref="17">Largest</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159413" role="paragraph" l10n="U" oldref="18">Shows the N (numeric value as parameter) largest values.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151054" role="paragraph" l10n="U" oldref="19">Smallest</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3161657" role="paragraph" l10n="U" oldref="20">Shows the N (numeric value as parameter) smallest values.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="21">Largest %</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3161645" role="paragraph" l10n="U" oldref="22">Shows the largest N% (numeric value as parameter) of the total values.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149202" role="paragraph" l10n="U" oldref="23">Smallest %</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="24">Shows the smallest N% (numeric value as parameter) of the entire values.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12100000.xhp b/helpcontent2/source/text/shared/02/12100000.xhp
index af0ab19886..6952ce16b8 100644
--- a/helpcontent2/source/text/shared/02/12100000.xhp
+++ b/helpcontent2/source/text/shared/02/12100000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12100000.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12100100.xhp b/helpcontent2/source/text/shared/02/12100100.xhp
index 0f1a3aeb90..00246a74e1 100644
--- a/helpcontent2/source/text/shared/02/12100100.xhp
+++ b/helpcontent2/source/text/shared/02/12100100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12100100.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12100200.xhp b/helpcontent2/source/text/shared/02/12100200.xhp
index 82159826fd..2fab2c7ac6 100644
--- a/helpcontent2/source/text/shared/02/12100200.xhp
+++ b/helpcontent2/source/text/shared/02/12100200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12100200.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,284 +32,301 @@
<meta>
-<topic id="textshared0212100200xml" indexer="include">
-<title id="tit" xml-lang="en-US">Find Record</title>
-<filename>/text/shared/02/12100200.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0212100200xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Find Record</title>
+ <filename>/text/shared/02/12100200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3146936"><bookmark_value>tables in databases; searching</bookmark_value>
-<bookmark_value>forms; browsing</bookmark_value>
-<bookmark_value>records; searching in databases</bookmark_value>
-<bookmark_value>searching; databases</bookmark_value>
-<bookmark_value>databases; searching records</bookmark_value>
+ <bookmark_value>forms; browsing</bookmark_value>
+ <bookmark_value>records; searching in databases</bookmark_value>
+ <bookmark_value>searching; databases</bookmark_value>
+ <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">
-<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>
+ <paragraph xml-lang="en-US" id="hd_id3146936" role="heading" 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.
+ <paragraph xml-lang="en-US" id="par_id3147588" role="paragraph" 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"/>
-</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>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="110">The search function is also available for table controls. When calling the search function from a table control, you can search each column of the table control corresponding to the database columns of the linked database table.</paragraph>
-<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>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000450.xhp#datensuchen"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" 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 xml-lang="en-US" id="par_id3153394" role="tip" 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>
+ <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="110">The search function is also available for table controls. When calling the search function from a table control, you can search each column of the table control corresponding to the database columns of the linked database table.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3143267" role="heading" level="2" l10n="U"
+ oldref="112">Search for</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153527" role="paragraph" 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>
-<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>
-<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>
-<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>
-<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/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT" id="bm_id3147577" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153683" role="heading" level="2" l10n="U" oldref="6">Text:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154823" role="paragraph" 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 xml-lang="en-US" id="par_id3148539" role="paragraph" 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/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL" id="bm_id3145316" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153662" role="heading" level="2" l10n="U"
+ oldref="114">Field content is NULL</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153543" role="paragraph" 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/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL" id="bm_id3155388" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153717" role="heading" level="2" l10n="U"
+ oldref="116">Field content is not NULL</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143270" role="paragraph" 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 xml-lang="en-US" id="hd_id3156153" role="heading" level="2" l10n="U" oldref="9">Where to search</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="10">Specifies the fields for the search.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM" id="bm_id3150670" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154564" role="heading" level="2" l10n="U"
+ oldref="105">Form</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159176" role="paragraph" 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 xml-lang="en-US" id="par_id3155434" role="note" 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 xml-lang="en-US" id="par_id3151384" role="paragraph" 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 xml-lang="en-US" id="par_id3145086" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3159414" role="heading" level="2" l10n="U"
+ oldref="11">All Fields</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153896" role="paragraph" 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 xml-lang="en-US" id="par_id3151054" role="paragraph" 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>
-<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/cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD" id="bm_id3150400" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150865" role="heading" level="2" l10n="U"
+ oldref="15">Single field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD">Searches through a specified data field.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154365" role="heading" level="2" l10n="U"
+ oldref="17">Settings</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" 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>
-<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>
-<paragraph role="tablecontent" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="21">anywhere in the field</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="23">beginning of field</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="74">end of field</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="25">entire field</paragraph>
-</tablecell>
-<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 xml-lang="en-US" id="hd_id3149809" role="heading" level="2" l10n="U"
+ oldref="19">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148673" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="par_id3156280" role="tablecontent" l10n="U" oldref="21">anywhere in the field</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145744" role="tablecontent" l10n="U" oldref="22">Returns all fields containing the search pattern anywhere in the field.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148451" role="tablecontent" l10n="U" oldref="23">beginning of field</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155429" role="tablecontent" l10n="U" oldref="24">Returns all fields containing the search pattern at the beginning of the field.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155131" role="tablecontent" l10n="U" oldref="74">end of field</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153726" role="tablecontent" l10n="U" oldref="75">Returns all fields containing the search pattern at the end of the field.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="U" oldref="25">entire field</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154127" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="par_id3152886" role="note" 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>
-<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="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>
-<listitem>
-<paragraph role="listitem" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="79">in data source view on column formatting,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152941" xml-lang="en-US" l10n="U" oldref="80">in forms on control properties.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3156736" xml-lang="en-US" l10n="U" oldref="81">If the <emph>Apply field format</emph> box is marked, the data source view of the table or form is searched using the formatting set there. If the box is not marked, the database is searched using the formatting saved in the database.</paragraph>
-<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="82">Example:</paragraph>
-<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>
-<paragraph role="tablehead" id="par_id3150593" xml-lang="en-US" l10n="U" oldref="84">Apply field format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3145253" xml-lang="en-US" l10n="U" oldref="85">Search pattern</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3083279" xml-lang="en-US" l10n="U" oldref="86">on</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_id3148590" xml-lang="en-US" l10n="U" oldref="88">off</paragraph>
-</tablecell>
-<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 xml-lang="en-US" id="hd_id3149664" role="heading" level="2" l10n="U"
+ oldref="28">Apply field format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" 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="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150103" role="listitem" l10n="U" oldref="78">in table design mode for field properties,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150488" role="listitem" l10n="U" oldref="79">in data source view on column formatting,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152941" role="listitem" l10n="U" oldref="80">in forms on control properties.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3156736" role="paragraph" l10n="U" oldref="81">If the <emph>Apply field format</emph> box is marked, the data source view of the table or form is searched using the formatting set there. If the box is not marked, the database is searched using the formatting saved in the database.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151280" role="paragraph" l10n="U" oldref="82">Example:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149959" role="paragraph" l10n="CHG" 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>
+ <paragraph xml-lang="en-US" id="par_id3150593" role="tablehead" l10n="U" oldref="84">Apply field format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145253" role="tablehead" l10n="U" oldref="85">Search pattern</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3083279" role="tablecontent" l10n="U" oldref="86">on</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155850" role="tablecontent" l10n="U" oldref="87">"Feb" is returned, but not "2".</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148590" role="tablecontent" l10n="U" oldref="88">off</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153418" role="tablecontent" 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>
-<paragraph role="tablehead" id="par_id3152971" xml-lang="en-US" l10n="U" oldref="92">Search results</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="93">Cause</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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 xml-lang="en-US" id="par_id3151321" role="paragraph" l10n="U" oldref="90">It is recommended that you always search using field formatting.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149401" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="par_id3152971" role="tablehead" l10n="U" oldref="92">Search results</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154273" role="tablehead" l10n="U" oldref="93">Cause</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153836" role="tablecontent" l10n="U" oldref="94">"5" returns "14:00:00" as a time</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156332" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="par_id3157965" role="tablecontent" l10n="U" oldref="96">"00:00:00" returns all records of a standard date field</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146081" role="tablecontent" l10n="U" oldref="97">The database stores a date value internally using a combined date/time field.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155764" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="par_id3155518" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="par_id3148481" role="paragraph" 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 xml-lang="en-US" id="par_id3154507" role="paragraph" 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 xml-lang="en-US" id="par_id3153355" role="paragraph" 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 xml-lang="en-US" id="par_id3150995" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3150387" role="heading" level="2" l10n="U"
+ oldref="32">Match case</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159267" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3145297" role="heading" level="2" l10n="U"
+ oldref="34">Search backwards</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151249" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3152484" role="heading" level="2" l10n="U"
+ oldref="36">From top / From bottom</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156316" role="paragraph" 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>
-<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>
-<paragraph role="tablehead" id="par_id3146317" xml-lang="en-US" l10n="U" oldref="39">Wildcards</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="40">Meaning</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3153919" xml-lang="en-US" l10n="U" oldref="41">Example</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3158411" xml-lang="en-US" l10n="U" oldref="42">?</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148874" xml-lang="en-US" l10n="U" oldref="43">for exactly one arbitrary character</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_id3148803" xml-lang="en-US" l10n="U" oldref="45">*</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3156138" xml-lang="en-US" l10n="U" oldref="46">for 0 or more arbitrary characters</paragraph>
-</tablecell>
-<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 xml-lang="en-US" id="hd_id3163724" role="heading" level="2" l10n="U"
+ oldref="38">Wildcard expression</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149255" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="par_id3146317" role="tablehead" l10n="U" oldref="39">Wildcards</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150298" role="tablehead" l10n="U" oldref="40">Meaning</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153919" role="tablehead" l10n="U" oldref="41">Example</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3158411" role="tablecontent" l10n="U" oldref="42">?</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148874" role="tablecontent" l10n="U" oldref="43">for exactly one arbitrary character</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150365" role="tablecontent" l10n="U" oldref="44">"?loppy" returns "Floppy"</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166426" role="tablecontent" l10n="U" oldref="65">"M?ller" returns, for example, Miller and Moller</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148803" role="tablecontent" l10n="U" oldref="45">*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156138" role="tablecontent" l10n="U" oldref="46">for 0 or more arbitrary characters</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146135" role="tablecontent" l10n="U" oldref="47">"*-*" returns "ZIP-Drive" and "CD-ROM"</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155582" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="par_id3145762" role="paragraph" 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>
-<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>
-<paragraph role="tablehead" id="par_id3153705" xml-lang="en-US" l10n="U" oldref="68">Search with wildcard expression</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149209" xml-lang="en-US" l10n="U" oldref="69">Search with regular expressions</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151045" xml-lang="en-US" l10n="U" oldref="70">?</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150384" xml-lang="en-US" l10n="U" oldref="71">.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153793" xml-lang="en-US" l10n="U" oldref="72">*</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150428" xml-lang="en-US" l10n="U" oldref="73">.*</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
-<embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
-<embed href="text/shared/01/02100000.xhp#halbnormaltext"/>
-<embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
-<embed href="text/shared/01/02100000.xhp#aehnlichtext"/>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3147130" role="heading" level="2" l10n="U"
+ oldref="49">Regular expression</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" 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 xml-lang="en-US" id="par_id3154718" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="par_id3153705" role="tablehead" l10n="U" oldref="68">Search with wildcard expression</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149209" role="tablehead" l10n="U" oldref="69">Search with regular expressions</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151045" role="tablecontent" l10n="U" oldref="70">?</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150384" role="tablecontent" l10n="U" oldref="71">.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153793" role="tablecontent" l10n="U" oldref="72">*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150428" role="tablecontent" l10n="U" oldref="73">.*</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
+ <embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
+ <embed href="text/shared/01/02100000.xhp#halbnormaltext"/>
+ <embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
+ <embed href="text/shared/01/02100000.xhp#aehnlichtext"/>
+ <embed href="text/shared/01/02100000.xhp#aehnlichbutton"/>
+ <embed href="text/shared/optionen/01150200.xhp#asia"/>
+ <paragraph xml-lang="en-US" id="hd_id3150861" role="heading" level="2" l10n="U"
+ oldref="101">State</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154477" role="paragraph" 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 xml-lang="en-US" id="par_id3163720" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="hd_id3147389" role="heading" level="2" l10n="U"
+ oldref="51">Search / Cancel</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" 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>
-<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>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3145080" role="heading" level="2" l10n="U"
+ oldref="53">Close</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156166" role="paragraph" 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 xml-lang="en-US" id="par_id3151183" role="paragraph" 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>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/12110000.xhp b/helpcontent2/source/text/shared/02/12110000.xhp
index 0263216768..c835a135e0 100644
--- a/helpcontent2/source/text/shared/02/12110000.xhp
+++ b/helpcontent2/source/text/shared/02/12110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12110000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12120000.xhp b/helpcontent2/source/text/shared/02/12120000.xhp
index a8f1bfcac0..1ee9d126d9 100644
--- a/helpcontent2/source/text/shared/02/12120000.xhp
+++ b/helpcontent2/source/text/shared/02/12120000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12120000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12130000.xhp b/helpcontent2/source/text/shared/02/12130000.xhp
index 2275c7525f..41d370180c 100644
--- a/helpcontent2/source/text/shared/02/12130000.xhp
+++ b/helpcontent2/source/text/shared/02/12130000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12130000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/12140000.xhp b/helpcontent2/source/text/shared/02/12140000.xhp
index 9b44d8458b..ef08b06a09 100644
--- a/helpcontent2/source/text/shared/02/12140000.xhp
+++ b/helpcontent2/source/text/shared/02/12140000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 12140000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/13010000.xhp b/helpcontent2/source/text/shared/02/13010000.xhp
index 28f452b222..a91fe00d7e 100755
--- a/helpcontent2/source/text/shared/02/13010000.xhp
+++ b/helpcontent2/source/text/shared/02/13010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 13010000.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/13020000.xhp b/helpcontent2/source/text/shared/02/13020000.xhp
index 2bc26884c0..ad69f45dae 100644
--- a/helpcontent2/source/text/shared/02/13020000.xhp
+++ b/helpcontent2/source/text/shared/02/13020000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 13020000.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14010000.xhp b/helpcontent2/source/text/shared/02/14010000.xhp
index f9120ec222..77d64ecb0e 100644
--- a/helpcontent2/source/text/shared/02/14010000.xhp
+++ b/helpcontent2/source/text/shared/02/14010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14010000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
<section id="abfrage">
<bookmark xml-lang="en-US" branch="hid/SID_FM_EXECUTE" id="bm_id940934" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:SbaExecuteSql" id="bm_id3149495" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/12307" id="bm_id9750968" localize="false"/>
+<!-- removed HID 12307 -->
<paragraph role="heading" id="hd_id3156183" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/14010000.xhp" name="Run">Run Query</link></paragraph>
<paragraph role="paragraph" id="par_id3109850" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:SbaExecuteSql">Runs the SQL query and displays the query result.</ahelp> The <emph>Run Query</emph> function does not save the query.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/02/14020000.xhp b/helpcontent2/source/text/shared/02/14020000.xhp
index 42bd207bf1..164963140e 100644
--- a/helpcontent2/source/text/shared/02/14020000.xhp
+++ b/helpcontent2/source/text/shared/02/14020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14020000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14020100.xhp b/helpcontent2/source/text/shared/02/14020100.xhp
index b49029ba74..99d09c82c1 100644
--- a/helpcontent2/source/text/shared/02/14020100.xhp
+++ b/helpcontent2/source/text/shared/02/14020100.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14020100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,40 +27,43 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0214020100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Add Tables</title>
-<filename>/text/shared/02/14020100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-10T15:05:14">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0214020100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Add Tables</title>
+ <filename>/text/shared/02/14020100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154788"><bookmark_value>tables in databases; adding to queries</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_ADDTABLE" id="bm_id8385907" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_FM_ADDTABLE" id="bm_id8385907" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AddTable" id="bm_id3143284" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_JOINSH_ADDTAB_TABLELIST" id="bm_id3159224" localize="false"/>
-<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="1" l10n="U" oldref="1">Add Tables</paragraph>
-<paragraph role="paragraph" id="par_id3152821" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabellehinzufuegentext"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST" visibility="hidden">Specifies the tables to be inserted into the design window.</ahelp> In the<emph> Add Tables </emph>dialog, select the tables you need for your current task.
+<paragraph xml-lang="en-US" id="hd_id3154788" role="heading" level="1" l10n="U" oldref="1">Add Tables</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152821" role="paragraph" l10n="U" oldref="2"><variable id="tabellehinzufuegentext"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST" visibility="hidden">Specifies the tables to be inserted into the design window.</ahelp> In the<emph> Add Tables </emph>dialog, select the tables you need for your current task.
</variable> When creating a query or a new table presentation, select the corresponding table to which the query or table presentation should refer. When working with relational databases, select the tables between which you want to build relationships.</paragraph>
-<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="U" oldref="15">The inserted tables appear in a separate window in the query design or relational windows, along with a list of the fields contained in the table. You can determine the size and order of this window.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#tabellehinzu"/>
-</section>
-<paragraph role="heading" id="hd_id3154927" xml-lang="en-US" level="2" l10n="U" oldref="5">Table</paragraph>
-<paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="3" l10n="U" oldref="9">Table name</paragraph>
-<paragraph role="paragraph" id="par_id3156042" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST">Lists the available tables.</ahelp> To insert a table, select one from the list and click <emph>Add</emph>. You can also double-click the table name, and a window will be displayed containing the table fields at the top of the query design or the relational window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE" id="bm_id3155941" localize="false"/>
-<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="11">Add</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE">Inserts the currently selected table.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149760" role="paragraph" l10n="U" oldref="15">The inserted tables appear in a separate window in the query design or relational windows, along with a list of the fields contained in the table. You can determine the size and order of this window.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000450.xhp#tabellehinzu"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154927" role="heading" level="2" l10n="U" oldref="5">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES" id="bm_id0305200912070094" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id030520091208059" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows only tables.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES" id="bm_id0305200912074475" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0305200912080616" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shows only queries.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150713" role="heading" level="3" l10n="U" oldref="9">Table name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156042" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_JOINSH_ADDTAB_TABLELIST">Lists the available tables.</ahelp> To insert a table, select one from the list and click <emph>Add</emph>. You can also double-click the table name, and a window will be displayed containing the table fields at the top of the query design or the relational window.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE" id="bm_id3155941" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
+ oldref="11">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153683" role="paragraph" l10n="U" oldref="12"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_JOIN_TABADD_PB_ADDTABLE">Inserts the currently selected table.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_JOINSH_ADDTAB_CLOSE" id="bm_id3153311" localize="false"/>
-<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="13">Close</paragraph>
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_JOINSH_ADDTAB_CLOSE">Closes the <emph>Add Tables</emph> dialog.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153527" role="heading" level="2" l10n="U"
+ oldref="13">Close</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="U" oldref="14"><ahelp hid="HID_JOINSH_ADDTAB_CLOSE">Closes the <emph>Add Tables</emph> dialog.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/14020200.xhp b/helpcontent2/source/text/shared/02/14020200.xhp
index 592ff5b847..c46c88b2ff 100644
--- a/helpcontent2/source/text/shared/02/14020200.xhp
+++ b/helpcontent2/source/text/shared/02/14020200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14020200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14030000.xhp b/helpcontent2/source/text/shared/02/14030000.xhp
index e887adfff2..5da2dc8e1c 100644
--- a/helpcontent2/source/text/shared/02/14030000.xhp
+++ b/helpcontent2/source/text/shared/02/14030000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14030000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14040000.xhp b/helpcontent2/source/text/shared/02/14040000.xhp
index 9cc903a54e..253bbf6328 100644
--- a/helpcontent2/source/text/shared/02/14040000.xhp
+++ b/helpcontent2/source/text/shared/02/14040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14040000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14050000.xhp b/helpcontent2/source/text/shared/02/14050000.xhp
index 8df9b1689a..eacee49500 100644
--- a/helpcontent2/source/text/shared/02/14050000.xhp
+++ b/helpcontent2/source/text/shared/02/14050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14050000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14060000.xhp b/helpcontent2/source/text/shared/02/14060000.xhp
index d9829c8c83..1daff45803 100644
--- a/helpcontent2/source/text/shared/02/14060000.xhp
+++ b/helpcontent2/source/text/shared/02/14060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14060000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/14070000.xhp b/helpcontent2/source/text/shared/02/14070000.xhp
index ee40c40ab5..0244bf3695 100644
--- a/helpcontent2/source/text/shared/02/14070000.xhp
+++ b/helpcontent2/source/text/shared/02/14070000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 14070000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/18010000.xhp b/helpcontent2/source/text/shared/02/18010000.xhp
index d13ffb8d4d..09f06322df 100644
--- a/helpcontent2/source/text/shared/02/18010000.xhp
+++ b/helpcontent2/source/text/shared/02/18010000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 18010000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/18030000.xhp b/helpcontent2/source/text/shared/02/18030000.xhp
index 379998d6e9..de1f8f1be8 100644
--- a/helpcontent2/source/text/shared/02/18030000.xhp
+++ b/helpcontent2/source/text/shared/02/18030000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 18030000.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/19090000.xhp b/helpcontent2/source/text/shared/02/19090000.xhp
index ec8e91268d..1d26d700fc 100644
--- a/helpcontent2/source/text/shared/02/19090000.xhp
+++ b/helpcontent2/source/text/shared/02/19090000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 19090000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20020000.xhp b/helpcontent2/source/text/shared/02/20020000.xhp
index 850be4885d..d9e667b450 100644
--- a/helpcontent2/source/text/shared/02/20020000.xhp
+++ b/helpcontent2/source/text/shared/02/20020000.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 20020000.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,22 +27,18 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0220020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Current Page Style</title>
-<filename>/text/shared/02/20020000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-29T11:51:24">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="aktuelleseitenvorlage">
+ <topic id="textshared0220020000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Current Page Style</title>
+ <filename>/text/shared/02/20020000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="aktuelleseitenvorlage">
<bookmark xml-lang="en-US" branch="index" id="bm_id3083278"><bookmark_value>page styles;editing/applying with statusbar</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/FN_STAT_TEMPLATE" id="bm_id5848088" localize="false"/>
@@ -53,16 +47,16 @@
<bookmark xml-lang="en-US" branch="hid/.uno:StatusPageStyle" id="bm_id3154840" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_STATUS_LAYOUT" id="bm_id2005580" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:LayoutStatus" id="bm_id3155934" localize="false"/>
-<paragraph role="heading" id="hd_id3083278" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/20020000.xhp" name="Current Page Style">Current Page Style</link></paragraph>
-<paragraph role="paragraph" id="par_id3148731" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:LayoutStatus">Displays the current Page Style. Double-click to edit the style, right-click to select another style.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US" l10n="CHG" oldref="3"><switchinline select="appl"><caseinline select="WRITER">Double-click the<emph> Page Style field </emph>to open the <link href="text/swriter/01/05040000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page. In the context menu of this field, you can apply a Page Style.
+<paragraph xml-lang="en-US" id="hd_id3083278" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/20020000.xhp" name="Current Page Style">Current Page Style</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148731" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:LayoutStatus">Displays the current Page Style. Double-click to edit the style, right-click to select another style.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149283" role="paragraph" l10n="CHG" oldref="3"><switchinline select="appl"><caseinline select="WRITER">Double-click the<emph> Page Style field </emph>to open the <link href="text/swriter/01/05040000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page. In the context menu of this field, you can apply a Page Style.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="4"><switchinline select="appl"><caseinline select="CALC">Double-click the <emph>Page Style</emph> field to open the <link href="text/scalc/01/05070000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page.
+ <paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="U" oldref="4"><switchinline select="appl"><caseinline select="CALC">Double-click the <emph>Page Style</emph> field to open the <link href="text/scalc/01/05070000.xhp" name="Page Style">Page Style</link> dialog, in which you can edit the style for the current page.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="5"><switchinline select="appl"><caseinline select="IMPRESS">Double-click the<emph> Page Style </emph>field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Page Style</link> dialog in which you can select the style for the active page. You can select a different paper format or background.
+ <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="U" oldref="5"><switchinline select="appl"><caseinline select="IMPRESS">Double-click this field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Slide Design</link> dialog in which you can select the style for the current slide. You can select a different paper format or background.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="DRAW">Double-click the<emph> Page Style </emph>field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Page Style</link> dialog in which you select the style for the current page. You can select a different paper format or background.
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="DRAW">Double-click this field to open the <link href="text/simpress/01/05120000.xhp" name="Page Style">Slide Design</link> dialog in which you select the style for the current page. You can select a different paper format or background.
</caseinline></switchinline></paragraph>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/20030000.xhp b/helpcontent2/source/text/shared/02/20030000.xhp
index 748db9ef6b..f8aaa67d89 100644
--- a/helpcontent2/source/text/shared/02/20030000.xhp
+++ b/helpcontent2/source/text/shared/02/20030000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 20030000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20040000.xhp b/helpcontent2/source/text/shared/02/20040000.xhp
index a33473129f..2593488be0 100644
--- a/helpcontent2/source/text/shared/02/20040000.xhp
+++ b/helpcontent2/source/text/shared/02/20040000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 20040000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20050000.xhp b/helpcontent2/source/text/shared/02/20050000.xhp
index 397d6b02d4..770f55655f 100644
--- a/helpcontent2/source/text/shared/02/20050000.xhp
+++ b/helpcontent2/source/text/shared/02/20050000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 20050000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20060000.xhp b/helpcontent2/source/text/shared/02/20060000.xhp
index 71bbdb4056..edbc99323c 100644
--- a/helpcontent2/source/text/shared/02/20060000.xhp
+++ b/helpcontent2/source/text/shared/02/20060000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 20060000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/20090000.xhp b/helpcontent2/source/text/shared/02/20090000.xhp
index 2f2bf853a4..ccab10a4d1 100644
--- a/helpcontent2/source/text/shared/02/20090000.xhp
+++ b/helpcontent2/source/text/shared/02/20090000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 20090000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
<body>
- <bookmark xml-lang="en-US" branch="hid/SID_CURRENTTIME" id="bm_id5594664" localize="false"/><!-- HID added by script -->
+ <!-- removed HID SID_CURRENTTIME --><!-- HID added by script -->
<bookmark branch="hid/.uno:CurrentTime" xml-lang="en-US" id="bm_id3150620"/><paragraph id="hd_id3152823" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/20090000.xhp" name="Time">Time</link></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3151299" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CurrentTime" visibility="visible">Displays the current time.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/20100000.xhp b/helpcontent2/source/text/shared/02/20100000.xhp
index 9e4b6e83a9..f60f6511b9 100644
--- a/helpcontent2/source/text/shared/02/20100000.xhp
+++ b/helpcontent2/source/text/shared/02/20100000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 20100000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
<body>
- <bookmark xml-lang="en-US" branch="hid/SID_CURRENTDATE" id="bm_id2884865" localize="false"/><!-- HID added by script -->
+ <!-- removed HID SID_CURRENTDATE --><!-- HID added by script -->
<bookmark branch="hid/.uno:CurrentDate" xml-lang="en-US" id="bm_id3156045"/><paragraph id="hd_id3146902" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/20100000.xhp" name="Date">Date</link></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154926" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CurrentDate" visibility="visible">Displays the current date.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/24010000.xhp b/helpcontent2/source/text/shared/02/24010000.xhp
index 14bd7c2dd0..f8a3f26025 100644
--- a/helpcontent2/source/text/shared/02/24010000.xhp
+++ b/helpcontent2/source/text/shared/02/24010000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24010000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
</meta>
<body>
<section id="filter">
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFTBX_FILTERS" id="bm_id3154840" localize="false"/>
+<!-- removed HID SID_GRAFTBX_FILTERS -->
<bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterToolbox" id="bm_id3153255" localize="false"/>
<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/24010000.xhp" name="Graphic Filter Bar">Graphic Filter Bar</link></paragraph>
<paragraph role="paragraph" id="par_id3156183" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:GraphicFilterToolbox">This icon on the <emph>Picture</emph> bar opens the <emph>Graphic Filter</emph> bar, where you can use various filters on the selected picture.</ahelp></paragraph>
@@ -66,7 +63,7 @@
</table>
</section>
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_INVERT" id="bm_id3155941" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_INVERT -->
<bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_INVERT" id="bm_id6161795" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterInvert" id="bm_id3156426" localize="false"/>
<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="C">Invert</paragraph>
@@ -84,7 +81,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_SMOOTH" id="bm_id3156192" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_SMOOTH -->
<bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_SMOOTH" id="bm_id6076636" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterSmooth" id="bm_id3149578" localize="false"/>
<paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="2" l10n="C">Smooth</paragraph>
@@ -102,7 +99,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_SHARPEN" id="bm_id3153320" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_SHARPEN -->
<bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_SHARPEN" id="bm_id4973428" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterSharpen" id="bm_id3155449" localize="false"/>
<paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="2" l10n="C">Sharpen</paragraph>
@@ -120,7 +117,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_GRAFFILTER_REMOVENOISE" id="bm_id3147560" localize="false"/>
+<!-- removed HID SID_GRAFFILTER_REMOVENOISE -->
<bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_REMOVENOISE" id="bm_id4672819" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GraphicFilterRemoveNoise" id="bm_id3156435" localize="false"/>
<paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="2" l10n="C">Remove Noise</paragraph>
@@ -157,10 +154,10 @@
<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="76">Parameters</paragraph>
<paragraph role="paragraph" id="par_id3147352" xml-lang="en-US" l10n="U" oldref="77">Specifies the degree and type of solarization.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_MTR_THRESHOLD" id="bm_id3151353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD" id="bm_id3151353" localize="false"/>
<paragraph role="heading" id="hd_id3153370" xml-lang="en-US" level="3" l10n="U" oldref="78">Threshold Value</paragraph>
<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_MTR_THRESHOLD">Specifies the degree of brightness, in percent, above which the pixels are to be solarized.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_CBX_INVERT" id="bm_id3147318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT" id="bm_id3147318" localize="false"/>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="80">Invert</paragraph>
<paragraph role="paragraph" id="par_id3146921" xml-lang="en-US" l10n="CHG" oldref="81"><ahelp hid="SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_CBX_INVERT">Specifies to also invert all pixels.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_SEPIA" id="bm_id2629364" localize="false"/>
@@ -180,7 +177,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SEPIA_DLG_FILTERSEPIA_MTR_SEPIA" id="bm_id3151116" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA" id="bm_id3151116" localize="false"/>
<paragraph role="heading" id="hd_id3156443" xml-lang="en-US" level="3" l10n="U" oldref="84">Aging Degree</paragraph>
<paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_SEPIA_DLG_FILTERSEPIA_MTR_SEPIA">Defines the intensity of aging, in percent. At 0% you see the gray values of all pixels. At 100% only the red color channel remains.</ahelp><comment>ufi: cannot see any difference between 0% and 100% aging here...</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_POSTER" id="bm_id6359144" localize="false"/>
@@ -200,7 +197,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVX_GRFFILTER_DLG_POSTER_DLG_FILTERPOSTER_NUM_POSTER" id="bm_id3148878" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER" id="bm_id3148878" localize="false"/>
<paragraph role="heading" id="hd_id3156736" xml-lang="en-US" level="3" l10n="U" oldref="89">Poster Colors</paragraph>
<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="90"><ahelp hid="SVX_NUMERICFIELD_RID_SVX_GRFFILTER_DLG_POSTER_DLG_FILTERPOSTER_NUM_POSTER">Specifies the number of colors to which the image is to be reduced.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_GRFFILTER_POPART" id="bm_id5192722" localize="false"/>
@@ -275,13 +272,13 @@
<paragraph role="heading" id="hd_id3153922" xml-lang="en-US" level="3" l10n="U" oldref="106">Element resolution</paragraph>
<paragraph role="paragraph" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="107">Determines the number of pixels to be joined into rectangles.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_WIDTH" id="bm_id3145790" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH" id="bm_id3145790" localize="false"/>
<paragraph role="heading" id="hd_id3159336" xml-lang="en-US" level="3" l10n="U" oldref="108">Width</paragraph>
<paragraph role="paragraph" id="par_id3150939" xml-lang="en-US" l10n="U" oldref="109"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_WIDTH">Defines the width of the individual tiles.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_HEIGHT" id="bm_id3147131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT" id="bm_id3147131" localize="false"/>
<paragraph role="heading" id="hd_id3150827" xml-lang="en-US" level="3" l10n="U" oldref="110">Height</paragraph>
<paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="SVX_METRICFIELD_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_HEIGHT">Defines the height of the individual tiles.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_CBX_EDGES" id="bm_id3154573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES" id="bm_id3154573" localize="false"/>
<paragraph role="heading" id="hd_id3157972" xml-lang="en-US" level="3" l10n="U" oldref="121">Enhance edges</paragraph>
<paragraph role="paragraph" id="par_id3151216" xml-lang="en-US" l10n="U" oldref="122"><ahelp hid="SVX_CHECKBOX_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_CBX_EDGES">Enhances, or sharpens, the edges of the object.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/02/24020000.xhp b/helpcontent2/source/text/shared/02/24020000.xhp
index c1f93e3e6e..080e169841 100644
--- a/helpcontent2/source/text/shared/02/24020000.xhp
+++ b/helpcontent2/source/text/shared/02/24020000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24020000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24030000.xhp b/helpcontent2/source/text/shared/02/24030000.xhp
index f45672d9a3..2ae9b5ff66 100644
--- a/helpcontent2/source/text/shared/02/24030000.xhp
+++ b/helpcontent2/source/text/shared/02/24030000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24030000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24040000.xhp b/helpcontent2/source/text/shared/02/24040000.xhp
index 71e02a903e..3bf60938e9 100644
--- a/helpcontent2/source/text/shared/02/24040000.xhp
+++ b/helpcontent2/source/text/shared/02/24040000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24040000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24050000.xhp b/helpcontent2/source/text/shared/02/24050000.xhp
index 3ad8758c97..6d6817b70b 100644
--- a/helpcontent2/source/text/shared/02/24050000.xhp
+++ b/helpcontent2/source/text/shared/02/24050000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24050000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24060000.xhp b/helpcontent2/source/text/shared/02/24060000.xhp
index 410dc42f16..2b7546f4a3 100644
--- a/helpcontent2/source/text/shared/02/24060000.xhp
+++ b/helpcontent2/source/text/shared/02/24060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24060000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24070000.xhp b/helpcontent2/source/text/shared/02/24070000.xhp
index 93eee4e35f..a97f6bc36d 100644
--- a/helpcontent2/source/text/shared/02/24070000.xhp
+++ b/helpcontent2/source/text/shared/02/24070000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24070000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24080000.xhp b/helpcontent2/source/text/shared/02/24080000.xhp
index 326e9fbab2..598c9fd41c 100644
--- a/helpcontent2/source/text/shared/02/24080000.xhp
+++ b/helpcontent2/source/text/shared/02/24080000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24080000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24090000.xhp b/helpcontent2/source/text/shared/02/24090000.xhp
index 5d2a9badbe..a206fda9a2 100644
--- a/helpcontent2/source/text/shared/02/24090000.xhp
+++ b/helpcontent2/source/text/shared/02/24090000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24090000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/24100000.xhp b/helpcontent2/source/text/shared/02/24100000.xhp
index 1c864313c4..e25adbf071 100644
--- a/helpcontent2/source/text/shared/02/24100000.xhp
+++ b/helpcontent2/source/text/shared/02/24100000.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 24100000.xhp,v $
- *
- * $Revision: 1.6.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/basicshapes.xhp b/helpcontent2/source/text/shared/02/basicshapes.xhp
index 7dd7844728..1aa9b0178e 100644
--- a/helpcontent2/source/text/shared/02/basicshapes.xhp
+++ b/helpcontent2/source/text/shared/02/basicshapes.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: basicshapes.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/blockarrows.xhp b/helpcontent2/source/text/shared/02/blockarrows.xhp
index 0bee68f501..52d6f61665 100644
--- a/helpcontent2/source/text/shared/02/blockarrows.xhp
+++ b/helpcontent2/source/text/shared/02/blockarrows.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: blockarrows.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/callouts.xhp b/helpcontent2/source/text/shared/02/callouts.xhp
index cdb4298224..0a72393e00 100644
--- a/helpcontent2/source/text/shared/02/callouts.xhp
+++ b/helpcontent2/source/text/shared/02/callouts.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: callouts.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/colortoolbar.xhp b/helpcontent2/source/text/shared/02/colortoolbar.xhp
index 470007dd21..848abad730 100755
--- a/helpcontent2/source/text/shared/02/colortoolbar.xhp
+++ b/helpcontent2/source/text/shared/02/colortoolbar.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: colortoolbar.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/flowcharts.xhp b/helpcontent2/source/text/shared/02/flowcharts.xhp
index f1f34aa4ee..43130a0157 100644
--- a/helpcontent2/source/text/shared/02/flowcharts.xhp
+++ b/helpcontent2/source/text/shared/02/flowcharts.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: flowcharts.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/fontwork.xhp b/helpcontent2/source/text/shared/02/fontwork.xhp
index e5a0d5d73e..befc720f87 100644
--- a/helpcontent2/source/text/shared/02/fontwork.xhp
+++ b/helpcontent2/source/text/shared/02/fontwork.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: fontwork.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/makefile.mk b/helpcontent2/source/text/shared/02/makefile.mk
index 73c361ee7c..52463f6be3 100644
--- a/helpcontent2/source/text/shared/02/makefile.mk
+++ b/helpcontent2/source/text/shared/02/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -197,4 +193,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/02/more_controls.xhp b/helpcontent2/source/text/shared/02/more_controls.xhp
index b7420ce9c4..bf050a937c 100644
--- a/helpcontent2/source/text/shared/02/more_controls.xhp
+++ b/helpcontent2/source/text/shared/02/more_controls.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: more_controls.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/paintbrush.xhp b/helpcontent2/source/text/shared/02/paintbrush.xhp
index 57ac1e1dd8..bd7f629612 100755
--- a/helpcontent2/source/text/shared/02/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/02/paintbrush.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
<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.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">Icon</alt>
</image> on the <emph>Standard</emph> toolbar. </paragraph>
</section>
<section id="sypaintbrush">
@@ -56,7 +53,7 @@
<tablerow>
<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.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</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">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/02/stars.xhp b/helpcontent2/source/text/shared/02/stars.xhp
index 3ee781c658..663befa35e 100644
--- a/helpcontent2/source/text/shared/02/stars.xhp
+++ b/helpcontent2/source/text/shared/02/stars.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: stars.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/02/symbolshapes.xhp b/helpcontent2/source/text/shared/02/symbolshapes.xhp
index 4a6a75f968..8b6f641433 100644
--- a/helpcontent2/source/text/shared/02/symbolshapes.xhp
+++ b/helpcontent2/source/text/shared/02/symbolshapes.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: symbolshapes.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index 5f7dfe45ce..56b326df25 100755
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.12.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,1006 +32,1023 @@
<meta>
-<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>
-</meta>
-<body>
-<section id="allgemeine">
+ <topic id="textshared0401010000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">General Shortcut Keys in $[officename]</title>
+ <filename>/text/shared/04/01010000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="allgemeine">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149991"><bookmark_value>keyboard;general commands</bookmark_value>
-<bookmark_value>shortcut keys;general</bookmark_value>
-<bookmark_value>text input fields</bookmark_value>
-<bookmark_value>AutoComplete function in text and list boxes</bookmark_value>
-<bookmark_value>macros; interrupting</bookmark_value>
+ <bookmark_value>shortcut keys;general</bookmark_value>
+ <bookmark_value>text input fields</bookmark_value>
+ <bookmark_value>AutoComplete function in text and list boxes</bookmark_value>
+ <bookmark_value>macros; interrupting</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3149991" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="common_keys"><link href="text/shared/04/01010000.xhp" name="General Shortcut Keys in $[officename]">General Shortcut Keys in $[officename]</link>
+<paragraph xml-lang="en-US" id="hd_id3149991" role="heading" level="1" l10n="U" oldref="1"><variable id="common_keys"><link href="text/shared/04/01010000.xhp" name="General Shortcut Keys in $[officename]">General Shortcut Keys in $[officename]</link>
</variable></paragraph>
-</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
+ </section>
+ <embed href="text/shared/00/00000099.xhp#keys"/>
+ <paragraph xml-lang="en-US" id="hd_id3150702" role="heading" level="2" l10n="U" oldref="3">Using Shortcut Keys</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151299" role="paragraph" 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">
+ <paragraph xml-lang="en-US" id="par_id3153894" role="paragraph" 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 xml-lang="en-US" id="hd_id3154186" role="heading" level="2" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Calling Menus With Shortcut Keys</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">
+ <paragraph xml-lang="en-US" id="par_id3152425" role="paragraph" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Some of the characters shown on the menu bar are underlined. You can access these menus directly by pressing the underlined character together with the ALT key. Once the menu is opened, you will again find underlined characters. You can access these menu items directly by simply pressing the underlined character key.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="2" l10n="U" oldref="9">Using Shortcut Keys to Control Dialogs</paragraph>
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="10">There is always one element highlighted in any given dialog - usually shown by a broken frame. This element, which can be either a button, an option field, an entry in a list box or a check box, is said to have the focus on it. If the focal point is a button, pressing Enter runs it as if you had clicked it. A check box is toggled by pressing the spacebar. If an option field has the focus, use the arrow keys to change the activated option field in that area. Use the Tab key to go from one element or area to the next one, use Shift + Tab to go in the reverse direction.</paragraph>
-<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">
+ <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="2" l10n="U" oldref="9">Using Shortcut Keys to Control Dialogs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="U" oldref="10">There is always one element highlighted in any given dialog - usually shown by a broken frame. This element, which can be either a button, an option field, an entry in a list box or a check box, is said to have the focus on it. If the focal point is a button, pressing Enter runs it as if you had clicked it. A check box is toggled by pressing the spacebar. If an option field has the focus, use the arrow keys to change the activated option field in that area. Use the Tab key to go from one element or area to the next one, use Shift + Tab to go in the reverse direction.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" 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
+ <paragraph xml-lang="en-US" id="hd_id3147209" role="heading" level="2" l10n="U"
+ oldref="105">Shortcut Keys for Mouse Actions</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" 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="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 xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
+ oldref="127">Practical Text Input Fields</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145673" role="listitem" l10n="U" oldref="129">You can open a context menu, which contains some of the most often-used commands.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150085" role="listitem" 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
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153088" role="listitem" 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>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="132">Double-click a word to select it.</paragraph>
-</listitem>
-<listitem>
-<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
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="132">Double-click a word to select it.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149785" role="listitem" 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 xml-lang="en-US" id="par_id3150976" role="listitem" 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
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147264" role="listitem" 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>
-<paragraph role="listitem" id="par_id3154346" xml-lang="en-US" l10n="U" oldref="136">INSRT is used to switch between the insert mode and the overwrite mode and back again.</paragraph>
-</listitem>
-<listitem>
-<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
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154346" role="listitem" l10n="U" oldref="136">INSRT is used to switch between the insert mode and the overwrite mode and back again.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148757" role="listitem" l10n="U" oldref="137">Drag-and-drop can be used within and outside of a text box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150358" role="listitem" 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="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
+ </listitem>
+ </list>
+ <section id="autocompurl">
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153968" role="listitem" 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>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="CHG" oldref="140">Use the down arrow key to scroll through the other files and directories. Use the right arrow key to also display an existing subdirectory in the URL field. Quick AutoComplete is available if you press the End key after entering part of the URL. Once you find the document or directory you want, press Enter.</paragraph>
-</listitem>
-</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
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3144760" role="listitem" l10n="CHG" oldref="140">Use the down arrow key to scroll through the other files and directories. Use the right arrow key to also display an existing subdirectory in the URL field. Quick AutoComplete is available if you press the End key after entering part of the URL. Once you find the document or directory you want, press Enter.</paragraph>
+ </listitem>
+ </list>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="2" l10n="U"
+ oldref="163">Interrupting Macros</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" 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.)
+ <paragraph xml-lang="en-US" id="hd_id3154123" role="heading" level="2" l10n="U"
+ oldref="12">List of General Shortcut Keys in $[officename]</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" 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>
-<paragraph role="tablehead" id="hd_id3153367" xml-lang="en-US" l10n="U" oldref="14">Shortcut Keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="15">
+ <table id="tbl_id3555101">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153367" role="tablehead" l10n="U" oldref="14">Shortcut Keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156060" role="tablehead" l10n="U" oldref="15">
<emph>Effect</emph>
</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149260" xml-lang="en-US" l10n="U" oldref="16">Enter key</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3153142" xml-lang="en-US" l10n="U" oldref="18">Esc</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3151118" xml-lang="en-US" l10n="U" oldref="20">Spacebar</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3152791" xml-lang="en-US" l10n="U" oldref="22">Arrow keys</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3154188" xml-lang="en-US" l10n="U" oldref="24">Tab</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3153363" xml-lang="en-US" l10n="U" oldref="26">Shift + Tab</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3147317" xml-lang="en-US" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149260" role="tablecontent" l10n="U" oldref="16">Enter key</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153727" role="tablecontent" l10n="U" oldref="17">Activates the focused button in a dialog</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153142" role="tablecontent" l10n="U" oldref="18">Esc</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155412" role="tablecontent" l10n="U" oldref="19">Terminates the action or dialog. If in $[officename] Help: goes up one level.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3151118" role="tablecontent" l10n="U" oldref="20">Spacebar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147435" role="tablecontent" l10n="U" oldref="21">Toggles the focused check box in a dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3152791" role="tablecontent" l10n="U" oldref="22">Arrow keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151113" role="tablecontent" l10n="U" oldref="23">Changes the active control field in an option section of a dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154188" role="tablecontent" l10n="U" oldref="24">Tab</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="tablecontent" l10n="U" oldref="25">Advances focus to the next section or element in a dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153363" role="tablecontent" l10n="U" oldref="26">Shift + Tab</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149665" role="tablecontent" l10n="U" oldref="27">Moves the focus to the previous section or element in a dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147317" role="tablecontent" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3159348" xml-lang="en-US" l10n="U" oldref="172">Del</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3149379" xml-lang="en-US" l10n="U" oldref="174">Shift+Del</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3154792" xml-lang="en-US" l10n="U" oldref="176">Backspace</paragraph>
-</tablecell>
-<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>
-<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>
-<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>
-<paragraph role="tablecontent" id="hd_id3149488" xml-lang="en-US" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153224" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="hd_id3159348" role="tablecontent" l10n="U" oldref="172">Del</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144765" role="tablecontent" l10n="U" oldref="171">Deletes the selected item(s) into the recycle bin.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149379" role="tablecontent" l10n="U" oldref="174">Shift+Del</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149412" role="tablecontent" l10n="U" oldref="173">Deletes the selected item(s) without putting them in the recycle bin.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154792" role="tablecontent" l10n="U" oldref="176">Backspace</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149582" role="tablecontent" l10n="U" oldref="175">When a folder is shown: goes up one level (goes back)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10BC0" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Control</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10BE8" role="tablecontent" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149488" role="tablecontent" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3148573" xml-lang="en-US" l10n="U" oldref="289">Enter (if an OLE object is selected)</paragraph>
-</tablecell>
-<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>
-<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>
-<paragraph role="tablecontent" id="par_id3153839" xml-lang="en-US" l10n="U" oldref="291">Activates text input mode.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156437" xml-lang="en-US" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149912" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="hd_id3148573" role="tablecontent" l10n="U" oldref="289">Enter (if an OLE object is selected)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154162" role="tablecontent" l10n="U" oldref="288">Activates the selected OLE object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3146990" role="tablecontent" l10n="U" oldref="290">Enter (if a drawing object or text object is selected)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153839" role="tablecontent" l10n="U" oldref="291">Activates text input mode.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3156437" role="tablecontent" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="29">Opens a document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155064" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149123" role="tablecontent" l10n="U" oldref="29">Opens a document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3155064" role="tablecontent" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="31">Saves the current document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156377" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150749" role="tablecontent" l10n="U" oldref="31">Saves the current document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3156377" role="tablecontent" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="33">Creates a new document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3151357" xml-lang="en-US" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155764" role="tablecontent" l10n="U" oldref="33">Creates a new document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3151357" role="tablecontent" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3150043" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148408" role="tablecontent" l10n="U" oldref="177">Opens <emph>Templates and Documents</emph> dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3150043" role="tablecontent" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="35">Prints document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149258" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147100" role="tablecontent" l10n="U" oldref="35">Prints document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149258" role="tablecontent" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="114">Exits application.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153538" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153966" role="tablecontent" l10n="U" oldref="114">Exits application.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153538" role="tablecontent" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3155904" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166450" role="tablecontent" l10n="U" oldref="37">Cuts out the selected elements.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3155904" role="tablecontent" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148537" xml-lang="en-US" l10n="U" oldref="39">Copies the selected items.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156318" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148537" role="tablecontent" l10n="U" oldref="39">Copies the selected items.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3156318" role="tablecontent" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="41">Pastes from the clipboard.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147005" role="tablecontent" l10n="U" oldref="41">Pastes from the clipboard.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id071620091225295" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+V</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0716200912253022" role="tablecontent" l10n="NEW">Pastes unformatted text from the clipboard. The text is pasted using the format that exists at the insertion point.<comment>CWS mox01</comment></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10F47" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+V</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3153789" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10F4B" role="tablecontent" l10n="NEW">Opens the <emph>Paste Special</emph> dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153789" role="tablecontent" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155581" xml-lang="en-US" l10n="U" oldref="43">Selects all.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149738" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155581" role="tablecontent" l10n="U" oldref="43">Selects all.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149738" role="tablecontent" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45">Undoes last action.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<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>
-<paragraph role="tablecontent" id="par_id3150345" xml-lang="en-US" l10n="U" oldref="352">Redoes last action.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7297280" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149816" role="tablecontent" l10n="U" oldref="45">Undoes last action.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147095" role="tablecontent" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command+Shift+Z</caseinline><defaultinline>Ctrl+Y</defaultinline></switchinline></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150345" role="tablecontent" l10n="U" oldref="352">Redoes last action.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id7297280" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Y</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3158414" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id8709677" role="tablecontent" l10n="NEW">Repeats last command.<comment>[framework-features] new/SRC680_m221 : Shortcut for "Repeat"</comment></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3158414" role="tablecontent" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3148800" xml-lang="en-US" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150090" role="tablecontent" l10n="U" oldref="166">Calls the <emph>Find &amp; Replace</emph> dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3148800" role="tablecontent" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3154198" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="MAC">
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149527" role="tablecontent" l10n="U" oldref="168">Searches for the last entered search term.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154198" role="tablecontent" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Ctrl+Shift+J</defaultinline></switchinline></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150567" xml-lang="en-US" l10n="CHG" oldref="49"><switchinline select="sys"><caseinline select="MAC">
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150567" role="tablecontent" 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>
-<paragraph role="tablecontent" id="hd_id3151049" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3151049" role="tablecontent" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+R</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148462" xml-lang="en-US" l10n="U" oldref="51">Redraws the document view.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149035" xml-lang="en-US" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148462" role="tablecontent" l10n="U" oldref="51">Redraws the document view.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149035" role="tablecontent" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3145588" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150665" role="tablecontent" l10n="CHG" oldref="350">Enable or disable the selection cursor in read-only text.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3145588" role="tablecontent" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3166428" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148753" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="hd_id3166428" role="tablecontent" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+B</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3154815" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150490" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="hd_id3154815" role="tablecontent" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
-</tablecell>
-<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>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153228" role="tablecontent" 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.
+ <paragraph xml-lang="en-US" id="hd_id3152891" role="heading" level="2" l10n="U"
+ oldref="60">Shortcut Keys Using the Function Keys</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152457" role="paragraph" 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>
-<paragraph role="tablehead" id="hd_id3149726" xml-lang="en-US" l10n="U" oldref="183">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3153756" xml-lang="en-US" l10n="U" oldref="184">
+ <table id="tbl_id1489608">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149726" role="tablehead" l10n="U" oldref="183">Shortcut keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153756" role="tablehead" l10n="U" oldref="184">
<emph>Effect</emph>
</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149404" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149404" role="tablecontent" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>F1</defaultinline></switchinline></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145410" role="tablecontent" 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>
-<paragraph role="tablecontent" id="hd_id3154951" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">
+ <paragraph xml-lang="en-US" id="par_id3153697" role="tablecontent" l10n="U" oldref="152">In the $[officename] Help: jumps to main help page.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154951" role="tablecontent" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Shift + F1</defaultinline></switchinline></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153309" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153309" role="tablecontent" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Context Help</defaultinline></switchinline></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3159220" xml-lang="en-US" l10n="U" oldref="292">Shift+F2</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3159220" role="tablecontent" l10n="U" oldref="292">Shift+F2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151241" role="tablecontent" l10n="U" oldref="293">Turns on Extended Tips for the currently selected command, icon or control.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3146871" role="tablecontent" 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>
-<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>
-<paragraph role="tablecontent" id="hd_id3154532" xml-lang="en-US" l10n="U" oldref="180">F6</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3144771" xml-lang="en-US" l10n="U" oldref="182">Shift+F6</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3156191" xml-lang="en-US" l10n="U" oldref="294">F10</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3159093" xml-lang="en-US" l10n="U" oldref="146">Shift+F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148606" xml-lang="en-US" l10n="U" oldref="147">Opens the context menu.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157978" role="tablecontent" l10n="U" oldref="69">Closes the current document (close $[officename] when the last open document is closed)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154532" role="tablecontent" l10n="U" oldref="180">F6</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144506" role="tablecontent" l10n="U" oldref="179">Sets focus in next subwindow (for example, document/data source view)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3144771" role="tablecontent" l10n="U" oldref="182">Shift+F6</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147075" role="tablecontent" l10n="U" oldref="181">Sets focus in previous subwindow.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3156191" role="tablecontent" l10n="U" oldref="294">F10</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156172" role="tablecontent" l10n="U" oldref="295">Activates the first menu (File menu)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3159093" role="tablecontent" l10n="U" oldref="146">Shift+F10</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148606" role="tablecontent" l10n="U" oldref="147">Opens the context menu.</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>
-<paragraph role="tablehead" id="hd_id3156308" xml-lang="en-US" l10n="U" oldref="286">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149440" xml-lang="en-US" l10n="U" oldref="285">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149971" xml-lang="en-US" l10n="U" oldref="284">Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153110" xml-lang="en-US" l10n="U" oldref="283">Moves between areas.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148971" xml-lang="en-US" l10n="U" oldref="282">Shift+Tab</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154059" xml-lang="en-US" l10n="U" oldref="281">Moves between areas (backwards)</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3153288" role="heading" level="2" l10n="U"
+ oldref="287">Shortcut keys in the Gallery</paragraph>
+ <table id="tbl_id310678">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3156308" role="tablehead" l10n="U" oldref="286">Shortcut keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149440" role="tablehead" l10n="U" oldref="285">Result</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149971" role="tablecontent" l10n="U" oldref="284">Tab</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153110" role="tablecontent" l10n="U" oldref="283">Moves between areas.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3148971" role="tablecontent" l10n="U" oldref="282">Shift+Tab</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154059" role="tablecontent" 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>
-<paragraph role="tablehead" id="par_idN11555" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN1155B" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3159192" xml-lang="en-US" l10n="U" oldref="279">Up arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3150892" xml-lang="en-US" l10n="U" oldref="277">Down arrow</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3151004" xml-lang="en-US" l10n="U" oldref="276">Moves the selection down.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153976" xml-lang="en-US" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3152368" role="heading" level="2" l10n="U"
+ oldref="280">Shortcut keys in the New Theme area of the Gallery:</paragraph>
+ <table id="tbl_id8934598">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN11555" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1155B" role="tablehead" l10n="NEW">Result</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3159192" role="tablecontent" l10n="U" oldref="279">Up arrow</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152540" role="tablecontent" l10n="U" oldref="278">Moves the selection up one.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3150892" role="tablecontent" l10n="U" oldref="277">Down arrow</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151004" role="tablecontent" l10n="U" oldref="276">Moves the selection down.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153976" role="tablecontent" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="274">Opens the Properties dialog.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3148652" xml-lang="en-US" l10n="U" oldref="273">Shift+F10</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153250" xml-lang="en-US" l10n="U" oldref="272">Opens a context menu.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155614" xml-lang="en-US" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146894" role="tablecontent" l10n="U" oldref="274">Opens the Properties dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3148652" role="tablecontent" l10n="U" oldref="273">Shift+F10</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153250" role="tablecontent" l10n="U" oldref="272">Opens a context menu.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3155614" role="tablecontent" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150099" xml-lang="en-US" l10n="U" oldref="270">Refreshes the selected theme.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3145755" xml-lang="en-US" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150099" role="tablecontent" l10n="U" oldref="270">Refreshes the selected theme.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3145755" role="tablecontent" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+R</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3154642" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146776" role="tablecontent" l10n="U" oldref="268">Opens the <emph>Enter Title</emph> dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154642" role="tablecontent" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153653" xml-lang="en-US" l10n="U" oldref="266">Deletes the selected theme.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3155946" xml-lang="en-US" l10n="U" oldref="265">Insert</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145372" xml-lang="en-US" l10n="U" oldref="264">Inserts a new theme</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153653" role="tablecontent" l10n="U" oldref="266">Deletes the selected theme.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3155946" role="tablecontent" l10n="U" oldref="265">Insert</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145372" role="tablecontent" 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>
-<paragraph role="tablehead" id="par_idN116D6" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN116DC" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149343" xml-lang="en-US" l10n="U" oldref="262">Home</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3148809" xml-lang="en-US" l10n="U" oldref="260">End</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3149382" xml-lang="en-US" l10n="U" oldref="258">Left Arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3152926" xml-lang="en-US" l10n="U" oldref="256">Right Arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3150776" xml-lang="en-US" l10n="U" oldref="254">Up Arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3147517" xml-lang="en-US" l10n="U" oldref="252">Down Arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3145602" xml-lang="en-US" l10n="U" oldref="250">Page Up</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147081" xml-lang="en-US" l10n="U" oldref="249">Scroll up one screen.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153045" xml-lang="en-US" l10n="U" oldref="355">Page Down</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3150411" xml-lang="en-US" l10n="U" oldref="248">Scroll down one screen.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147278" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="hd_id3150633" role="heading" level="2" l10n="U"
+ oldref="263">Shortcut keys in the Gallery preview area:</paragraph>
+ <table id="tbl_id9288308">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN116D6" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN116DC" role="tablehead" l10n="NEW">Result</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149343" role="tablecontent" l10n="U" oldref="262">Home</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153241" role="tablecontent" l10n="U" oldref="261">Jumps to the first entry.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3148809" role="tablecontent" l10n="U" oldref="260">End</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148902" role="tablecontent" l10n="U" oldref="259">Jumps to the last entry.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149382" role="tablecontent" l10n="U" oldref="258">Left Arrow</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150048" role="tablecontent" l10n="U" oldref="257">Selects the next Gallery element on the left.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3152926" role="tablecontent" l10n="U" oldref="256">Right Arrow</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153802" role="tablecontent" l10n="U" oldref="255">Selects the next Gallery element on the right.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3150776" role="tablecontent" l10n="U" oldref="254">Up Arrow</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149800" role="tablecontent" l10n="U" oldref="253">Selects the next Gallery element above.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147517" role="tablecontent" l10n="U" oldref="252">Down Arrow</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151223" role="tablecontent" l10n="U" oldref="251">Selects the next Gallery element below.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3145602" role="tablecontent" l10n="U" oldref="250">Page Up</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147081" role="tablecontent" l10n="U" oldref="249">Scroll up one screen.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153045" role="tablecontent" l10n="U" oldref="355">Page Down</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150411" role="tablecontent" l10n="U" oldref="248">Scroll down one screen.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147278" role="tablecontent" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Insert</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3155345" xml-lang="en-US" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153614" role="tablecontent" l10n="U" oldref="245">Inserts the selected object as a linked object into the current document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3155345" role="tablecontent" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3143278" xml-lang="en-US" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153608" role="tablecontent" l10n="U" oldref="243">Inserts a copy of the selected object into the current document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3143278" role="tablecontent" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+T</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3145114" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156370" role="tablecontent" l10n="U" oldref="241">Opens the <emph>Enter Title</emph> dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3145114" role="tablecontent" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3147552" xml-lang="en-US" l10n="U" oldref="238">Spacebar</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3148978" xml-lang="en-US" l10n="U" oldref="236">Enter</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3154108" xml-lang="en-US" l10n="U" oldref="234">Step backward (only in object view)</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3153294" xml-lang="en-US" l10n="U" oldref="233">Switches back to main overview.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146107" role="tablecontent" l10n="U" oldref="239">Switches between themes view and object view.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147552" role="tablecontent" l10n="U" oldref="238">Spacebar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145324" role="tablecontent" l10n="U" oldref="237">Switches between themes view and object view.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3148978" role="tablecontent" l10n="U" oldref="236">Enter</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155743" role="tablecontent" l10n="U" oldref="235">Switches between themes view and object view.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154108" role="tablecontent" l10n="U" oldref="234">Step backward (only in object view)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153294" role="tablecontent" 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>
-<paragraph role="tablehead" id="par_idN11906" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN1190C" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3150963" xml-lang="en-US" l10n="U" oldref="331">Spacebar</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3149787" xml-lang="en-US" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
+ <section id="dbtable">
+ <paragraph xml-lang="en-US" id="hd_id3149722" role="heading" level="2" l10n="CHG"
+ oldref="330">Selecting Rows and Columns in a Database Table (opened by F4)</paragraph>
+ <table id="tbl_id1178319">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN11906" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1190C" role="tablehead" l10n="NEW">Result</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3150963" role="tablecontent" l10n="U" oldref="331">Spacebar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146883" role="tablecontent" l10n="U" oldref="332">Toggles row selection, except when the row is in edit mode.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149787" role="tablecontent" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149028" xml-lang="en-US" l10n="U" oldref="334">Toggles row selection</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3147482" xml-lang="en-US" l10n="U" oldref="335">Shift+spacebar</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149319" xml-lang="en-US" l10n="U" oldref="336">Selects the current column</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1418805" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149028" role="tablecontent" l10n="U" oldref="334">Toggles row selection</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147482" role="tablecontent" l10n="U" oldref="335">Shift+spacebar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149319" role="tablecontent" l10n="U" oldref="336">Selects the current column</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1418805" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgUp</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id1743522" xml-lang="en-US" l10n="NEW">Moves pointer to the first row</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id5994140" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1743522" role="tablecontent" l10n="NEW">Moves pointer to the first row</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id5994140" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgDn</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id7870113" xml-lang="en-US" l10n="NEW">Moves pointer to the last row</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id7870113" role="tablecontent" 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>
-<paragraph role="tablehead" id="par_idN1199F" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN119A5" xml-lang="en-US" l10n="NEW">Result</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<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
+ </section>
+ <section id="zeichenobjekte">
+ <paragraph xml-lang="en-US" id="hd_id3147411" role="heading" level="2" l10n="U"
+ oldref="230">Shortcut Keys for Drawing Objects</paragraph>
+ <table id="tbl_id1152073">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1199F" role="tablehead" l10n="NEW">Shortcut keys</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN119A5" role="tablehead" l10n="NEW">Result</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149684" role="tablecontent" 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>
-<paragraph role="tablecontent" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="228">Inserts a Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<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
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155994" role="tablecontent" l10n="U" oldref="228">Inserts a Drawing Object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3150264" role="tablecontent" 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>
-<paragraph role="tablecontent" id="par_id3154055" xml-lang="en-US" l10n="U" oldref="226">Selects a Drawing Object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3149242" xml-lang="en-US" l10n="U" oldref="225">Tab</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3149349" xml-lang="en-US" l10n="U" oldref="223">Shift+Tab</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3109846" xml-lang="en-US" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154055" role="tablecontent" l10n="U" oldref="226">Selects a Drawing Object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149242" role="tablecontent" l10n="U" oldref="225">Tab</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157902" role="tablecontent" l10n="U" oldref="224">Selects the next Drawing Object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3149349" role="tablecontent" l10n="U" oldref="223">Shift+Tab</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150836" role="tablecontent" l10n="U" oldref="222">Selects the previous Drawing Object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3109846" role="tablecontent" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3145829" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154276" role="tablecontent" l10n="U" oldref="220">Selects the first Drawing Object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3145829" role="tablecontent" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3153099" xml-lang="en-US" l10n="U" oldref="217">Esc</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3149009" xml-lang="en-US" l10n="U" oldref="216">Ends Drawing Object selection.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3156271" xml-lang="en-US" l10n="U" oldref="338">Esc (in Handle Selection Mode)</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3151258" xml-lang="en-US" l10n="U" oldref="192">Up/down/left/right arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3146874" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3161664" role="tablecontent" l10n="U" oldref="218">Selects the last Drawing Object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153099" role="tablecontent" l10n="U" oldref="217">Esc</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149009" role="tablecontent" l10n="U" oldref="216">Ends Drawing Object selection.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3156271" role="tablecontent" l10n="U" oldref="338">Esc (in Handle Selection Mode)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152818" role="tablecontent" l10n="U" oldref="339">Exit Handle Selection Mode and return to Object Selection Mode.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3151258" role="tablecontent" l10n="U" oldref="192">Up/down/left/right arrow</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159162" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="hd_id3146874" role="tablecontent" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up/Down/Left/Right Arrow</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_id3159244" xml-lang="en-US" l10n="U" oldref="209">Opens the properties dialog for a Drawing Object.</paragraph>
-<paragraph role="tablecontent" id="par_id3150763" xml-lang="en-US" l10n="U" oldref="208">Activates the Point Selection mode for the selected drawing object.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="hd_id3153580" xml-lang="en-US" l10n="U" oldref="207">Spacebar</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3148624" xml-lang="en-US" l10n="U" oldref="204">Shift+spacebar</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3147424" xml-lang="en-US" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144422" role="tablecontent" l10n="U" oldref="212">Moves the selected Drawing Object one pixel (in Selection Mode)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153386" role="tablecontent" l10n="U" oldref="211">Re-sizes a Drawing Object (in Handle Selection Mode)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145306" role="tablecontent" l10n="U" oldref="210">Rotates a Drawing Object (in Rotation Mode)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159244" role="tablecontent" l10n="U" oldref="209">Opens the properties dialog for a Drawing Object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150763" role="tablecontent" l10n="U" oldref="208">Activates the Point Selection mode for the selected drawing object.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3153580" role="tablecontent" l10n="U" oldref="207">Spacebar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153053" role="tablecontent" l10n="U" oldref="206">Select a point of a drawing object (in Point Selection mode) / Cancel selection.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145629" role="tablecontent" l10n="U" oldref="205">The selected point blinks once per second.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3148624" role="tablecontent" l10n="U" oldref="204">Shift+spacebar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154842" role="tablecontent" l10n="U" oldref="203">Select an additional point in Point Selection mode.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147424" role="tablecontent" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3147233" xml-lang="en-US" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152955" role="tablecontent" l10n="U" oldref="201">Select the next point of the drawing object (Point Selection mode)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149753" role="tablecontent" l10n="U" oldref="200">In Rotation mode, the center of rotation can also be selected.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3147233" role="tablecontent" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3150933" xml-lang="en-US" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151296" role="tablecontent" l10n="U" oldref="198">Select the previous point of the drawing object (Point Selection mode)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3150933" role="tablecontent" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145662" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="hd_id3147563" role="tablecontent" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter at the Selection icon</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3154569" xml-lang="en-US" l10n="U" oldref="196">Esc</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="hd_id3148580" xml-lang="en-US" l10n="U" oldref="344">Any text or numerical key</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_id2693563" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150860" role="tablecontent" l10n="U" oldref="343">Activates the first drawing object in the document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3154569" role="tablecontent" l10n="U" oldref="196">Esc</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149994" role="tablecontent" l10n="U" oldref="195">Leave the Point Selection mode. The drawing object is selected afterwards.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155512" role="tablecontent" l10n="U" oldref="193">Edit a point of a drawing object (Point Edit mode)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="hd_id3148580" role="tablecontent" l10n="U" oldref="344">Any text or numerical key</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152918" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="par_id2693563" role="tablecontent" 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>
-<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>
-<paragraph role="tablecontent" id="par_id526444" xml-lang="en-US" l10n="NEW">Shift key while creating or scaling a graphic object</paragraph>
-</tablecell>
-<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>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id8308969" role="tablecontent" l10n="NEW">The position of the object's center is fixed.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id526444" role="tablecontent" l10n="NEW">Shift key while creating or scaling a graphic object</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id4939725" role="tablecontent" 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"/>
-<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
-</section>
-</body>
-</helpdocument>
+ </section>
+ <section id="relatedtopics">
+ <embed href="text/shared/04/01020000.xhp#DB_keys"/>
+ <embed href="text/shared/guide/keyboard.xhp#keyboard"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/04/01020000.xhp b/helpcontent2/source/text/shared/04/01020000.xhp
index aff765f66c..583afa6796 100755
--- a/helpcontent2/source/text/shared/04/01020000.xhp
+++ b/helpcontent2/source/text/shared/04/01020000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/04/makefile.mk b/helpcontent2/source/text/shared/04/makefile.mk
index 59727b800e..98160a67da 100644
--- a/helpcontent2/source/text/shared/04/makefile.mk
+++ b/helpcontent2/source/text/shared/04/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,4 +50,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index b4028ba58e..84d2171457 100755..100644
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000001.xhp,v $
- * $Revision: 1.10.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,39 +29,42 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textshared0500000001xml" indexer="include">
-<title id="tit" xml-lang="en-US">Getting Support</title>
-<filename>/text/shared/05/00000001.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="support">
+ <topic id="textshared0500000001xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Getting Support</title>
+ <filename>/text/shared/05/00000001.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="support">
<bookmark xml-lang="en-US" branch="index" id="bm_id3143272"><bookmark_value>support on the Web</bookmark_value>
-<bookmark_value>getting support</bookmark_value>
-<bookmark_value>forums and support</bookmark_value>
-<bookmark_value>Web support</bookmark_value>
+ <bookmark_value>getting support</bookmark_value>
+ <bookmark_value>forums and support</bookmark_value>
+ <bookmark_value>Web support</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3146873" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
+<paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
</variable></paragraph>
-<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_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 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>
-<paragraph role="paragraph" id="par_id3497211" xml-lang="en-US" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial office software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" 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 xml-lang="en-US" id="par_id3154230" role="paragraph" 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>
+<paragraph xml-lang="en-US" id="hd_id26327" role="heading" level="2" l10n="NEW">Local language support pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" 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 xml-lang="en-US" id="hd_id2611386" role="heading" level="2" l10n="NEW">Mailing lists</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" 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 xml-lang="en-US" id="hd_id0915200811081722" role="heading" level="2" l10n="NEW">Forum</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0804200803314150" role="heading" level="2" l10n="NEW">Security</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" 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 xml-lang="en-US" id="hd_id3168534" role="heading" level="2" l10n="NEW">Downloads</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2602967" role="heading" level="2" l10n="NEW">Documentation</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0120200910361765" role="heading" level="2" l10n="NEW">Participate and give back</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide OpenOffice.org community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://documentation.openoffice.org/">documentation web site</link> or the <link href="http://wiki.services.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/05/00000002.xhp b/helpcontent2/source/text/shared/05/00000002.xhp
index 8eed0b17fd..87bb13aa7f 100644
--- a/helpcontent2/source/text/shared/05/00000002.xhp
+++ b/helpcontent2/source/text/shared/05/00000002.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000002.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/05/00000100.xhp b/helpcontent2/source/text/shared/05/00000100.xhp
index b8c63d26a9..85464efbd6 100755
--- a/helpcontent2/source/text/shared/05/00000100.xhp
+++ b/helpcontent2/source/text/shared/05/00000100.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000100.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,20 +29,17 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0500000100xml" indexer="exclude" status="PUBLISH">
<title id="tit" xml-lang="en-US"/>
<filename>/text/shared/05/00000100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-14T14:08:39">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="neuehilfe"><comment>this section is displayed on all module main pages above the other "Help about Help" links.</comment>
+<paragraph role="paragraph" id="par_id3150699" xml-lang="en-US" l10n="NEW">The Help references the default settings of the program on a system that is set to defaults. Descriptions of colors, mouse actions, or other configurable items can be different for your program and system.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3150618" xml-lang="en-US" l10n="U" oldref="1">The <emph>$[officename] Help system</emph> provides easy access to information and support. There are several ways to find what you are looking for in the <link href="text/shared/05/00000110.xhp" name="Help environment">Help environment</link>: You can search for a specific keyword in the <link href="text/shared/05/00000130.xhp" name="Index">Index</link>, carry out a full-text search under <link href="text/shared/05/00000140.xhp" name="Find">Find</link>, or look through a hierarchical list of the <link href="text/shared/05/00000160.xhp" name="Topics">Topics</link>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index 55d77ffb7f..0ff57de8c9 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 00000110.xhp,v $
- * $Revision: 1.9.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,170 +31,190 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textshared0500000110xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">The %PRODUCTNAME Help Window</title>
-<filename>/text/shared/05/00000110.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0500000110xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">The %PRODUCTNAME Help Window</title>
+ <filename>/text/shared/05/00000110.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/SID_HELPONHELP" id="bm_id3706162" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3153244" localize="false"/><paragraph role="heading" id="hd_id3153884" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000110"><link href="text/shared/05/00000110.xhp" name="The %PRODUCTNAME Help Window">The <item type="productname">%PRODUCTNAME</item> Help Window</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3153244" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153884" role="heading" level="1" l10n="U" oldref="1"><variable id="00000110"><link href="text/shared/05/00000110.xhp" name="The %PRODUCTNAME Help Window">The <item type="productname">%PRODUCTNAME</item> Help Window</link>
</variable></paragraph>
-<paragraph role="warning" id="par_id3156183" xml-lang="en-US" l10n="CHG" oldref="25">The Help system for OpenOffice.org and StarOffice/StarSuite software from Sun Microsystems, Inc. is based on the same source files. Some of the functions described here may not be included in this particular <item type="productname">%PRODUCTNAME</item> distribution.<comment>removed "OpenSource" switch</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/><paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_HELP_TOOLBOX">The <emph>Toolbar</emph> contains important functions for controlling the Help system</ahelp>:</paragraph>
-<table id="tbl_id3155555">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="E">
-<image id="img_id3155892" src="sfx2/res/indexon_small.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155892" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="par_id3156183" role="warning" l10n="CHG" oldref="25">The Help system for all versions of the software is based on the same source files. Some of the functions described in Help may not be included in this particular distribution. Some features specific to a distribution may not be mentioned in this Help.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3147143" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="24"><ahelp hid="HID_HELP_TOOLBOX">The <emph>Toolbar</emph> contains important functions for controlling the Help system</ahelp>:</paragraph>
+ <table id="tbl_id3155555">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" l10n="E">
+<image id="img_id3155892" src="sfx2/res/indexon_small.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155892">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_INDEX" id="bm_id3153748" localize="false"/><paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_HELP_TOOLBOXITEM_INDEX">Hides and shows the <emph>navigation pane</emph></ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152781" xml-lang="en-US" l10n="E">
-<image id="img_id3149811" src="res/sc06301.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149811" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_INDEX" id="bm_id3153748" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147089" role="paragraph" l10n="U" oldref="3"><ahelp hid="HID_HELP_TOOLBOXITEM_INDEX">Hides and shows the <emph>navigation pane</emph></ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152781" role="paragraph" l10n="E">
+<image id="img_id3149811" src="res/sc06301.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149811">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BACKWARD" id="bm_id3148539" localize="false"/><paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_HELP_TOOLBOXITEM_BACKWARD">Moves back to the <emph>previous</emph> page</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="E">
-<image id="img_id3159399" src="res/commandimagelist/sc_browseforward.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159399" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BACKWARD" id="bm_id3148539" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3151111" role="paragraph" l10n="U" oldref="5"><ahelp hid="HID_HELP_TOOLBOXITEM_BACKWARD">Moves back to the <emph>previous</emph> page</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149415" role="paragraph" l10n="E">
+<image id="img_id3159399" src="res/commandimagelist/sc_browseforward.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3159399">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_FORWARD" id="bm_id3154306" localize="false"/><paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_HELP_TOOLBOXITEM_FORWARD">Moves forward to the <emph>next</emph> page</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="E">
-<image id="img_id3148642" src="res/sc06303.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148642" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_FORWARD" id="bm_id3154306" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154514" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_HELP_TOOLBOXITEM_FORWARD">Moves forward to the <emph>next</emph> page</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="E">
+<image id="img_id3148642" src="res/sc06303.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148642">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_START" id="bm_id3153698" localize="false"/><paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_HELP_TOOLBOXITEM_START">Moves to the <emph>first page</emph> of the current Help topic</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="E">
-<image id="img_id3155434" src="res/commandimagelist/sc_print.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155434" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_START" id="bm_id3153698" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_HELP_TOOLBOXITEM_START">Moves to the <emph>first page</emph> of the current Help topic</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149797" role="paragraph" l10n="E">
+<image id="img_id3155434" src="res/commandimagelist/sc_print.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155434">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_PRINT" id="bm_id3147560" localize="false"/><paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_HELP_TOOLBOXITEM_PRINT"><emph>Prints</emph> the current page</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="E">
-<image id="img_id3149294" src="sfx2/res/favourite.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149294" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_PRINT" id="bm_id3147560" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="7"><ahelp hid="HID_HELP_TOOLBOXITEM_PRINT"><emph>Prints</emph> the current page</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145068" role="paragraph" l10n="E">
+<image id="img_id3149294" src="sfx2/res/favourite.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149294">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BOOKMARKS" id="bm_id3150791" localize="false"/><paragraph role="paragraph" id="par_id3154939" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_HELP_TOOLBOXITEM_BOOKMARKS">Adds this page to your bookmarks</ahelp></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_idN108D9" xml-lang="en-US" l10n="NEW">
-<image id="img_id7358623" src="res/commandimagelist/sc_recsearch.png" width="0.222inch" height="0.222inch"><alt id="alt_id7358623" xml-lang="en-US">Search icon</alt>
+ </tablecell>
+ <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BOOKMARKS" id="bm_id3150791" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="U" oldref="18"><ahelp hid="HID_HELP_TOOLBOXITEM_BOOKMARKS">Adds this page to your bookmarks</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN108D9" role="paragraph" l10n="NEW">
+<image id="img_id7358623" src="res/commandimagelist/sc_recsearch.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7358623">Search icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_SEARCHDIALOG" id="bm_id5442670" localize="false"/><paragraph role="paragraph" id="par_idN108FE" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_HELP_TOOLBOXITEM_SEARCHDIALOG">Opens the <emph>Find on this page</emph> dialog.</ahelp></paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="21">These commands can also be found in the context menu of the Help document.</paragraph>
-<paragraph role="heading" id="par_idN10922" xml-lang="en-US" level="2" l10n="NEW">Help Page</paragraph>
-<paragraph role="paragraph" id="par_idN10926" xml-lang="en-US" l10n="NEW">You can copy from the Help Viewer to the clipboard on your operating system with standard copy commands. For example:</paragraph>
-<list type="ordered">
-<listitem>
-<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 <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>
-<list type="ordered">
-<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 <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>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A48" xml-lang="en-US" l10n="NEW">Select the search options that you want to use.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A26" xml-lang="en-US" l10n="NEW">Click <emph>Find</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10A59" xml-lang="en-US" l10n="NEW">To find the next occurrence of the search term on the page, click <emph>Find</emph> again.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" id="bm_id1145664" localize="false"/><paragraph role="paragraph" id="par_idN10906" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" visibility="hidden">Enter the text that you want to search for or select a text entry in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" id="bm_id6895962" localize="false"/><paragraph role="paragraph" id="par_idN10993" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" visibility="hidden">Finds complete words only.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" id="bm_id5402996" localize="false"/><paragraph role="paragraph" id="par_idN109AA" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" visibility="hidden">Distinguishes between uppercase text and lowercase text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" id="bm_id3418988" localize="false"/><paragraph role="paragraph" id="par_idN109C1" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" visibility="hidden">Searches the entire Help page, starting at the current position of the cursor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" id="bm_id3523056" localize="false"/><paragraph role="paragraph" id="par_idN109D8" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" visibility="hidden">Searches backwards from the current position of the cursor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" id="bm_id5264137" localize="false"/><paragraph role="paragraph" id="par_idN109F5" xml-lang="en-US" l10n="NEW"><ahelp hid="sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" visibility="hidden">Finds the next occurrence of the search term.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="2" l10n="U" oldref="8">Navigation Pane</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_TABCONTROL" id="bm_id3147229" localize="false"/><paragraph role="paragraph" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_HELP_TABCONTROL">The navigation pane of the Help window contains the tab pages <emph>Contents</emph>, <emph>Index</emph>, <emph>Find</emph> and <emph>Bookmarks</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_HELP_LISTBOX" id="bm_id3145421" localize="false"/><paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_HELP_LISTBOX">The list box located at the very top is where you can select other <item type="productname">%PRODUCTNAME</item> Help modules.</ahelp> The <emph>Index</emph> and <emph>Find</emph> tab pages only contain the data for the selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
-<table id="tbl_id3144434">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149983" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/05/00000160.xhp" name="Contents">Contents</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145748" xml-lang="en-US" l10n="CHG" oldref="15">Displays an index of the main topics of all modules.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/05/00000130.xhp" name="Index">Index</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151351" xml-lang="en-US" l10n="CHG" oldref="11">Displays a list of index keywords for the currently selected %PRODUCTNAME module.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/05/00000140.xhp" name="Find">Find</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="13">Allows you to carry out a full-text search. The search will include the entire Help contents of the currently selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154985" xml-lang="en-US" l10n="U" oldref="16"><link href="text/shared/05/00000150.xhp" name="Bookmarks">Bookmarks</link></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156062" xml-lang="en-US" l10n="U" oldref="17">Contains user-defined bookmarks. You can edit or delete bookmarks, or click them to go to the corresponding pages.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<section id="relatedtopics">
-<embed href="text/shared/05/00000120.xhp#00000120"/>
-<embed href="text/shared/05/00000160.xhp#doc_title"/>
-<embed href="text/shared/05/00000130.xhp#00000130"/>
-<embed href="text/shared/05/00000140.xhp#00000140"/>
-<embed href="text/shared/05/00000150.xhp#doc_title"/>
-</section>
-</body>
-</helpdocument>
+ </tablecell>
+ <tablecell>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_SEARCHDIALOG" id="bm_id5442670" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN108FE" role="paragraph" l10n="NEW"><ahelp hid="HID_HELP_TOOLBOXITEM_SEARCHDIALOG">Opens the <emph>Find on this page</emph> dialog.</ahelp></paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="21">These commands can also be found in the context menu of the Help document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10922" role="heading" level="2" l10n="NEW">Help Page</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10926" role="paragraph" l10n="NEW">You can copy from the Help Viewer to the clipboard on your operating system with standard copy commands. For example:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1092C" role="paragraph" l10n="NEW">On a Help page, select the text that you want to copy.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10930" role="paragraph" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10933" role="paragraph" l10n="NEW">To search the current Help page:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10939" role="paragraph" l10n="NEW">Click the <emph>Find on this Page</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10940" role="paragraph" l10n="NEW">The <emph>Find on this Page</emph> dialog opens.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10A36" role="note" 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 xml-lang="en-US" id="par_idN10A22" role="paragraph" l10n="NEW">In the <emph>Search for</emph> box, enter the text that you want to find.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A48" role="paragraph" l10n="NEW">Select the search options that you want to use.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A26" role="paragraph" l10n="NEW">Click <emph>Find</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10A59" role="paragraph" l10n="NEW">To find the next occurrence of the search term on the page, click <emph>Find</emph> again.</paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" id="bm_id1145664" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10906" role="paragraph" l10n="NEW"><ahelp hid="sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" visibility="hidden">Enter the text that you want to search for or select a text entry in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" id="bm_id6895962" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10993" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" visibility="hidden">Finds complete words only.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" id="bm_id5402996" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109AA" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" visibility="hidden">Distinguishes between uppercase text and lowercase text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" id="bm_id3418988" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109C1" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" visibility="hidden">Searches the entire Help page, starting at the current position of the cursor.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" id="bm_id3523056" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109D8" role="paragraph" l10n="NEW"><ahelp hid="sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" visibility="hidden">Searches backwards from the current position of the cursor.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" id="bm_id5264137" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN109F5" role="paragraph" l10n="NEW"><ahelp hid="sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" visibility="hidden">Finds the next occurrence of the search term.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="2" l10n="U" oldref="8">Navigation Pane</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_TABCONTROL" id="bm_id3147229" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148673" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_HELP_TABCONTROL">The navigation pane of the Help window contains the tab pages <emph>Contents</emph>, <emph>Index</emph>, <emph>Find</emph> and <emph>Bookmarks</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_HELP_LISTBOX" id="bm_id3145421" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_HELP_LISTBOX">The list box located at the very top is where you can select other <item type="productname">%PRODUCTNAME</item> Help modules.</ahelp> The <emph>Index</emph> and <emph>Find</emph> tab pages only contain the data for the selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
+ <table id="tbl_id3144434">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149983" role="tablecontent" l10n="U" oldref="14"><link href="text/shared/05/00000160.xhp" name="Contents">Contents</link></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145748" role="tablecontent" l10n="CHG" oldref="15">Displays an index of the main topics of all modules.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155366" role="tablecontent" l10n="U" oldref="10"><link href="text/shared/05/00000130.xhp" name="Index">Index</link></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151351" role="tablecontent" l10n="CHG" oldref="11">Displays a list of index keywords for the currently selected %PRODUCTNAME module.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149260" role="tablecontent" l10n="U" oldref="12"><link href="text/shared/05/00000140.xhp" name="Find">Find</link></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154188" role="tablecontent" l10n="U" oldref="13">Allows you to carry out a full-text search. The search will include the entire Help contents of the currently selected <item type="productname">%PRODUCTNAME</item> module.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="U" oldref="16"><link href="text/shared/05/00000150.xhp" name="Bookmarks">Bookmarks</link></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156062" role="tablecontent" l10n="U" oldref="17">Contains user-defined bookmarks. You can edit or delete bookmarks, or click them to go to the corresponding pages.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <section id="relatedtopics">
+ <embed href="text/shared/05/00000120.xhp#00000120"/>
+ <embed href="text/shared/05/00000160.xhp#doc_title"/>
+ <embed href="text/shared/05/00000130.xhp#00000130"/>
+ <embed href="text/shared/05/00000140.xhp#00000140"/>
+ <embed href="text/shared/05/00000150.xhp#doc_title"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/05/00000120.xhp b/helpcontent2/source/text/shared/05/00000120.xhp
index 7bc523b0cb..f3dbbf6eaf 100755
--- a/helpcontent2/source/text/shared/05/00000120.xhp
+++ b/helpcontent2/source/text/shared/05/00000120.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.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000120.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,46 +32,46 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0500000120xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Help Agent, Tips and Extended Tips</title>
-<filename>/text/shared/05/00000120.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-23T10:58:54">converted from old format - fpe
-DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0500000120xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Help Agent, Tips and Extended Tips</title>
+ <filename>/text/shared/05/00000120.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150672"><bookmark_value>Help; Help tips</bookmark_value>
-<bookmark_value>tooltips; help</bookmark_value>
-<bookmark_value>Help Agent; help</bookmark_value>
+ <bookmark_value>tooltips; help</bookmark_value>
+ <bookmark_value>Help Agent; help</bookmark_value>
+ <bookmark_value>Clippy, see Help Agent</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3150672" xml-lang="en-US" l10n="E" oldref="11" localize="false"/>
-<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Help Agent, Tips and Extended Tips">Help Agent, Tips and Extended Tips</link>
+<paragraph xml-lang="en-US" id="par_id3150672" role="paragraph" l10n="E" oldref="11"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Help Agent, Tips and Extended Tips">Help Agent, Tips and Extended Tips</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="CHG" oldref="2">The Help Agent, Tips, and Extended Tips provide help while you work. </paragraph>
-<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
-<paragraph role="tip" id="par_idN10634" xml-lang="en-US" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task.</paragraph>
-<paragraph role="tip" id="par_id5693533" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3149140" xml-lang="en-US" level="2" l10n="U" oldref="3">Tips</paragraph>
-<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
-<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
-<paragraph role="tip" id="par_id992156" xml-lang="en-US" l10n="NEW">Enable or disable the tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
-<paragraph role="tip" id="par_idN10666" xml-lang="en-US" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
-<embed href="text/shared/05/00000110.xhp#00000110"/>
-<embed href="text/shared/05/00000160.xhp#doc_title"/>
-<embed href="text/shared/05/00000130.xhp#00000130"/>
-<embed href="text/shared/05/00000140.xhp#00000140"/>
-<embed href="text/shared/05/00000150.xhp#doc_title"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3148520" role="paragraph" l10n="CHG" oldref="2">The Help Agent, Tips, and Extended Tips provide help while you work. </paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147285" role="heading" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10634" role="tip" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task. To disable the Help Agent choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#agentoff"/>
+ <paragraph xml-lang="en-US" id="hd_id3149140" role="heading" level="2" l10n="U" oldref="3">Tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157896" role="paragraph" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153910" role="paragraph" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id992156" role="tip" l10n="NEW">Enable or disable the tips on <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147571" role="heading" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10666" role="tip" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
+ <embed href="text/shared/05/00000110.xhp#00000110"/>
+ <embed href="text/shared/05/00000160.xhp#doc_title"/>
+ <embed href="text/shared/05/00000130.xhp#00000130"/>
+ <embed href="text/shared/05/00000140.xhp#00000140"/>
+ <embed href="text/shared/05/00000150.xhp#doc_title"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/05/00000130.xhp b/helpcontent2/source/text/shared/05/00000130.xhp
index 601df29a41..2c7fe609a7 100644
--- a/helpcontent2/source/text/shared/05/00000130.xhp
+++ b/helpcontent2/source/text/shared/05/00000130.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000130.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,9 +48,9 @@
<paragraph role="paragraph" id="par_id3149428" xml-lang="en-US" l10n="E" oldref="2" localize="false"/>
<paragraph role="heading" id="hd_id3153884" xml-lang="en-US" level="1" l10n="U" oldref="5"><variable id="00000130"><link href="text/shared/05/00000130.xhp" name="Index - Keyword Search in the Help">Index - Keyword Search in the Help</link>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_COMBOBOX_TP_HELP_INDEX_CB_INDEX" id="bm_id3149662" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX" id="bm_id3149662" localize="false"/>
<paragraph role="paragraph" id="par_id3150960" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="SFX2_COMBOBOX_TP_HELP_INDEX_CB_INDEX" visibility="hidden">Double-click an entry or type the word you want to find in the index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_TP_HELP_INDEX_PB_OPEN_INDEX" id="bm_id3150476" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX" id="bm_id3150476" localize="false"/>
<paragraph role="paragraph" id="par_id3148668" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2_PUSHBUTTON_TP_HELP_INDEX_PB_OPEN_INDEX" visibility="hidden">Click to display the selected topic.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="1">You can search for a specific topic by typing a word into the <emph>Search term</emph> text box. The window contains an alphabetical list of index terms.</paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="6">If the cursor is in the index list when you type the search term, the display will jump directly to the next match. When you type a word in the <emph>Search term</emph> text box, the focus will jump to the best match in the index list.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000140.xhp b/helpcontent2/source/text/shared/05/00000140.xhp
index 74d111b87c..2d9d4bd2da 100644
--- a/helpcontent2/source/text/shared/05/00000140.xhp
+++ b/helpcontent2/source/text/shared/05/00000140.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000140.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,17 +49,17 @@
<paragraph role="paragraph" id="par_id3148532" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
<paragraph role="heading" id="hd_id3148523" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="00000140"><link href="text/shared/05/00000140.xhp" name="Find - The Full-Text Search">Find - The Full-Text Search</link>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_COMBOBOX_TP_HELP_SEARCH_ED_SEARCH" id="bm_id3151100" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH" id="bm_id3151100" localize="false"/>
<paragraph role="paragraph" id="par_id3155599" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SFX2_COMBOBOX_TP_HELP_SEARCH_ED_SEARCH" visibility="hidden">Enter the search term here. The search is not case-sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_SEARCH" id="bm_id3109850" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH" id="bm_id3109850" localize="false"/>
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_SEARCH" visibility="hidden">Click to start a full-text search for the term you entered.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_TP_HELP_SEARCH_LB_RESULT" id="bm_id3149140" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT" id="bm_id3149140" localize="false"/>
<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SFX2_LISTBOX_TP_HELP_SEARCH_LB_RESULT" visibility="hidden">Lists the headings of the pages found in your full-text search. To display a page, double-click its entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_HELP_SEARCH_CB_FULLWORDS" id="bm_id3154673" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS" id="bm_id3154673" localize="false"/>
<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SFX2_CHECKBOX_TP_HELP_SEARCH_CB_FULLWORDS" visibility="hidden">Specifies whether to carry out an exact search for the word you entered. Incomplete words will not be found.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_HELP_SEARCH_CB_SCOPE" id="bm_id3147835" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE" id="bm_id3147835" localize="false"/>
<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SFX2_CHECKBOX_TP_HELP_SEARCH_CB_SCOPE" visibility="hidden">Specifies whether to only search in document headings for the search term.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_OPEN_SEARCH" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH" id="bm_id3145346" localize="false"/>
<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2_PUSHBUTTON_TP_HELP_SEARCH_PB_OPEN_SEARCH" visibility="hidden">Displays the entry selected in the list.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152552" xml-lang="en-US" l10n="U" oldref="8">The full text search function in $[officename] Help allows you to find Help documents that contain any combination of search terms. To do this, type one or more words into the <emph>Search term</emph> text field.</paragraph>
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="9">The <emph>Search term</emph> text field stores the words you entered last. To repeat a previous search, click the arrow icon and select the term from the list.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000150.xhp b/helpcontent2/source/text/shared/05/00000150.xhp
index 8c3fab45cf..8ddf83ac90 100644
--- a/helpcontent2/source/text/shared/05/00000150.xhp
+++ b/helpcontent2/source/text/shared/05/00000150.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000150.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
<bookmark branch="index" xml-lang="en-US" id="bm_id3153244"><bookmark_value>Help; bookmarks</bookmark_value><bookmark_value>bookmarks; Help</bookmark_value></bookmark><paragraph role="paragraph" id="par_id3153244" l10n="E" xml-lang="en-US" oldref="1" localize="false"/>
<paragraph id="hd_id3154349" role="heading" level="1" oldref="2" l10n="U" xml-lang="en-US"><variable id="doc_title"><link href="text/shared/05/00000150.xhp" name="Managing Bookmarks">Managing Bookmarks</link></variable></paragraph>
- <bookmark branch="hid/SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE" xml-lang="en-US" id="bm_id3143284"/><paragraph l10n="U" role="paragraph" id="par_id3154840" xml-lang="en-US" oldref="11"><ahelp hid="SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE" visibility="hidden">Displays the name of the bookmarked page. You can also type a new name for the bookmark.</ahelp></paragraph>
+ <bookmark branch="hid/sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE" xml-lang="en-US" id="bm_id3143284"/><paragraph l10n="U" role="paragraph" id="par_id3154840" xml-lang="en-US" oldref="11"><ahelp hid="SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE" visibility="hidden">Displays the name of the bookmarked page. You can also type a new name for the bookmark.</ahelp></paragraph>
<table id="tbl_id3154228">
@@ -61,7 +58,7 @@
<paragraph xml-lang="en-US" role="paragraph" id="par_id3149827" l10n="U" oldref="3">You can find the bookmarks on the <emph>Bookmarks</emph> tab page.</paragraph>
<list type="unordered">
<listitem>
- <bookmark branch="hid/SFX2_LISTBOX_TP_HELP_BOOKMARKS_LB_BOOKMARKS" xml-lang="en-US" id="bm_id3156410"/><paragraph l10n="U" role="listitem" id="par_id3145345" xml-lang="en-US" oldref="4"><ahelp hid="SFX2_LISTBOX_TP_HELP_BOOKMARKS_LB_BOOKMARKS" visibility="visible">Double-clicking a bookmark or pressing the Return key opens the assigned page in Help. A right-click opens the context menu.</ahelp></paragraph>
+ <bookmark branch="hid/sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS" xml-lang="en-US" id="bm_id3156410"/><paragraph l10n="U" role="listitem" id="par_id3145345" xml-lang="en-US" oldref="4"><ahelp hid="SFX2_LISTBOX_TP_HELP_BOOKMARKS_LB_BOOKMARKS" visibility="visible">Double-clicking a bookmark or pressing the Return key opens the assigned page in Help. A right-click opens the context menu.</ahelp></paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3166410" l10n="U" xml-lang="en-US" oldref="5">Use the Del key to delete a selected bookmark.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000160.xhp b/helpcontent2/source/text/shared/05/00000160.xhp
index dc9f1d9c07..88dd0a41a4 100644
--- a/helpcontent2/source/text/shared/05/00000160.xhp
+++ b/helpcontent2/source/text/shared/05/00000160.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000160.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/05/err_html.xhp b/helpcontent2/source/text/shared/05/err_html.xhp
index 6831a727cf..2d9c471465 100644
--- a/helpcontent2/source/text/shared/05/err_html.xhp
+++ b/helpcontent2/source/text/shared/05/err_html.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: err_html.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/05/makefile.mk b/helpcontent2/source/text/shared/05/makefile.mk
index b53847959e..970596d05c 100644
--- a/helpcontent2/source/text/shared/05/makefile.mk
+++ b/helpcontent2/source/text/shared/05/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,4 +58,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/07/09000000.xhp b/helpcontent2/source/text/shared/07/09000000.xhp
index af101e9abb..5beec3dfb5 100644
--- a/helpcontent2/source/text/shared/07/09000000.xhp
+++ b/helpcontent2/source/text/shared/07/09000000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 09000000.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/07/makefile.mk b/helpcontent2/source/text/shared/07/makefile.mk
index c080f0760b..a15cea003a 100644
--- a/helpcontent2/source/text/shared/07/makefile.mk
+++ b/helpcontent2/source/text/shared/07/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,4 +49,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/3dsettings_toolbar.xhp b/helpcontent2/source/text/shared/3dsettings_toolbar.xhp
index bedd180b3c..acfc21dbc4 100644
--- a/helpcontent2/source/text/shared/3dsettings_toolbar.xhp
+++ b/helpcontent2/source/text/shared/3dsettings_toolbar.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 3dsettings_toolbar.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,76 +29,68 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared3dsettings_toolbarxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">3D-Settings</title>
-<filename>/text/shared/3dsettings_toolbar.xhp</filename>
-</topic>
-<history>
-<created date="2004-09-28T12:54:34">UFI: 3D-Settings toolbar</created>
-<lastedited date="2007-01-16T10:10:48">DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="3dsettings">
-<paragraph role="heading" id="par_idN1055A" xml-lang="en-US" level="1" l10n="NEW"><variable id="3dtoolbar"><link href="text/shared/3dsettings_toolbar.xhp">3D-Settings</link>
+ <topic id="textshared3dsettings_toolbarxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">3D-Settings</title>
+ <filename>/text/shared/3dsettings_toolbar.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="3dsettings">
+ <paragraph xml-lang="en-US" id="par_idN1055A" role="heading" level="1" l10n="NEW"><variable id="3dtoolbar"><link href="text/shared/3dsettings_toolbar.xhp">3D-Settings</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The 3D-Settings toolbar controls properties of selected 3D objects.</ahelp></paragraph>
-</section>
+ <paragraph xml-lang="en-US" id="par_idN1056A" role="paragraph" l10n="NEW"><ahelp hid=".">The 3D-Settings toolbar controls properties of selected 3D objects.</ahelp></paragraph>
+ </section>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TOOGLE" id="bm_id9720450" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionToggle" id="bm_id7128513" localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">Extrusion on/off</paragraph>
-<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the 3D effects on and off for the selected objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10575" role="heading" level="2" l10n="NEW">Extrusion on/off</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10579" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the 3D effects on and off for the selected objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_DOWN" id="bm_id4860377" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltDown" id="bm_id9378337" localize="false"/>
-<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Tilt Down</paragraph>
-<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tilts the selected object downwards by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Tilt Down</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" l10n="NEW"><ahelp hid=".">Tilts the selected object downwards by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_UP" id="bm_id1682790" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltUp" id="bm_id8217413" localize="false"/>
-<paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Tilt Up</paragraph>
-<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Tilts the selected object upwards by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2" l10n="NEW">Tilt Up</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph" l10n="CHG"><ahelp hid=".">Tilts the selected object upwards by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_LEFT" id="bm_id8390758" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltLeft" id="bm_id3715628" localize="false"/>
-<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Tilt Left</paragraph>
-<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tilts the selected object left by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105C6" role="heading" level="2" l10n="NEW">Tilt Left</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105CA" role="paragraph" l10n="NEW"><ahelp hid=".">Tilts the selected object left by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_TILT_RIGHT" id="bm_id3985717" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltRight" id="bm_id5299844" localize="false"/>
-<paragraph role="heading" id="par_idN105E1" xml-lang="en-US" level="2" l10n="NEW">Tilt Right</paragraph>
-<paragraph role="paragraph" id="par_idN105E5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tilts the selected object right by five degrees.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105E1" role="heading" level="2" l10n="NEW">Tilt Right</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105E5" role="paragraph" l10n="NEW"><ahelp hid=".">Tilts the selected object right by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_DEPTH_FLOATER" id="bm_id1778008" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDepthFloater" id="bm_id408642" localize="false"/>
-<paragraph role="heading" id="par_idN105FC" xml-lang="en-US" level="2" l10n="NEW">Depth</paragraph>
-<paragraph role="paragraph" id="par_idN10600" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Depth window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39983" id="bm_id8984344" localize="false"/>
-<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an extrusion depth.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVX_MDLG_EXTRUSION_DEPTH_MTR_DEPTH" id="bm_id5449079" localize="false"/>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter an extrusion depth.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105FC" role="heading" level="2" l10n="NEW">Depth</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10600" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Depth window.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10617" role="paragraph" l10n="NEW"><ahelp hid=".">Select an extrusion depth.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVX_MDLG_EXTRUSION_DEPTH:MTR_DEPTH" id="bm_id5449079" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10632" role="paragraph" l10n="NEW"><ahelp hid=".">Enter an extrusion depth.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_DIRECTION_FLOATER" id="bm_id6154362" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDirectionFloater" id="bm_id3699453" localize="false"/>
-<paragraph role="heading" id="par_idN1064C" xml-lang="en-US" level="2" l10n="NEW">Direction</paragraph>
-<paragraph role="paragraph" id="par_idN10650" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Direction window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/34073" id="bm_id3675649" localize="false"/>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a direction.</ahelp><comment>UFI: same ID for Direction and Lighting direction</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39981" id="bm_id1361430" localize="false"/>
-<paragraph role="paragraph" id="par_idN10698" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a perspective or parallel extrusion method.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1064C" role="heading" level="2" l10n="NEW">Direction</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10650" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Direction window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_POPUP_LINEEND_CTRL" id="bm_id3675649" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW"><ahelp hid=".">Select a direction.</ahelp><comment>UFI: same ID for Direction and Lighting direction</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW"><ahelp hid=".">Select a perspective or parallel extrusion method.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_LIGHTING_FLOATER" id="bm_id70192" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionLightingFloater" id="bm_id7180394" localize="false"/>
-<paragraph role="heading" id="par_idN106B3" xml-lang="en-US" level="2" l10n="NEW">Lighting</paragraph>
-<paragraph role="paragraph" id="par_idN106B7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Lighting window.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN106C6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a lighting direction.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39984" id="bm_id9216589" localize="false"/>
-<paragraph role="paragraph" id="par_idN106E1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a lighting intensity.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106B3" role="heading" level="2" l10n="NEW">Lighting</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Lighting window.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106C6" role="paragraph" l10n="NEW"><ahelp hid=".">Select a lighting direction.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E1" role="paragraph" l10n="NEW"><ahelp hid=".">Select a lighting intensity.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_SURFACE_FLOATER" id="bm_id3682363" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionSurfaceFloater" id="bm_id9263893" localize="false"/>
-<paragraph role="heading" id="par_idN106FC" xml-lang="en-US" level="2" l10n="NEW">Surface</paragraph>
-<paragraph role="paragraph" id="par_idN10700" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Surface window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/39986" id="bm_id8363292" localize="false"/>
-<paragraph role="paragraph" id="par_idN10717" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a surface material or a wireframe display.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106FC" role="heading" level="2" l10n="NEW">Surface</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10700" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Surface window.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10717" role="paragraph" l10n="NEW"><ahelp hid=".">Select a surface material or a wireframe display.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_EXTRUSION_3D_COLOR" id="bm_id144047" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Extrusion3DColor" id="bm_id7303994" localize="false"/>
-<paragraph role="heading" id="par_idN10732" xml-lang="en-US" level="2" l10n="NEW">3D Color</paragraph>
-<paragraph role="paragraph" id="par_idN10736" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Extrusion Color toolbar.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10732" role="heading" level="2" l10n="NEW">3D Color</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10736" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Extrusion Color toolbar.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/autokorr/01000000.xhp b/helpcontent2/source/text/shared/autokorr/01000000.xhp
index ca5dd04230..0bb93c05ef 100755
--- a/helpcontent2/source/text/shared/autokorr/01000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/01000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr01000000xml" indexer="exclude" status="PUBLISH">
@@ -53,6 +50,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/02000000.xhp b/helpcontent2/source/text/shared/autokorr/02000000.xhp
index 4d6298de6a..91993c59cf 100755
--- a/helpcontent2/source/text/shared/autokorr/02000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/02000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 02000000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr02000000xml" indexer="exclude" status="PUBLISH">
@@ -53,6 +50,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/03000000.xhp b/helpcontent2/source/text/shared/autokorr/03000000.xhp
index af27e21c59..de2e7abffe 100755
--- a/helpcontent2/source/text/shared/autokorr/03000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/03000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 03000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr03000000xml" indexer="exclude" status="PUBLISH">
@@ -53,6 +50,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/04000000.xhp b/helpcontent2/source/text/shared/autokorr/04000000.xhp
index fd042d0397..502e721253 100755
--- a/helpcontent2/source/text/shared/autokorr/04000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/04000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 04000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr04000000xml" indexer="exclude" status="PUBLISH">
@@ -54,6 +51,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/05000000.xhp b/helpcontent2/source/text/shared/autokorr/05000000.xhp
index bbec4756d7..a4eb3bfca8 100755
--- a/helpcontent2/source/text/shared/autokorr/05000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/05000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 05000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr05000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/06000000.xhp b/helpcontent2/source/text/shared/autokorr/06000000.xhp
index d650b691ae..70e0f75a37 100755
--- a/helpcontent2/source/text/shared/autokorr/06000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/06000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 06000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr06000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokotyafz"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/07000000.xhp b/helpcontent2/source/text/shared/autokorr/07000000.xhp
index fdf991abf5..45117e6ea5 100755
--- a/helpcontent2/source/text/shared/autokorr/07000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/07000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 07000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr07000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokotyafz"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/08000000.xhp b/helpcontent2/source/text/shared/autokorr/08000000.xhp
index 10bcaf0073..7fd6245d6d 100755
--- a/helpcontent2/source/text/shared/autokorr/08000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/08000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 08000000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr08000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/09000000.xhp b/helpcontent2/source/text/shared/autokorr/09000000.xhp
index fa1a778d78..ff4af8ffe1 100755
--- a/helpcontent2/source/text/shared/autokorr/09000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/09000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 09000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr09000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/10000000.xhp b/helpcontent2/source/text/shared/autokorr/10000000.xhp
index 129ae893c3..b3531239d6 100755
--- a/helpcontent2/source/text/shared/autokorr/10000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/10000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 10000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr10000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/11000000.xhp b/helpcontent2/source/text/shared/autokorr/11000000.xhp
deleted file mode 100755
index cbb2cc6fa2..0000000000
--- a/helpcontent2/source/text/shared/autokorr/11000000.xhp
+++ /dev/null
@@ -1,63 +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: 11000000.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="textsharedautokorr11000000xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoCorrect has been activated</title>
-<filename>/text/shared/autokorr/11000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-26T12:44:54">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL" id="bm_id3149989" localize="false"/>
-<paragraph role="heading" id="hd_id3146856" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoCorrect has been activated</paragraph>
-<paragraph role="heading" id="hd_id3155271" xml-lang="en-US" level="3" l10n="U" oldref="2">1/2 ... has been replaced with ½ ...</paragraph>
-<paragraph role="paragraph" id="par_id3153220" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link> has replaced text and character combinations that are found in the font as a single character, such as 1/2, with the appropriate character.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
-</section>
-<section id="relatedtopics">
-<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</case>
-</switch>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/autokorr/12000000.xhp b/helpcontent2/source/text/shared/autokorr/12000000.xhp
index d1c9fe8208..53e18538ba 100755
--- a/helpcontent2/source/text/shared/autokorr/12000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/12000000.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 12000000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -49,6 +46,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/13000000.xhp b/helpcontent2/source/text/shared/autokorr/13000000.xhp
index 7b2bcd738d..4abe69ef8e 100755
--- a/helpcontent2/source/text/shared/autokorr/13000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/13000000.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 13000000.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr13000000xml" indexer="exclude" status="PUBLISH">
@@ -52,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/makefile.mk b/helpcontent2/source/text/shared/autokorr/makefile.mk
index 1f89e18dc9..29e0fa2ee6 100644
--- a/helpcontent2/source/text/shared/autokorr/makefile.mk
+++ b/helpcontent2/source/text/shared/autokorr/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,11 +54,10 @@ XHPFILES = \
08000000.xhp \
09000000.xhp \
10000000.xhp \
- 11000000.xhp \
12000000.xhp \
13000000.xhp
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/autopi/01000000.xhp b/helpcontent2/source/text/shared/autopi/01000000.xhp
index 0bbff64038..c96e0612df 100644
--- a/helpcontent2/source/text/shared/autopi/01000000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01000000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010000.xhp b/helpcontent2/source/text/shared/autopi/01010000.xhp
index 32930bf472..a47fb27a11 100644
--- a/helpcontent2/source/text/shared/autopi/01010000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010100.xhp b/helpcontent2/source/text/shared/autopi/01010100.xhp
index 64cdcb4517..8ea6552526 100644
--- a/helpcontent2/source/text/shared/autopi/01010100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010100.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010200.xhp b/helpcontent2/source/text/shared/autopi/01010200.xhp
index 344c851fc1..aa7e4f92ca 100644
--- a/helpcontent2/source/text/shared/autopi/01010200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010200.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010300.xhp b/helpcontent2/source/text/shared/autopi/01010300.xhp
index be84409df5..772cb0aadd 100644
--- a/helpcontent2/source/text/shared/autopi/01010300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010300.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010400.xhp b/helpcontent2/source/text/shared/autopi/01010400.xhp
index 70057ed3d4..400ee67a91 100644
--- a/helpcontent2/source/text/shared/autopi/01010400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010400.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@ YJ: checked</lastedited>
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies your address information.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERPLACEHOLDER" id="bm_id1062044" localize="false"/>
<paragraph role="heading" id="par_idN105E9" xml-lang="en-US" level="3" l10n="NEW">Use user data for return address</paragraph>
-<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from Tools - Options - %PRODUCTNAME - User data.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from %PRODUCTNAME - User Data in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERDEFINE" id="bm_id1482589" localize="false"/>
<paragraph role="heading" id="par_idN10603" xml-lang="en-US" level="3" l10n="NEW">New sender address</paragraph>
<paragraph role="paragraph" id="par_idN10606" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERDEFINE">Use the address data from the following text boxes.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01010500.xhp b/helpcontent2/source/text/shared/autopi/01010500.xhp
index 5ed08ce3a5..8e72d8d603 100644
--- a/helpcontent2/source/text/shared/autopi/01010500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010500.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01010600.xhp b/helpcontent2/source/text/shared/autopi/01010600.xhp
index b0c5a9bd15..ecc1bf86ff 100644
--- a/helpcontent2/source/text/shared/autopi/01010600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010600.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01020000.xhp b/helpcontent2/source/text/shared/autopi/01020000.xhp
index 86ef883c14..d72c1c3ceb 100644
--- a/helpcontent2/source/text/shared/autopi/01020000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01020100.xhp b/helpcontent2/source/text/shared/autopi/01020100.xhp
index 965f579c7a..2423a092f9 100755
--- a/helpcontent2/source/text/shared/autopi/01020100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020100.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01020200.xhp b/helpcontent2/source/text/shared/autopi/01020200.xhp
index d3dacbd680..44934df296 100755
--- a/helpcontent2/source/text/shared/autopi/01020200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020200.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -71,11 +68,11 @@ YJ: checked</lastedited>
<bookmark xml-lang="en-US" branch="hid/HID_OPTSENDERPLACEHOLDER" id="bm_id9913937" localize="false"/>
<paragraph role="heading" id="par_idN105F3" xml-lang="en-US" level="2" l10n="NEW">Salutation</paragraph>
<paragraph role="paragraph" id="par_idN105F7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a salutation. Select the salutation from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41136" id="bm_id2940153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41137" id="bm_id8901944" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTSENDERDEFINE" id="bm_id2940153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERNAME" id="bm_id8901944" localize="false"/>
<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Complimentary close</paragraph>
<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a greeting. Select the greeting from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41138" id="bm_id5031891" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERSTREET" id="bm_id5031891" localize="false"/>
<paragraph role="heading" id="par_idN10601" xml-lang="en-US" level="2" l10n="NEW">Footer</paragraph>
<paragraph role="paragraph" id="par_idN10605" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a footer.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020300.xhp" name="Go to Fax Wizard - Sender and Recipient">Go to Fax Wizard - Sender and Recipient</link></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01020300.xhp b/helpcontent2/source/text/shared/autopi/01020300.xhp
index d514b0ad64..bf9f5dbb93 100755
--- a/helpcontent2/source/text/shared/autopi/01020300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020300.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,24 +51,24 @@ YJ: checked</lastedited>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#autopilotfax3"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/41140" id="bm_id2698141" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERSTATE" id="bm_id2698141" localize="false"/>
<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Use user data for return address</paragraph>
<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41141" id="bm_id8446302" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERCITY" id="bm_id8446302" localize="false"/>
<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">New return address</paragraph>
<paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enter the address data in the following text boxes. The data is inserted as normal text in the fax document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41142" id="bm_id5530869" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41143" id="bm_id5629749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41144" id="bm_id6467787" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41145" id="bm_id3894466" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41146" id="bm_id5997192" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41147" id="bm_id9666737" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTSENDERFAX" id="bm_id5530869" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTRECEIVERPLACEHOLDER" id="bm_id5629749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTRECEIVERDATABASE" id="bm_id6467787" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTFOOTER" id="bm_id3894466" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_CHKFOOTERNEXTPAGES" id="bm_id5997192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_CHKFOOTERPAGENUMBERS" id="bm_id9666737" localize="false"/>
<paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="4" l10n="NEW">(Address data fields)</paragraph>
<paragraph role="paragraph" id="par_idN105EF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the sender address data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41148" id="bm_id1582384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_TXTTEMPLATENAME" id="bm_id1582384" localize="false"/>
<paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="3" l10n="NEW">Use placeholders as receiver address</paragraph>
<paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41149" id="bm_id6142765" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILETEMPLATEPATH" id="bm_id6142765" localize="false"/>
<paragraph role="heading" id="par_idN10600" xml-lang="en-US" level="3" l10n="NEW">Use address database for mail merge</paragraph>
<paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts database fields for a later mail merge with the fax document.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="CHG" oldref="21"><link href="text/shared/autopi/01020400.xhp" name="Go to Fax Wizard - Footer">Go to Fax Wizard - Footer</link></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01020400.xhp b/helpcontent2/source/text/shared/autopi/01020400.xhp
index dc0f7e4da2..ecc8d4a204 100755
--- a/helpcontent2/source/text/shared/autopi/01020400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020400.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,13 +51,13 @@ YJ: checked</lastedited>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#autopilotfax4"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/41158" id="bm_id6082033" localize="false"/>
+<!-- removed HID 41158 -->
<paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Footer</paragraph>
<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the text to be printed in the footer area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41159" id="bm_id5789971" localize="false"/>
+<!-- removed HID 41159 -->
<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Include only on second and following pages</paragraph>
<paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Suppresses the footer on the first page of a multipage fax document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41160" id="bm_id2247077" localize="false"/>
+<!-- removed HID 41160 -->
<paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="3" l10n="NEW">Include page number</paragraph>
<paragraph role="paragraph" id="par_idN105E7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints a page number in the footer area.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152812" xml-lang="en-US" l10n="CHG" oldref="19"><link href="text/shared/autopi/01020500.xhp" name="Go to Fax Wizard - Name and location">Go to Fax Wizard - Name and location</link></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01020500.xhp b/helpcontent2/source/text/shared/autopi/01020500.xhp
index 0825c2e278..6b24449171 100755
--- a/helpcontent2/source/text/shared/autopi/01020500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020500.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,16 +51,16 @@ YJ: checked</lastedited>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#autopilotfax5"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/41163" id="bm_id1817377" localize="false"/>
+<!-- removed HID 41163 -->
<paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Template name</paragraph>
<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the fax template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41167" id="bm_id7602160" localize="false"/>
+<!-- removed HID 41167 -->
<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2" l10n="NEW">...</paragraph>
<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to enter or select the complete path, including the file name of the fax template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41165" id="bm_id1115451" localize="false"/>
+<!-- removed HID 41165 -->
<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">Create a fax from this template</paragraph>
<paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates and saves the fax template, then opens a new fax document based on that template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41166" id="bm_id2092349" localize="false"/>
+<!-- removed HID 41166 -->
<paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="3" l10n="NEW">Make manual changes to this fax template</paragraph>
<paragraph role="paragraph" id="par_idN105F0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates and saves the fax template, then opens the template for further editing.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151119" xml-lang="en-US" l10n="CHG" oldref="35"><link href="text/shared/autopi/01020000.xhp" name="Go to Fax Wizard">Go to Fax Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01040000.xhp b/helpcontent2/source/text/shared/autopi/01040000.xhp
index 18c68e5e0e..d17be9ff44 100644
--- a/helpcontent2/source/text/shared/autopi/01040000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040100.xhp b/helpcontent2/source/text/shared/autopi/01040100.xhp
index 601e779e52..83dc960bd8 100755
--- a/helpcontent2/source/text/shared/autopi/01040100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040100.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040200.xhp b/helpcontent2/source/text/shared/autopi/01040200.xhp
index 6a76c6e56e..d3828063e9 100755
--- a/helpcontent2/source/text/shared/autopi/01040200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040200.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,15 +47,15 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#autopilotagenda2"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:DATEFIELD:DLG_WIZARD_AG:DLG_AG2_DFLD_METDAT" id="bm_id3149183" localize="false"/>
+<!-- removed HID SW:DATEFIELD:DLG_WIZARD_AG:DLG_AG2_DFLD_METDAT -->
<bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_DATE" id="bm_id619525" localize="false"/><paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="U" oldref="5">Date</paragraph>
<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:DATEFIELD:DLG_WIZARD_AG:DLG_AG2_DFLD_METDAT">Specifies the date of the meeting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:TIMEFIELD:DLG_WIZARD_AG:DLG_AG2_TFLD_METTIM" id="bm_id3147276" localize="false"/>
+<!-- removed HID SW:TIMEFIELD:DLG_WIZARD_AG:DLG_AG2_TFLD_METTIM -->
<bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_TIME" id="bm_id622272" localize="false"/><paragraph role="heading" id="hd_id3154749" xml-lang="en-US" level="2" l10n="U" oldref="7">Time</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:TIMEFIELD:DLG_WIZARD_AG:DLG_AG2_TFLD_METTIM">Specifies the time of the meeting.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_TITLE" id="bm_id88503" localize="false"/><paragraph role="heading" id="par_idN10625" xml-lang="en-US" level="2" l10n="NEW">Title</paragraph>
<paragraph role="paragraph" id="par_idN10629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the title of the meeting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_WIZARD_AG:DLG_AG2_EDIT_METORT" id="bm_id3150255" localize="false"/>
+<!-- removed HID SW:EDIT:DLG_WIZARD_AG:DLG_AG2_EDIT_METORT -->
<bookmark xml-lang="en-US" branch="hid/HID_AGWIZ_2_TXT_LOCATION" id="bm_id4133121" localize="false"/><paragraph role="heading" id="hd_id3150355" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Location</paragraph>
<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_WIZARD_AG:DLG_AG2_EDIT_METORT">Specifies the location of the meeting.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="CHG" oldref="21"><link href="text/shared/autopi/01040300.xhp" name="Go to Agenda Wizard - Headings to include">Go to Agenda Wizard - Headings to include</link></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01040300.xhp b/helpcontent2/source/text/shared/autopi/01040300.xhp
index 17c39b4198..14b9addc36 100755
--- a/helpcontent2/source/text/shared/autopi/01040300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040300.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040400.xhp b/helpcontent2/source/text/shared/autopi/01040400.xhp
index 14b60512fe..4f5272f49a 100755
--- a/helpcontent2/source/text/shared/autopi/01040400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040400.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040400.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040500.xhp b/helpcontent2/source/text/shared/autopi/01040500.xhp
index b72e9d93cf..6cf8307750 100755
--- a/helpcontent2/source/text/shared/autopi/01040500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040500.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040500.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01040600.xhp b/helpcontent2/source/text/shared/autopi/01040600.xhp
index 04ce505533..a08b4eed49 100755
--- a/helpcontent2/source/text/shared/autopi/01040600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01040600.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040600.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01050000.xhp b/helpcontent2/source/text/shared/autopi/01050000.xhp
index 9aa087918d..fbbd650aec 100644
--- a/helpcontent2/source/text/shared/autopi/01050000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,16 +34,11 @@
<title id="tit" xml-lang="en-US">Presentation Wizard</title>
<filename>/text/shared/autopi/01050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-05T11:02:05">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3159224"><bookmark_value>wizards; presentations</bookmark_value>
-<bookmark_value>presentations; wizards</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_AUTOPILOT" id="bm_id3154894" localize="false"/>
+<bookmark_value>presentations; wizards</bookmark_value></bookmark>
+<!-- removed HID SID_AUTOPILOT -->
<bookmark xml-lang="en-US" branch="hid/slot:10425" id="bm_id7406537" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotPresentations" id="bm_id3928952" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:NewPresentation" id="bm_id9551683" localize="false"/>
@@ -56,17 +48,17 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dtapt"/>
</section>
-<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
+<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link></emph> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="3">Within each wizard page, you can undo, modify, or skip altogether the editing steps. If you decide to skip over one of the pages, the wizard uses the default settings.</paragraph>
<embed href="text/shared/autopi/01050100.xhp#autopilotseite1"/>
<embed href="text/shared/autopi/01050200.xhp#autopilotseite2"/>
<embed href="text/shared/autopi/01050300.xhp#autopilotseite3"/>
<embed href="text/shared/autopi/01050400.xhp#autopilotseite4"/>
<embed href="text/shared/autopi/01050500.xhp#autopilotseite5"/>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_ASS:BUT_LAST" id="bm_id3156002" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_ASS:BUT_LAST" id="bm_id3156002" localize="false"/>
<paragraph role="heading" id="hd_id3159269" xml-lang="en-US" level="2" l10n="U" oldref="4">&lt;&lt; Back</paragraph>
<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SD:PUSHBUTTON:DLG_ASS:BUT_LAST">Returns to the previous step without deleting your current settings.</ahelp> You can only select this button after the second editing step.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_ASS:BUT_NEXT" id="bm_id3153665" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_ASS:BUT_NEXT" id="bm_id3153665" localize="false"/>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="2" l10n="U" oldref="6">Next &gt;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3156307" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SD:PUSHBUTTON:DLG_ASS:BUT_NEXT">Accepts the new settings and moves to the next page.</ahelp> You will not be able to select this button in the last editing step.</paragraph>
<paragraph role="heading" id="hd_id3156327" xml-lang="en-US" level="2" l10n="U" oldref="8">Create</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01050100.xhp b/helpcontent2/source/text/shared/autopi/01050100.xhp
index 8880d6792d..a353fcfb8d 100755
--- a/helpcontent2/source/text/shared/autopi/01050100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050100.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,16 +51,16 @@ dedr: fixed #i31165#</lastedited>
</section>
<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="15">Type</paragraph>
<paragraph role="paragraph" id="par_id3153684" xml-lang="en-US" l10n="U" oldref="23">You can determine the presentation type in this area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_EMPTY" id="bm_id3153749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY" id="bm_id3153749" localize="false"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="3" l10n="U" oldref="16">Empty presentation</paragraph>
<paragraph role="paragraph" id="par_id3149388" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_EMPTY">Creates a new (empty) presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_TEMPLATE" id="bm_id3153346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE" id="bm_id3153346" localize="false"/>
<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="3" l10n="U" oldref="17">From template</paragraph>
<paragraph role="paragraph" id="par_id3154318" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_TEMPLATE">Opens a list box containing various modifiable presentations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_OPEN" id="bm_id3166460" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN" id="bm_id3166460" localize="false"/>
<paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="3" l10n="U" oldref="18">Open existing presentation</paragraph>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE1_OPEN">Displays a list of previously created presentations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_PushButton_DLG_ASS_PB_PAGE1_OPEN" id="bm_id5456099" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_ASS:PB_PAGE1_OPEN" id="bm_id5456099" localize="false"/>
<paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click <emph>Open</emph> to see a file selection dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_REGION" id="bm_id3156002" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_TEMPLATES" id="bm_id3155136" localize="false"/>
@@ -71,13 +68,13 @@ dedr: fixed #i31165#</lastedited>
<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SD_AUTOPILOT_TEMPLATES">Lists the available template categories for presentations.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_OPEN" id="bm_id3153665" localize="false"/>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="20">List of existing presentations (only available when you select the Open existing presentation option)</paragraph>
-<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PREVIEW" id="bm_id3156192" localize="false"/>
+<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>%PRODUCTNAME - Paths</emph> in the Options dialog box. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_PREVIEW" id="bm_id3156192" localize="false"/>
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
<paragraph role="paragraph" id="par_id3150256" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PREVIEW">Specifies that templates appear in the preview window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_STARTWITH" id="bm_id3145609" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_STARTWITH" id="bm_id3145609" localize="false"/>
<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="22">Do not show this dialog again</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3159414" xml-lang="en-US" l10n="U" oldref="13">Continue here to <link href="text/shared/autopi/01050200.xhp" name="Wizard Page 2">Wizard Page 2</link>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01050200.xhp b/helpcontent2/source/text/shared/autopi/01050200.xhp
index 0f03077820..1d09621d93 100755
--- a/helpcontent2/source/text/shared/autopi/01050200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,18 +47,18 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dtapsz"/>
</section>
- <bookmark branch="hid/HID_SD_AUTOPILOT_PAGETEMPLATES" xml-lang="en-US" id="bm_id3153311"/><bookmark branch="hid/SD:LISTBOX:DLG_ASS:LB_PAGE2_LAYOUT" xml-lang="en-US" id="bm_id3152552"/><paragraph role="heading" level="2" id="hd_id3153749" l10n="U" xml-lang="en-US" oldref="20">Select a slide design</paragraph>
+ <bookmark branch="hid/HID_SD_AUTOPILOT_PAGETEMPLATES" xml-lang="en-US" id="bm_id3153311"/><bookmark branch="hid/sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT" xml-lang="en-US" id="bm_id3152552"/><paragraph role="heading" level="2" id="hd_id3153749" l10n="U" xml-lang="en-US" oldref="20">Select a slide design</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155338" xml-lang="en-US" oldref="26"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE2_LAYOUT" visibility="visible">Allows you to select a slide design for the presentation you selected on page 1 of the Wizard.</ahelp> In the upper list box you can choose from three slide design types (education, presentation backgrounds and presentations). In the lower list box, you can select one of the templates for your presentation.</paragraph>
<paragraph role="heading" level="2" id="hd_id3149177" l10n="U" xml-lang="en-US" oldref="21">Select an output medium</paragraph>
- <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM5" xml-lang="en-US" id="bm_id3152781"/><paragraph role="heading" level="3" id="hd_id3153681" l10n="U" xml-lang="en-US" oldref="32">Original</paragraph>
+ <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5" xml-lang="en-US" id="bm_id3152781"/><paragraph role="heading" level="3" id="hd_id3153681" l10n="U" xml-lang="en-US" oldref="32">Original</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3156347" xml-lang="en-US" oldref="33"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM5" visibility="visible">Uses the original page format of the template.</ahelp></paragraph>
- <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM3" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3147653" l10n="U" xml-lang="en-US" oldref="23">Overhead sheet</paragraph>
+ <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3147653" l10n="U" xml-lang="en-US" oldref="23">Overhead sheet</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153032" xml-lang="en-US" oldref="30"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM3" visibility="visible">Creates a presentation to be used as overhead transparencies.</ahelp></paragraph>
- <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM4" xml-lang="en-US" id="bm_id3146948"/><paragraph role="heading" level="3" id="hd_id3148685" l10n="U" xml-lang="en-US" oldref="24">Paper</paragraph>
+ <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4" xml-lang="en-US" id="bm_id3146948"/><paragraph role="heading" level="3" id="hd_id3148685" l10n="U" xml-lang="en-US" oldref="24">Paper</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155419" xml-lang="en-US" oldref="31"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM4" visibility="visible">Creates a presentation that can be printed on paper.</ahelp></paragraph>
- <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM1" xml-lang="en-US" id="bm_id3153349"/><paragraph role="heading" level="3" id="hd_id3148491" l10n="U" xml-lang="en-US" oldref="25">Screen</paragraph>
+ <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1" xml-lang="en-US" id="bm_id3153349"/><paragraph role="heading" level="3" id="hd_id3148491" l10n="U" xml-lang="en-US" oldref="25">Screen</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3145119" xml-lang="en-US" oldref="28"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM1" visibility="visible">Creates a computer screen presentation only.</ahelp> The screen is adjusted by default.</paragraph>
- <bookmark branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM2" xml-lang="en-US" id="bm_id3149579"/><paragraph role="heading" level="3" id="hd_id3154898" l10n="U" xml-lang="en-US" oldref="22">Slide</paragraph>
+ <bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2" xml-lang="en-US" id="bm_id3149579"/><paragraph role="heading" level="3" id="hd_id3154898" l10n="U" xml-lang="en-US" oldref="22">Slide</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153821" xml-lang="en-US" oldref="29"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM2" visibility="visible">Creates a presentation to be used as slides.</ahelp></paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3155388" l10n="U" oldref="12">Continue to <link href="text/shared/autopi/01050300.xhp" name="Presentation Wizard Page 3">Presentation Wizard Page 3</link>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01050300.xhp b/helpcontent2/source/text/shared/autopi/01050300.xhp
index 4a623373f6..5f54b2ef8f 100755
--- a/helpcontent2/source/text/shared/autopi/01050300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,9 +48,9 @@
</section>
<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="2">Select a slide transition</paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_SD_AUTOPILOT_PAGE3">Assigns special effects to your presentation and determines its speed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_ASS:LB_PAGE3_EFFECT" id="bm_id3155535" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="3" l10n="U" oldref="4">Effect</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT" id="bm_id3155535" localize="false"/><paragraph role="heading" id="hd_id3147088" xml-lang="en-US" level="3" l10n="U" oldref="4">Effect</paragraph>
<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE3_EFFECT">Specifies an effect for your presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_ASS:LB_PAGE3_SPEED" id="bm_id3155892" localize="false"/><paragraph role="heading" id="hd_id3153346" xml-lang="en-US" level="3" l10n="U" oldref="6">Speed</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_ASS:LB_PAGE3_SPEED" id="bm_id3155892" localize="false"/><paragraph role="heading" id="hd_id3153346" xml-lang="en-US" level="3" l10n="U" oldref="6">Speed</paragraph>
<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE3_SPEED">Determines the effect speed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="8">Select the presentation type</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="9">Determines the timing for the presentation.</paragraph>
@@ -69,15 +66,15 @@
<default><paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="22">You can change the settings later under the menu <link href="text/simpress/main0114.xhp" name="Presentation">Presentation</link>.</paragraph>
</default>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_LIVE" id="bm_id3155136" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="10">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE" id="bm_id3155136" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="10">Default</paragraph>
<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_LIVE">The <emph>Default</emph> option runs the presentation as a full screen presentation with the specified speed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_KIOSK" id="bm_id3156153" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK" id="bm_id3156153" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="12">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE3_KIOSK">Runs the presentation automatically, and restarts it again after a break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_TIME" id="bm_id3155434" localize="false"/><paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="14">Duration of page</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:DLG_ASS:TMF_PAGE3_TIME" id="bm_id3155434" localize="false"/><paragraph role="heading" id="hd_id3150085" xml-lang="en-US" level="3" l10n="U" oldref="14">Duration of page</paragraph>
<paragraph role="paragraph" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_TIME">Defines the duration of each presentation page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_BREAK" id="bm_id3144510" localize="false"/><paragraph role="heading" id="hd_id3155922" xml-lang="en-US" level="3" l10n="U" oldref="16">Duration of pause</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK" id="bm_id3144510" localize="false"/><paragraph role="heading" id="hd_id3155922" xml-lang="en-US" level="3" l10n="U" oldref="16">Duration of pause</paragraph>
<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SD:TIMEFIELD:DLG_ASS:TMF_PAGE3_BREAK">Defines the pause between each presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PAGE3_LOGO" id="bm_id3149047" localize="false"/><paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="3" l10n="U" oldref="18">Show logo</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO" id="bm_id3149047" localize="false"/><paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="3" l10n="U" oldref="18">Show logo</paragraph>
<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PAGE3_LOGO">Specifies whether to display the $[officename] logo during the pause between each presentation.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="20">Click here to continue to <link href="text/shared/autopi/01050400.xhp" name="page 4 of the Presentation Wizard">page 4 of the Presentation Wizard</link>. The wizard ends here if you selected the "Empty presentation" option on page 1 of the Wizard.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01050400.xhp b/helpcontent2/source/text/shared/autopi/01050400.xhp
index 5bd5208f9e..010e8ef6a3 100755
--- a/helpcontent2/source/text/shared/autopi/01050400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050400.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,11 +48,11 @@
<embed href="text/shared/00/00000401.xhp#dtapsv"/>
</section>
<paragraph role="heading" level="2" id="hd_id3147571" l10n="U" xml-lang="en-US" oldref="29">Describe your basic ideas</paragraph>
- <bookmark branch="hid/SD:EDIT:DLG_ASS:EDT_PAGE4_ASKNAME" xml-lang="en-US" id="bm_id3145071"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="30">What is your name or the name of your company?</paragraph>
+ <bookmark branch="hid/sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME" xml-lang="en-US" id="bm_id3145071"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="30">What is your name or the name of your company?</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149182" xml-lang="en-US" oldref="34"><ahelp hid="SD:EDIT:DLG_ASS:EDT_PAGE4_ASKNAME" visibility="visible">Specifies your name or the name of your company.</ahelp></paragraph>
- <bookmark branch="hid/SD:EDIT:DLG_ASS:EDT_PAGE4_ASKTOPIC" xml-lang="en-US" id="bm_id3152551"/><paragraph role="heading" level="3" id="hd_id3156410" l10n="U" xml-lang="en-US" oldref="31">What is the subject of your presentation?</paragraph>
+ <bookmark branch="hid/sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC" xml-lang="en-US" id="bm_id3152551"/><paragraph role="heading" level="3" id="hd_id3156410" l10n="U" xml-lang="en-US" oldref="31">What is the subject of your presentation?</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149177" xml-lang="en-US" oldref="35"><ahelp hid="SD:EDIT:DLG_ASS:EDT_PAGE4_ASKTOPIC" visibility="visible">Specifies the topic of your presentation.</ahelp></paragraph>
- <bookmark branch="hid/SD:MULTILINEEDIT:DLG_ASS:EDT_PAGE4_ASKINFORMATION" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3146797" l10n="U" xml-lang="en-US" oldref="32">Further ideas to be presented?</paragraph>
+ <bookmark branch="hid/sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION" xml-lang="en-US" id="bm_id3147210"/><paragraph role="heading" level="3" id="hd_id3146797" l10n="U" xml-lang="en-US" oldref="32">Further ideas to be presented?</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3149398" xml-lang="en-US" oldref="36"><ahelp hid="SD:MULTILINEEDIT:DLG_ASS:EDT_PAGE4_ASKINFORMATION" visibility="visible">Use this field for further thoughts and ideas that you would like to cover later in your presentation.</ahelp></paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3157909" l10n="U" oldref="11">Continue to <link href="text/shared/autopi/01050500.xhp" name="Presentation Wizard Page 5">Presentation Wizard Page 5</link>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01050500.xhp b/helpcontent2/source/text/shared/autopi/01050500.xhp
index bbeb2ab3c0..12a3f9ac75 100755
--- a/helpcontent2/source/text/shared/autopi/01050500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050500.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
</section>
<paragraph role="heading" id="hd_id3150178" xml-lang="en-US" level="2" l10n="U" oldref="19">Choose your pages</paragraph>
<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="CHG" oldref="21">In the list field, you see all pages belonging to the selected presentation template. All pages with a checkmark in the check box next to their names will be included in the created presentation. To not include a page, clear the check box in front of the page name. Click the small plus sign that is next to the page name to display the corresponding sub-items.<comment>UFI: fixes #112852#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PAGE5_SUMMARY" id="bm_id3145136" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY" id="bm_id3145136" localize="false"/>
<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="20">Create summary</paragraph>
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PAGE5_SUMMARY">Creates a summary of all presentation contents.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="23">Return to the <link href="text/shared/autopi/01050000.xhp" name="Presentation Wizard">Presentation Wizard</link> title page.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01090000.xhp b/helpcontent2/source/text/shared/autopi/01090000.xhp
index a8f6b09f17..229cca8fdf 100755
--- a/helpcontent2/source/text/shared/autopi/01090000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090000.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090100.xhp b/helpcontent2/source/text/shared/autopi/01090100.xhp
index 92c026a80a..2c075d6911 100755
--- a/helpcontent2/source/text/shared/autopi/01090100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090100.xhp,v $
- * $Revision: 1.14.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,60 +45,60 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_LBTABLES" id="bm_id3154751" localize="false"/>
+<!-- removed HID HID_DLGFORM_LBTABLES -->
<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"/>
+<!-- removed HID HID_DLGFORM_FIELDSAVAILABLE -->
<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"/>
+<!-- removed HID DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS -->
<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"/>
+<!-- removed HID HID_DLGFORM_CMDMOVESELECTED -->
<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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT -->
<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"/>
+<!-- removed HID HID_DLGFORM_CMDMOVEALL -->
<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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT -->
<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"/>
+<!-- removed HID HID_DLGFORM_CMDREMOVESELECTED -->
<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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT -->
<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"/>
+<!-- removed HID HID_DLGFORM_CMDREMOVEALL -->
<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"/>
+<!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT -->
<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>
@@ -127,7 +124,7 @@
<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"/>
+<!-- removed HID HID_DLGFORM_FIELDSSELECTED -->
<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>
diff --git a/helpcontent2/source/text/shared/autopi/01090200.xhp b/helpcontent2/source/text/shared/autopi/01090200.xhp
index 8f19fec2d3..9a34cd5195 100755
--- a/helpcontent2/source/text/shared/autopi/01090200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090200.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090210.xhp b/helpcontent2/source/text/shared/autopi/01090210.xhp
index 88f9e1b00e..f591fbda74 100755
--- a/helpcontent2/source/text/shared/autopi/01090210.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090210.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090210.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090220.xhp b/helpcontent2/source/text/shared/autopi/01090220.xhp
index a7d665bb8b..e69896c7ad 100755
--- a/helpcontent2/source/text/shared/autopi/01090220.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090220.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090220.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090300.xhp b/helpcontent2/source/text/shared/autopi/01090300.xhp
index 13b0b52b4f..82dd7c209b 100755
--- a/helpcontent2/source/text/shared/autopi/01090300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090300.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090400.xhp b/helpcontent2/source/text/shared/autopi/01090400.xhp
index 5d175139c7..ea8faca64b 100755
--- a/helpcontent2/source/text/shared/autopi/01090400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090400.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090500.xhp b/helpcontent2/source/text/shared/autopi/01090500.xhp
index c626f64140..0ccecc6175 100755
--- a/helpcontent2/source/text/shared/autopi/01090500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090500.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01090600.xhp b/helpcontent2/source/text/shared/autopi/01090600.xhp
index 3dbbf76556..cdd22d17cc 100755
--- a/helpcontent2/source/text/shared/autopi/01090600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090600.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090600.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100000.xhp b/helpcontent2/source/text/shared/autopi/01100000.xhp
index d98e06c15c..82e4bfb157 100755
--- a/helpcontent2/source/text/shared/autopi/01100000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100000.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100100.xhp b/helpcontent2/source/text/shared/autopi/01100100.xhp
index 0dfe78a897..edf309b6d7 100755
--- a/helpcontent2/source/text/shared/autopi/01100100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100100.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100150.xhp b/helpcontent2/source/text/shared/autopi/01100150.xhp
index 1e2b84fa4a..d5196bf6f8 100755
--- a/helpcontent2/source/text/shared/autopi/01100150.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100150.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100150.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100200.xhp b/helpcontent2/source/text/shared/autopi/01100200.xhp
index 48194d32cc..37e2951c3a 100755
--- a/helpcontent2/source/text/shared/autopi/01100200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100200.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100300.xhp b/helpcontent2/source/text/shared/autopi/01100300.xhp
index 8cca83df98..8329e3af14 100755
--- a/helpcontent2/source/text/shared/autopi/01100300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100300.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100400.xhp b/helpcontent2/source/text/shared/autopi/01100400.xhp
index eabac575a4..457a357cbc 100755
--- a/helpcontent2/source/text/shared/autopi/01100400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100400.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01100500.xhp b/helpcontent2/source/text/shared/autopi/01100500.xhp
index 062f8612eb..e75d6adbbb 100755
--- a/helpcontent2/source/text/shared/autopi/01100500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01100500.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01110000.xhp b/helpcontent2/source/text/shared/autopi/01110000.xhp
index 6238fd3da8..8145f9552a 100644
--- a/helpcontent2/source/text/shared/autopi/01110000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01110100.xhp b/helpcontent2/source/text/shared/autopi/01110100.xhp
index fd6f10fe09..285745cee2 100755
--- a/helpcontent2/source/text/shared/autopi/01110100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="2" l10n="U" oldref="12">Assign design</paragraph>
<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="13">In this area, you can choose to create a new design and select or delete an existing design.</paragraph>
<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="3">If you delete a design, you will only delete the design information in the Wizard. An export file will not be deleted by this action.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_NEW_DESIGN" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN" id="bm_id3154318" localize="false"/>
<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="4">New design</paragraph>
<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_NEW_DESIGN">Creates a new design in the next pages of the Wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_OLD_DESIGN" id="bm_id3147577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN" id="bm_id3147577" localize="false"/>
<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="6">Existing Design</paragraph>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE1_OLD_DESIGN">Loads an existing design from the design list to use as a starting point for the steps to follow on the next pages of the Wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_PUBLISHING:PAGE1_DESIGNS" id="bm_id3156346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS" id="bm_id3156346" localize="false"/>
<paragraph role="heading" id="hd_id3152996" xml-lang="en-US" level="2" l10n="U" oldref="8">Design list</paragraph>
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SD:LISTBOX:DLG_PUBLISHING:PAGE1_DESIGNS">Displays all existing designs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE1_DEL_DESIGN" id="bm_id3150986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN" id="bm_id3150986" localize="false"/>
<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="2" l10n="U" oldref="10">Delete Selected Design</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE1_DEL_DESIGN">Deletes the selected design from the design list.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01110200.xhp b/helpcontent2/source/text/shared/autopi/01110200.xhp
index 05a4ad6128..6f161e832c 100644
--- a/helpcontent2/source/text/shared/autopi/01110200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110200.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,36 +58,36 @@
</section>
<paragraph role="heading" id="hd_id3152924" xml-lang="en-US" level="2" l10n="U" oldref="9">Publication type</paragraph>
<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="10">Defines the basic settings for the intended export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_STANDARD" id="bm_id3157958" localize="false"/><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="U" oldref="3">Standard HTML format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD" id="bm_id3157958" localize="false"/><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="U" oldref="3">Standard HTML format</paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_STANDARD">Creates standard HTML pages from export pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_FRAMES" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Standard HTML with frames</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES" id="bm_id3147009" localize="false"/><paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Standard HTML with frames</paragraph>
<paragraph role="paragraph" id="par_id3154824" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_FRAMES">Creates standard HTML pages with frames. The exported page will be placed in the main frame, and the frame to the left will display a table of contents in the form of hyperlinks.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE2_CONTENT" id="bm_id3147242" localize="false"/><paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="11">Create title page</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT" id="bm_id3147242" localize="false"/><paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="3" l10n="U" oldref="11">Create title page</paragraph>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE2_CONTENT">Creates a title page for your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE2_NOTES" id="bm_id3149236" localize="false"/><paragraph role="heading" id="hd_id3163804" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="IMPRESS">Show notes
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES" id="bm_id3149236" localize="false"/><paragraph role="heading" id="hd_id3163804" xml-lang="en-US" level="3" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="IMPRESS">Show notes
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE2_NOTES">Specifies that your notes are also displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_KIOSK" id="bm_id3147336" localize="false"/><paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="2" l10n="U" oldref="15">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK" id="bm_id3147336" localize="false"/><paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="2" l10n="U" oldref="15">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_KIOSK">Creates a default HTML presentation as a kiosk export, in which the slides are automatically advanced after a specified amount of time.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_DEFAULT" id="bm_id3156327" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="17">As stated in document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_DEFAULT" id="bm_id3156327" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="17">As stated in document</paragraph>
<paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_DEFAULT">The slide transition depends on the timing that you set for each slide in the presentation. If you set a manual page transition, the HTML presentation introduces a new page by pressing any key from your keyboard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_AUTO" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3156307" xml-lang="en-US" level="3" l10n="U" oldref="19">Automatic</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_AUTO" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3156307" xml-lang="en-US" level="3" l10n="U" oldref="19">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_CHG_AUTO">The page transition takes place automatically after the specified period of time elapses and does not depend on the presentation's contents</ahelp>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:TIMEFIELD:DLG_PUBLISHING:PAGE2_DURATION_TMF" id="bm_id3152472" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="21">Slide view time</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:TimeField:DLG_PUBLISHING:PAGE2_DURATION_TMF" id="bm_id3152472" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="21">Slide view time</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:TIMEFIELD:DLG_PUBLISHING:PAGE2_DURATION_TMF">Defines the amount of time for each slide display.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE2_ENDLESS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="23">Endless</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE2_ENDLESS" id="bm_id3149294" localize="false"/><paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="23">Endless</paragraph>
<paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE2_ENDLESS">Automatically restarts the HTML presentation after the last slide has been displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_WEBCAST" id="bm_id3152811" localize="false"/><paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="2" l10n="U" oldref="25">WebCast</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST" id="bm_id3152811" localize="false"/><paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="2" l10n="U" oldref="25">WebCast</paragraph>
<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_WEBCAST">In a WebCast export, automatic scripts will be generated with Perl or ASP support.</ahelp> This enables the speaker (for example, a speaker in a telephone conference using a slide show on the Internet) to change the slides in the audience's web browsers. You will find more information on <link href="text/shared/autopi/01110200.xhp" name="WebCast">WebCast</link> later in this section.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_ASP" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="27">Active Server Pages (ASP)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="27">Active Server Pages (ASP)</paragraph>
<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_ASP">When you select the<emph> ASP </emph>option, the WebCast export creates ASP pages. Note that the HTML presentation can only be offered by a web server supporting ASP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_PERL" id="bm_id3152920" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="29">Perl</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL" id="bm_id3152920" localize="false"/><paragraph role="heading" id="hd_id3149765" xml-lang="en-US" level="3" l10n="U" oldref="29">Perl</paragraph>
<paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE2_PERL">Used by WebCast export to create HTML pages and Perl scripts.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE2_INDEX" id="bm_id3151382" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="4" l10n="U" oldref="31">URL for listeners</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE2_INDEX" id="bm_id3151382" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="4" l10n="U" oldref="31">URL for listeners</paragraph>
<paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE2_INDEX">Specifies the URL (absolute or relative) to be entered by the viewer in order to see the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE2_URL" id="bm_id3154218" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="4" l10n="U" oldref="33">URL for presentation</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE2_URL" id="bm_id3154218" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="4" l10n="U" oldref="33">URL for presentation</paragraph>
<paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE2_URL">Specifies the URL (absolute or relative), where the created HTML presentation on the web server has been saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE2_CGI" id="bm_id3155429" localize="false"/><paragraph role="heading" id="hd_id3153367" xml-lang="en-US" level="4" l10n="U" oldref="35">URL for Perl scripts</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE2_CGI" id="bm_id3155429" localize="false"/><paragraph role="heading" id="hd_id3153367" xml-lang="en-US" level="4" l10n="U" oldref="35">URL for Perl scripts</paragraph>
<paragraph role="paragraph" id="par_id3159255" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE2_CGI">Specifies the URL (absolute or relative) for the generated Perl scripts.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150486" xml-lang="en-US" level="2" l10n="U" oldref="37">More Information on WebCast Export</paragraph>
<paragraph role="paragraph" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="38">There are two possible options for exporting $[officename] Impress presentations using WebCast technology: Active Server Pages (ASP) and Perl.</paragraph>
@@ -99,7 +96,7 @@
<paragraph role="heading" id="hd_id3159197" xml-lang="en-US" level="3" l10n="U" oldref="40">Exporting</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="41">To export to ASP, in a $[officename] Impress document choose <emph>File - Export</emph>. You then see the <emph>Export</emph> dialog in which you select <emph>HTML Document</emph> as the file type. Once you have selected a directory and entered a file name, click <emph>Save</emph>. For export as ASP, we recommend selecting a "secret" file name for the HTML file (see below for more details). You then see the <emph>HTML Export</emph> dialog. Several files will be written to the directory you have just selected.</paragraph>
+<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="41">To export to ASP, in a $[officename] Impress document choose <emph>File - Export</emph>. You then see the <emph>Export</emph> dialog in which you select <emph>HTML Document</emph> as the file type. Once you have selected a directory and entered a file name, click <emph>Export</emph>. For export as ASP, we recommend selecting a "secret" file name for the HTML file (see below for more details). You then see the <emph>HTML Export</emph> dialog. Several files will be written to the directory you have just selected.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149410" xml-lang="en-US" l10n="U" oldref="42">The presenter uses the entered file name to change between the slides viewed by the audience. You can save the WebCast files locally or save them directly to an HTTP server. You can later transfer locally saved files to the HTTP server by FTP. Note that WebCast only works if the files are requested over an HTTP server.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01110300.xhp b/helpcontent2/source/text/shared/autopi/01110300.xhp
index cd12a9927f..7e722d73a5 100755
--- a/helpcontent2/source/text/shared/autopi/01110300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,23 +49,23 @@
</section>
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="11">Save graphics as</paragraph>
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="12">Determines the image format. You can also define the compression value for the export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PUBLISHING_PAGE3_PNG" id="bm_id9604480" localize="false"/><paragraph role="heading" id="hd_id2298959" xml-lang="en-US" level="3" l10n="NEW">PNG - Portable Network Graphics format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG" id="bm_id9604480" localize="false"/><paragraph role="heading" id="hd_id2298959" xml-lang="en-US" level="3" l10n="NEW">PNG - Portable Network Graphics format</paragraph>
<paragraph role="paragraph" id="par_id4653767" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The files are exported as PNG files. PNG files are compressed without loss of data, and can contain more than 256 colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_GIF" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="3" l10n="U" oldref="13">GIF - Graphics Interchange Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="3" l10n="U" oldref="13">GIF - Graphics Interchange Format</paragraph>
<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_GIF">The files are exported as GIF files. GIF files are compressed without loss of data, and have a maximum of 256 colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_JPG" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="15">JPG - Compressed file format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="15">JPG - Compressed file format</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_JPG">The files are exported as JPEG files. JPEG files are compressed, with adjustable compression and can contain more than 256 colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:COMBOBOX:DLG_PUBLISHING:PAGE3_QUALITY" id="bm_id3156023" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="17">Quality</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY" id="bm_id3156023" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="17">Quality</paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:COMBOBOX:DLG_PUBLISHING:PAGE3_QUALITY">Specifies the compression factor of the JPEG graphic. A 100% value offers the best quality for a large data range. The 25% factor indicates small files with inferior image quality.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="2" l10n="U" oldref="19">Monitor resolution</paragraph>
<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="20">Defines the resolution for the target screen. Depending on the selected resolution, the image will be displayed in a reduced size. You can specify a reduction of up to 80% from the original size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_1" id="bm_id3154389" localize="false"/><paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Low resolution (640x480 pixels)</paragraph><comment>see i73719</comment><paragraph role="paragraph" id="par_id3153380" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_1">Select the low resolution to keep the file size small, even for presentations with many slides.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_2" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3153361" xml-lang="en-US" level="3" l10n="CHG" oldref="23">Medium resolution (800x600 pixels)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1" id="bm_id3154389" localize="false"/><paragraph role="heading" id="hd_id3152361" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Low resolution (640x480 pixels)</paragraph><comment>see i73719</comment><paragraph role="paragraph" id="par_id3153380" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_1">Select the low resolution to keep the file size small, even for presentations with many slides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3153361" xml-lang="en-US" level="3" l10n="CHG" oldref="23">Medium resolution (800x600 pixels)</paragraph>
<paragraph role="paragraph" id="par_id3154686" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_2">Select the medium resolution for a medium-sized presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_3" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="25">High resolution (1024x768 pixels)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3" id="bm_id3149167" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="25">High resolution (1024x768 pixels)</paragraph>
<paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_RESOLUTION_3">Select a high resolution for a high quality slide display.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154946" xml-lang="en-US" level="2" l10n="U" oldref="31">Export</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE3_SLD_SOUND" id="bm_id3148672" localize="false"/><paragraph role="heading" id="hd_id3151381" xml-lang="en-US" level="3" l10n="U" oldref="29">Export sounds when slide advances</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND" id="bm_id3148672" localize="false"/><paragraph role="heading" id="hd_id3151381" xml-lang="en-US" level="3" l10n="U" oldref="29">Export sounds when slide advances</paragraph>
<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE3_SLD_SOUND">Specifies that the sound files that are defined as an effect for slide transitions are exported.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01110400.xhp b/helpcontent2/source/text/shared/autopi/01110400.xhp
index 9befa72476..ade99d346c 100755
--- a/helpcontent2/source/text/shared/autopi/01110400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110400.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,19 +52,19 @@
<embed href="text/shared/00/00000401.xhp#htmlspeichern4"/>
</section>
<paragraph role="heading" id="hd_id3155392" xml-lang="en-US" level="2" l10n="U" oldref="15">Information for the title page</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE4_AUTHOR" id="bm_id3155338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR" id="bm_id3155338" localize="false"/>
<paragraph role="heading" id="hd_id3155941" xml-lang="en-US" level="3" l10n="U" oldref="3">Author</paragraph>
<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE4_AUTHOR">Specifies the name of the publication's author.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE4_EMAIL_EDIT" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT" id="bm_id3145346" localize="false"/>
<paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3" l10n="U" oldref="5">E-mail address</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE4_EMAIL_EDIT">Specifies the e-mail address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:EDIT:DLG_PUBLISHING:PAGE4_WWW_EDIT" id="bm_id3163803" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT" id="bm_id3163803" localize="false"/>
<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="7">Your homepage</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:EDIT:DLG_PUBLISHING:PAGE4_WWW_EDIT">Specifies your homepage. A hyperlink will be inserted in the publication.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:MULTILINEEDIT:DLG_PUBLISHING:PAGE4_MISC" id="bm_id3149236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC" id="bm_id3149236" localize="false"/>
<paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="3" l10n="U" oldref="9">Additional information</paragraph>
<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD:MULTILINEEDIT:DLG_PUBLISHING:PAGE4_MISC">Specifies additional text to appear on the title page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE4_DOWNLOAD" id="bm_id3157910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD" id="bm_id3157910" localize="false"/>
<paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="17"><switchinline select="appl"><caseinline select="IMPRESS">Link to a copy of the original presentation
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147619" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="appl"><caseinline select="IMPRESS"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE4_DOWNLOAD">Inserts a hyperlink to download a copy of the presentation file.</ahelp>
diff --git a/helpcontent2/source/text/shared/autopi/01110500.xhp b/helpcontent2/source/text/shared/autopi/01110500.xhp
index 3659692ff1..be142b3715 100755
--- a/helpcontent2/source/text/shared/autopi/01110500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110500.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
</section>
<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="7">Select button style</paragraph>
<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="U" oldref="8">Specifies whether you want to insert navigation buttons in your presentation. You can also select the style of the buttons.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_PUBLISHING:PAGE5_TEXTONLY" id="bm_id3143268" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY" id="bm_id3143268" localize="false"/>
<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="3">Text only</paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:CHECKBOX:DLG_PUBLISHING:PAGE5_TEXTONLY">Inserts only text hyperlinks instead of buttons.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156411" xml-lang="en-US" level="2" l10n="U" oldref="5">Selection field</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01110600.xhp b/helpcontent2/source/text/shared/autopi/01110600.xhp
index 683a45c9bd..c68c380190 100755
--- a/helpcontent2/source/text/shared/autopi/01110600.xhp
+++ b/helpcontent2/source/text/shared/autopi/01110600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110600.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,28 +53,28 @@
</section>
<paragraph role="heading" id="hd_id3152924" xml-lang="en-US" level="2" l10n="U" oldref="21">Select color scheme</paragraph>
<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="22">Determines the color scheme and the colors for text and background.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DOCCOLORS" id="bm_id3145090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS" id="bm_id3145090" localize="false"/>
<paragraph role="heading" id="hd_id3147291" xml-lang="en-US" level="3" l10n="U" oldref="23">Apply color scheme from document</paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DOCCOLORS">Determines the colors from the styles used in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DEFAULT" id="bm_id3146958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT" id="bm_id3146958" localize="false"/>
<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="25">Use browser colors</paragraph>
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_DEFAULT">Uses the default colors of the viewer's Web Browser.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_USER" id="bm_id3152997" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE6_USER" id="bm_id3152997" localize="false"/>
<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="3" l10n="U" oldref="27">Use custom color scheme</paragraph>
<paragraph role="paragraph" id="par_id3149399" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE6_USER">Allows you to define your own colors for some presentation objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_TEXT" id="bm_id3145382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT" id="bm_id3145382" localize="false"/>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="8">Text</paragraph>
<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_TEXT">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the text color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_LINK" id="bm_id3155389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_LINK" id="bm_id3155389" localize="false"/>
<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="10">Hyperlink</paragraph>
<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_LINK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the hyperlink color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_ALINK" id="bm_id3153825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK" id="bm_id3153825" localize="false"/>
<paragraph role="heading" id="hd_id3149234" xml-lang="en-US" level="3" l10n="U" oldref="14">Active Link</paragraph>
<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_ALINK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the active link color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_VLINK" id="bm_id3153822" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK" id="bm_id3153822" localize="false"/>
<paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="12">Visited Link</paragraph>
<paragraph role="paragraph" id="par_id3150670" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_VLINK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the visited link color of the presentation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_BACK" id="bm_id3152360" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:PushButton:DLG_PUBLISHING:PAGE6_BACK" id="bm_id3152360" localize="false"/>
<paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="3" l10n="U" oldref="7">Background</paragraph>
<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:PUSHBUTTON:DLG_PUBLISHING:PAGE6_BACK">Opens the <link href="text/shared/optionen/01010501.xhp" name="Color"><emph>Color</emph></link> dialog, where you can select the background color of the presentation.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01120000.xhp b/helpcontent2/source/text/shared/autopi/01120000.xhp
index ecb34db2fb..7e4b48415b 100755
--- a/helpcontent2/source/text/shared/autopi/01120000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01120100.xhp b/helpcontent2/source/text/shared/autopi/01120100.xhp
index 00a6f7eb1a..131d3379a4 100755
--- a/helpcontent2/source/text/shared/autopi/01120100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01120100.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,9 +47,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#gruppen1"/>
</section>
- <bookmark branch="hid/DBP_EDIT_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS" xml-lang="en-US" id="bm_id3154927"/><paragraph role="heading" level="2" id="hd_id3153894" l10n="U" xml-lang="en-US" oldref="3">Which names do you want to give the option fields?</paragraph>
+ <!-- removed HID DBP_EDIT_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS --><paragraph role="heading" level="2" id="hd_id3153894" l10n="U" xml-lang="en-US" oldref="3">Which names do you want to give the option fields?</paragraph>
<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3154673" oldref="4"><ahelp hid="DBP_EDIT_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS" visibility="visible">Specifies the respective label for each option field. You will see the label of the option field in the form.</ahelp> This entry corresponds to the <link href="text/shared/02/01170101.xhp" name="Label">Label</link> property of the option field.</paragraph>
- <bookmark branch="hid/DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT" xml-lang="en-US" id="bm_id3153750"/><paragraph role="heading" level="3" id="hd_id3155805" l10n="U" xml-lang="en-US" oldref="10">Accept</paragraph>
+ <!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT --><paragraph role="heading" level="3" id="hd_id3155805" l10n="U" xml-lang="en-US" oldref="10">Accept</paragraph>
<table id="tbl_id3145211">
@@ -68,9 +65,9 @@
</table>
<paragraph role="paragraph" id="par_id3154749" l10n="U" xml-lang="en-US" oldref="6">Enter the label for each option field of the group that you want to create and copy the label to the list by clicking the arrow button. Repeat this procedure until all the option fields are defined.</paragraph>
- <bookmark branch="hid/DBP_LISTBOX_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS" xml-lang="en-US" id="bm_id3147243"/><paragraph role="heading" level="2" id="hd_id3150443" l10n="U" xml-lang="en-US" oldref="7">Option fields</paragraph>
+ <!-- removed HID DBP_LISTBOX_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS --><paragraph role="heading" level="2" id="hd_id3150443" l10n="U" xml-lang="en-US" oldref="7">Option fields</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3152996" xml-lang="en-US" oldref="8"><ahelp hid="DBP_LISTBOX_RID_PAGE_GROUPRADIOSELECTION_LB_RADIOBUTTONS" visibility="visible">Displays all option fields which have to be included in the group box.</ahelp></paragraph>
- <bookmark branch="hid/DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT" xml-lang="en-US" id="bm_id3153146"/><paragraph role="heading" level="3" id="hd_id3146949" l10n="U" xml-lang="en-US" oldref="11">Remove</paragraph>
+ <!-- removed HID DBP_PUSHBUTTON_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT --><paragraph role="heading" level="3" id="hd_id3146949" l10n="U" xml-lang="en-US" oldref="11">Remove</paragraph>
<table id="tbl_id3149578">
diff --git a/helpcontent2/source/text/shared/autopi/01120200.xhp b/helpcontent2/source/text/shared/autopi/01120200.xhp
index 054935988a..076065d272 100755
--- a/helpcontent2/source/text/shared/autopi/01120200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01120200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,11 +50,11 @@
</section>
<paragraph role="heading" level="2" id="hd_id3157896" l10n="U" xml-lang="en-US" oldref="3">Should one option field be selected as a default?</paragraph>
<paragraph role="paragraph" id="par_id3149346" l10n="U" xml-lang="en-US" oldref="4">Specifies whether you want to set default settings for the option box.</paragraph>
- <bookmark branch="hid/DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES" xml-lang="en-US" id="bm_id3154288"/><paragraph role="heading" level="3" id="hd_id3147226" l10n="U" xml-lang="en-US" oldref="5">Yes, the following:</paragraph>
+ <!-- removed HID DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES --><paragraph role="heading" level="3" id="hd_id3147226" l10n="U" xml-lang="en-US" oldref="5">Yes, the following:</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3150774" xml-lang="en-US" oldref="10"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES" visibility="visible">Specifies that you want an option field to be selected as a default after opening the form.</ahelp> Choose the option field from the box.</paragraph>
- <bookmark branch="hid/DBP_LISTBOX_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD" xml-lang="en-US" id="bm_id3149182"/><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="6">List box</paragraph>
+ <!-- removed HID DBP_LISTBOX_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD --><paragraph role="heading" level="3" id="hd_id3153345" l10n="U" xml-lang="en-US" oldref="6">List box</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3146957" xml-lang="en-US" oldref="7"><ahelp hid="DBP_LISTBOX_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD" visibility="visible">Select the option field that you want to have as the default when opening the form.</ahelp></paragraph>
- <bookmark branch="hid/DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO" xml-lang="en-US" id="bm_id3153031"/><paragraph role="heading" level="3" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="8">No, one particular field is not going to be selected</paragraph>
+ <!-- removed HID DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO --><paragraph role="heading" level="3" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="8">No, one particular field is not going to be selected</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3163802" xml-lang="en-US" oldref="9"><ahelp hid="DBP_RADIOBUTTON_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO" visibility="visible">Specifies that you do not want any option field to be the default choice.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01120300.xhp b/helpcontent2/source/text/shared/autopi/01120300.xhp
index 89101bf463..f2d9fe04e5 100755
--- a/helpcontent2/source/text/shared/autopi/01120300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01120300.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,9 +48,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#gruppen3"/>
</section>
- <bookmark branch="hid/DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE" xml-lang="en-US" id="bm_id3155805"/><paragraph role="heading" level="2" id="hd_id3152594" l10n="U" xml-lang="en-US" oldref="3">Which value do you want to assign to each option?</paragraph>
+ <!-- removed HID DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE --><paragraph role="heading" level="2" id="hd_id3152594" l10n="U" xml-lang="en-US" oldref="3">Which value do you want to assign to each option?</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3152425" xml-lang="en-US" oldref="4"><ahelp hid="DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE" visibility="visible">Select a number or a text as a reference value for the selected option field.</ahelp></paragraph>
- <bookmark branch="hid/DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS" xml-lang="en-US" id="bm_id3147088"/><paragraph role="heading" level="2" id="hd_id3155555" l10n="U" xml-lang="en-US" oldref="5">Option fields</paragraph>
+ <!-- removed HID DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS --><paragraph role="heading" level="2" id="hd_id3155555" l10n="U" xml-lang="en-US" oldref="5">Option fields</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3155941" xml-lang="en-US" oldref="6"><ahelp hid="DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS" visibility="visible">Select the option field for which you want to assign the reference value.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01120400.xhp b/helpcontent2/source/text/shared/autopi/01120400.xhp
index 8e4f5339d2..ede1f0463e 100644
--- a/helpcontent2/source/text/shared/autopi/01120400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01120400.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01120500.xhp b/helpcontent2/source/text/shared/autopi/01120500.xhp
index f756f381d0..af0428d327 100755
--- a/helpcontent2/source/text/shared/autopi/01120500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01120500.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#gruppen5"/>
</section>
- <bookmark branch="hid/DBP_EDIT_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT" xml-lang="en-US" id="bm_id3156211"/><paragraph role="heading" level="2" id="hd_id3144415" l10n="U" xml-lang="en-US" oldref="3">Which caption is to be given to your option group?</paragraph>
+ <!-- removed HID DBP_EDIT_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT --><paragraph role="heading" level="2" id="hd_id3144415" l10n="U" xml-lang="en-US" oldref="3">Which caption is to be given to your option group?</paragraph>
<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3163829" oldref="4"><ahelp hid="DBP_EDIT_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT" visibility="visible">Specifies the label for the option box. You will see the label of the group box displayed in the form.</ahelp> The text you enter here will correspond to the <link href="text/shared/02/01170101.xhp" name="Label">Label</link> property of the group box.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 12227de0d4..1bdbbafdfd 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01130000.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedautopi01130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Document Converter</title>
@@ -43,6 +40,7 @@
<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"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDHELP" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_DIALOG" id="bm_id3150478" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/macro:///ImportWizard.Main.Main" id="bm_id4087038" localize="false"/>
<paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="9">Document Converter</paragraph>
<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>
@@ -50,7 +48,7 @@
<section id="howtoget">
<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_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from older versions, 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>
<embed href="text/shared/autopi/01130100.xhp#seite1"/>
<embed href="text/shared/autopi/01130200.xhp#seite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01130100.xhp b/helpcontent2/source/text/shared/autopi/01130100.xhp
index cd1f9d1d44..4899ec6659 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01130100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130100.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01130100.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -51,15 +48,15 @@
<embed href="text/shared/00/00000401.xhp#autopilotmsimport1"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTSODOCUMENTS" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_DLGIMPORT_0_OPTSODOCUMENTS">Converts binary $[officename] documents (StarOffice 5.2 and before) into the OpenDocument format used by $[officename].</ahelp><comment>UFI: dont use a variable!</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_DLGIMPORT_0_OPTSODOCUMENTS">Converts old binary documents into the OpenDocument format used by $[officename].</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKWRITER" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3153049" xml-lang="en-US" level="3" l10n="U" oldref="29">Text documents</paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_DLGIMPORT_0_CHKWRITER">Converts documents in the old format of $[officename] Writer *.sdw into OpenDocument *.odt documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_DLGIMPORT_0_CHKWRITER">Converts documents in the old format of Writer *.sdw into OpenDocument *.odt documents.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKCALC" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="31">Spreadsheets</paragraph>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="HID_DLGIMPORT_0_CHKCALC">Converts documents in the old format of $[officename] Calc *.sdc into OpenDocument *.ods documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="HID_DLGIMPORT_0_CHKCALC">Converts documents in the old format of Calc *.sdc into OpenDocument *.ods documents.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKIMPRESS" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="3" l10n="U" oldref="33">Drawing/presentation documents</paragraph>
-<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="HID_DLGIMPORT_0_CHKIMPRESS">Converts documents in the old format of $[officename] Draw *.sda into OpenDocument *.odg documents, and $[officename] Impress *.sdd into OpenDocument *.odp documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="HID_DLGIMPORT_0_CHKIMPRESS">Converts documents in the old format of Draw *.sda into OpenDocument *.odg documents, and Impress *.sdd into OpenDocument *.odp documents.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKMATHGLOBAL" id="bm_id3156346" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="35">Master documents/formulas</paragraph>
-<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="HID_DLGIMPORT_0_CHKMATHGLOBAL">Converts documents in the old format of $[officename] Writer master documents *.sgl into OpenDocument *.odm documents, and $[officename] Math *.smf into OpenDocument *.odf documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="HID_DLGIMPORT_0_CHKMATHGLOBAL">Converts documents in the old format of Writer master documents *.sgl into OpenDocument *.odm documents, and Math *.smf into OpenDocument *.odf documents.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTMSDOCUMENTS" id="bm_id3147209" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="37">Microsoft Office</paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="38">Converts Microsoft Office documents into the OpenDocument format.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKWORD" id="bm_id3148685" localize="false"/><paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="3" l10n="U" oldref="3">Word documents</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01130200.xhp b/helpcontent2/source/text/shared/autopi/01130200.xhp
index 9cd4e3cdbc..c73187e455 100755
--- a/helpcontent2/source/text/shared/autopi/01130200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01130200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01150000.xhp b/helpcontent2/source/text/shared/autopi/01150000.xhp
index 4e180daa23..73fae10bb2 100644
--- a/helpcontent2/source/text/shared/autopi/01150000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01150000.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01150000.xhp,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -34,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedautopi01150000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Euro Converter Wizard</title>
@@ -50,7 +46,9 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_EURO_CONVERTER" id="bm_id7067290" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EuroConverter" id="bm_id3150476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/><paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGCONVERT_DIALOG" id="bm_id3150477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/>
+<paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="2"><variable id="eurokonv"><ahelp hid=".uno:EuroConverter">Converts the currency amounts found in $[officename] Calc documents and in fields and tables of $[officename] Writer documents into euros.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="54">Only closed files are converted. It is possible, however, to use the Euro Converter in an open $[officename] Calc document. In this case, a separate dialog opens. This dialog is described <link href="text/shared/autopi/01150000.xhp" name="at the end of this section">at the end of this section</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 17276999bd..70cca1dbdb 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedautopi01170000xml" indexer="include">
<title id="tit" xml-lang="en-US">Address Data Source</title>
@@ -44,6 +41,7 @@
<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/HID_ABSPILOT" id="bm_id3581348" 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>
<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>
@@ -58,7 +56,7 @@
<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"/>
+<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"/>
@@ -67,25 +65,25 @@
<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
diff --git a/helpcontent2/source/text/shared/autopi/01170200.xhp b/helpcontent2/source/text/shared/autopi/01170200.xhp
index dd30f7d03b..f57f0fdd63 100755
--- a/helpcontent2/source/text/shared/autopi/01170200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170200.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01170300.xhp b/helpcontent2/source/text/shared/autopi/01170300.xhp
index b46b0104e0..1a4020031d 100755
--- a/helpcontent2/source/text/shared/autopi/01170300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170300.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01170400.xhp b/helpcontent2/source/text/shared/autopi/01170400.xhp
index 9c0039996f..17190d22ec 100755
--- a/helpcontent2/source/text/shared/autopi/01170400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170400.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170400.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,10 +49,10 @@
</section>
<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">Location</paragraph>
<paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the location of the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_PushButton_RID_PAGE_FINAL_PB_BROWSE" id="bm_id3865169" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE" id="bm_id3865169" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BROWSECONN" id="bm_id1817072" localize="false"/><paragraph role="heading" id="par_idN105BE" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN105C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the location using a file dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_CheckBox_RID_PAGE_FINAL_CB_REGISTER_DS" id="bm_id1906186" localize="false"/><paragraph role="heading" id="par_idN105C5" xml-lang="en-US" level="2" l10n="NEW">Make this address book available to all modules in %PRODUCTNAME</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS" id="bm_id1906186" localize="false"/><paragraph role="heading" id="par_idN105C5" xml-lang="en-US" level="2" l10n="NEW">Make this address book available to all modules in %PRODUCTNAME</paragraph>
<paragraph role="paragraph" id="par_idN105C9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Registers the newly created database file in %PRODUCTNAME. The database will then be listed in the data source window (F4). If this check box is cleared, the database will be available only by opening the database file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3144436" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Address book name</paragraph>
<paragraph role="paragraph" id="par_id3154673" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME">Specifies the data source name.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01170500.xhp b/helpcontent2/source/text/shared/autopi/01170500.xhp
index 2f3bd40659..17e22aa0f8 100755
--- a/helpcontent2/source/text/shared/autopi/01170500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170500.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01170500.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/makefile.mk b/helpcontent2/source/text/shared/autopi/makefile.mk
index c0c61ff588..945a27e1db 100644
--- a/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -130,4 +126,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/autopi/purchase.xhp b/helpcontent2/source/text/shared/autopi/purchase.xhp
index 90807c7539..989253d945 100644
--- a/helpcontent2/source/text/shared/autopi/purchase.xhp
+++ b/helpcontent2/source/text/shared/autopi/purchase.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: purchase.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/startup.xhp b/helpcontent2/source/text/shared/autopi/startup.xhp
index 579af0f79b..7de1e40774 100644
--- a/helpcontent2/source/text/shared/autopi/startup.xhp
+++ b/helpcontent2/source/text/shared/autopi/startup.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: startup.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard00.xhp b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
index 92c2ab8f74..9af659a46b 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard00.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard00.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard01.xhp b/helpcontent2/source/text/shared/autopi/webwizard01.xhp
index ca57d65dbc..d4551aa9b5 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard01.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard01.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard01.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,23 +29,25 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopiwebwizard01xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Web Wizard - Introduction</title>
-<filename>/text/shared/autopi/webwizard01.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="introduction"><comment>UFI: removed help id</comment><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/autopi/webwizard01.xhp">Web Wizard - Introduction</link></paragraph>
-<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can use the Web Wizard to maintain web pages on a server.</ahelp> You can also load previously saved Web Wizard settings to maintain an existing web page. These settings include information about the local folder and the FTP server.</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/HID1_LST_SESSIONS" id="bm_id2904751" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Choose Web Wizard settings</paragraph>
-<paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US" l10n="NEW"><ahelp hid="34207">Select the settings that you want to load and then click <emph>Load</emph>. To start the wizard with the default settings, select "none".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID1_BTN_DEL_SES" id="bm_id5166783" localize="false"/><paragraph role="heading" id="par_idN1055E" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
-<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="NEW"><ahelp hid="34209">Deletes the selected settings.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10565" xml-lang="en-US" l10n="NEW"><link href="text/shared/autopi/webwizard02.xhp">Web Wizard - Documents</link></paragraph>
-</body>
-</helpdocument>
+ <topic id="textsharedautopiwebwizard01xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Web Wizard - Introduction</title>
+ <filename>/text/shared/autopi/webwizard01.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="introduction"><comment>UFI: removed help id</comment>
+<paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1" l10n="NEW"><link href="text/shared/autopi/webwizard01.xhp">Web Wizard - Introduction</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10554" role="paragraph" l10n="CHG"><ahelp hid=".">You can use the Web Wizard to maintain web pages on a server.</ahelp> You can also load previously saved Web Wizard settings to maintain an existing web page. These settings include information about the local folder and the FTP server.</paragraph>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/HID1_LST_SESSIONS" id="bm_id2904751" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10557" role="heading" level="2" l10n="NEW">Choose Web Wizard settings</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1055B" role="paragraph" l10n="CHG"><ahelp hid="34207">Select the settings that you want to load and then click <emph>Load</emph>. To start the wizard with the default settings, select "default".</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID1_BTN_DEL_SES" id="bm_id5166783" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1055E" role="heading" level="2" l10n="NEW">Delete</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10562" role="paragraph" l10n="NEW"><ahelp hid="34209">Deletes the selected settings.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10565" role="paragraph" l10n="NEW"><link href="text/shared/autopi/webwizard02.xhp">Web Wizard - Documents</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/autopi/webwizard02.xhp b/helpcontent2/source/text/shared/autopi/webwizard02.xhp
index 4ed1bf5cf7..ac8ca33eb5 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard02.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard02.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard02.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard03.xhp b/helpcontent2/source/text/shared/autopi/webwizard03.xhp
index 7b644dcf9a..5267669ce4 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard03.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard03.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard03.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard04.xhp b/helpcontent2/source/text/shared/autopi/webwizard04.xhp
index 29e82ee1e1..161b1194db 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard04.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard04.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard04.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard05.xhp b/helpcontent2/source/text/shared/autopi/webwizard05.xhp
index a1bca19708..80493df2b1 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard05.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard05.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard05.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp b/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp
index 8d93653d34..aad1e47c3d 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard05bi.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard05bi.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard05is.xhp b/helpcontent2/source/text/shared/autopi/webwizard05is.xhp
index 59a797a0f1..66ee361106 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard05is.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard05is.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard05is.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard06.xhp b/helpcontent2/source/text/shared/autopi/webwizard06.xhp
index 9ef53e8743..3b073277da 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard06.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard06.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard06.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard07.xhp b/helpcontent2/source/text/shared/autopi/webwizard07.xhp
index 994b902205..e2f93809b9 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard07.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard07.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard07.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp b/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp
index 565891cc4b..595215ba52 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard07fc.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: webwizard07fc.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/02000000.xhp b/helpcontent2/source/text/shared/explorer/database/02000000.xhp
index cfbee288a1..46e2e38f3b 100644
--- a/helpcontent2/source/text/shared/explorer/database/02000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02000000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02000000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/02000002.xhp b/helpcontent2/source/text/shared/explorer/database/02000002.xhp
index 0c7a2090b8..e892039082 100755
--- a/helpcontent2/source/text/shared/explorer/database/02000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02000002.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02000002.xhp,v $
- *
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index 6f8bedd9dd..204a16eb12 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02010100.xhp,v $
- * $Revision: 1.18.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -139,9 +136,9 @@
<paragraph role="paragraph" id="par_id3154479" xml-lang="en-US" l10n="U" oldref="22">To remove a field name from the query, click the column header of the field and choose the <emph>Delete</emph> command on the context menu for the column.</paragraph>
<paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="277">Save query</paragraph>
<paragraph role="paragraph" id="par_id3148481" xml-lang="en-US" l10n="U" oldref="278">Use the <emph>Save</emph> icon on the Standard Bar to save the query. You see a dialog that asks you to enter a name for the query. If the database supports schemas, you can also enter a schema.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_COMBOBOX_DLG_SAVE_AS_ET_SCHEMA" id="bm_id3156378" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="4" l10n="U" oldref="279">Schema</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA" id="bm_id3156378" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="4" l10n="U" oldref="279">Schema</paragraph>
<paragraph role="paragraph" id="par_id3154754" xml-lang="en-US" l10n="U" oldref="280"><ahelp hid="DBACCESS_COMBOBOX_DLG_SAVE_AS_ET_SCHEMA">Enter the name of the schema that is assigned to the query or table view.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_SAVE_AS_ET_TITLE" id="bm_id3147340" localize="false"/><paragraph role="heading" id="hd_id3156717" xml-lang="en-US" level="4" l10n="U" oldref="281">Query name or table view name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_SAVE_AS:ET_TITLE" id="bm_id3147340" localize="false"/><paragraph role="heading" id="hd_id3156717" xml-lang="en-US" level="4" l10n="U" oldref="281">Query name or table view name</paragraph>
<paragraph role="paragraph" id="par_id3154253" xml-lang="en-US" l10n="U" oldref="282"><ahelp hid="DBACCESS_EDIT_DLG_SAVE_AS_ET_TITLE">Enter the name of the query or table view.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3163805" xml-lang="en-US" level="3" l10n="U" oldref="23">Filtering data</paragraph>
<paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="24">To filter data for the query, set the desired preferences in the lower area of the Design View. The following lines are available:</paragraph>
@@ -165,8 +162,7 @@
<paragraph role="paragraph" id="par_id3154585" xml-lang="en-US" l10n="U" oldref="36">Here you can enter one additional criterion for filtering in each line. Multiple criteria in one column will be connected by an OR link.</paragraph>
<paragraph role="paragraph" id="par_id3148800" xml-lang="en-US" l10n="U" oldref="150">You can also use the context menu of the line headers in the lower area of the query design to insert another line for functions:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_FUNCTION" id="bm_id3153275" localize="false"/><paragraph role="heading" id="hd_id3148419" xml-lang="en-US" level="3" l10n="U" oldref="151">Functions</paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
+<paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
<paragraph role="paragraph" id="par_id8760818" xml-lang="en-US" l10n="CHG">If you are working with the HSQL database, the list box in the <emph>Function</emph> row offers you the following options:</paragraph>
<table id="tbl_id3148461">
<tablerow>
@@ -258,8 +254,6 @@
</tablecell>
</tablerow>
</table>
-</case>
-</switch>
<paragraph role="paragraph" id="par_id3156038" xml-lang="en-US" l10n="U" oldref="189">You can also enter function calls directly into the SQL statement. The syntax is:</paragraph>
<paragraph role="paragraph" id="par_id3156340" xml-lang="en-US" l10n="U" oldref="190">SELECT FUNCTION(column) FROM table.</paragraph>
<paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="191">For example, the function call in SQL for calculating a sum is:</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/02010101.xhp b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
index 35352548a5..58eb67f46d 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010101.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02010101.xhp,v $
- * $Revision: 1.15 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,41 +29,52 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Relations</title>
-<filename>/text/shared/explorer/database/02010101.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Join Properties</title>
+ <filename>/text/shared/explorer/database/02010101.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154015"><bookmark_value>links;relational databases (Base)</bookmark_value>
-<bookmark_value>inner joins (Base)</bookmark_value>
-<bookmark_value>joins in databases (Base)</bookmark_value>
-<bookmark_value>left joins (Base)</bookmark_value>
-<bookmark_value>right joins (Base)</bookmark_value>
-<bookmark_value>full joins (Base)</bookmark_value>
-</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment><paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="1" l10n="U" oldref="1">Relations</paragraph>
-<paragraph role="paragraph" id="par_id3151205" xml-lang="en-US" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Relations</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#Joins"/>
-</section>
+ <bookmark_value>inner joins (Base)</bookmark_value>
+ <bookmark_value>joins in databases (Base)</bookmark_value>
+ <bookmark_value>left joins (Base)</bookmark_value>
+ <bookmark_value>right joins (Base)</bookmark_value>
+ <bookmark_value>full joins (Base)</bookmark_value>
+</bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3154015" role="heading" level="1" l10n="CHG"
+ oldref="1">Join Properties</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151205" role="paragraph" l10n="U" oldref="2">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Join Properties</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000450.xhp#Joins"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_LEFT_TABLE" id="bm_id3150749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="17">Tables involved</paragraph>
-<paragraph role="paragraph" id="par_id3153924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph><comment>UFI: removed a help id</comment><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="2" l10n="U" oldref="15">Fields involved</paragraph>
-<paragraph role="paragraph" id="par_id3148994" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/><paragraph role="heading" id="hd_id3147340" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph>
-<paragraph role="paragraph" id="par_id3152482" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph>
-<paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="3" l10n="U" oldref="5">Inner Join</paragraph>
-<paragraph role="paragraph" id="par_id3155936" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph>
-<paragraph role="heading" id="hd_id3156372" xml-lang="en-US" level="3" l10n="U" oldref="7">Left Join</paragraph>
-<paragraph role="paragraph" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph>
-<paragraph role="heading" id="hd_id3155607" xml-lang="en-US" level="3" l10n="U" oldref="9">Right Join</paragraph>
-<paragraph role="paragraph" id="par_id3150647" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph>
-<paragraph role="heading" id="hd_id3158215" xml-lang="en-US" level="3" l10n="U" oldref="11">Full Join</paragraph>
-<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="2" l10n="U"
+ oldref="17">Tables involved</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="2" l10n="U"
+ oldref="15">Fields involved</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148994" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159267" role="heading" level="2" l10n="U" oldref="3">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147340" role="heading" level="3" l10n="U"
+ oldref="13">Type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="HID_DLG_QRY_JOINTYPE">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3" l10n="U" oldref="5">Inner Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155936" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156372" role="heading" level="3" l10n="U" oldref="7">Left Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166450" role="paragraph" l10n="U" oldref="8"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155607" role="heading" level="3" l10n="U" oldref="9">Right Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150647" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_DLG_QRY_JOINTYPE">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3158215" role="heading" level="3" l10n="U"
+ oldref="11">Full Join</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph" l10n="U" oldref="12"><ahelp hid="HID_DLG_QRY_JOINTYPE">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOIN_CONTROL" id="bm_id0305200912022930" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0305200912031976" role="heading" level="3" l10n="NEW">Natural</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200912031977" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts the keyword NATURAL into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/04000000.xhp b/helpcontent2/source/text/shared/explorer/database/04000000.xhp
index edb2636d02..90d51c88e2 100644
--- a/helpcontent2/source/text/shared/explorer/database/04000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/04000000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04000000.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/04030000.xhp b/helpcontent2/source/text/shared/explorer/database/04030000.xhp
index ca01e62893..76f4e3834e 100644
--- a/helpcontent2/source/text/shared/explorer/database/04030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/04030000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04030000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000000.xhp b/helpcontent2/source/text/shared/explorer/database/05000000.xhp
index 20002e3254..13d759c2c3 100755
--- a/helpcontent2/source/text/shared/explorer/database/05000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05000000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000001.xhp b/helpcontent2/source/text/shared/explorer/database/05000001.xhp
index 26b6a1a89c..ba9c988346 100644
--- a/helpcontent2/source/text/shared/explorer/database/05000001.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000001.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05000001.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000002.xhp b/helpcontent2/source/text/shared/explorer/database/05000002.xhp
index 0f1f4ba930..2eb18398c3 100755
--- a/helpcontent2/source/text/shared/explorer/database/05000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000002.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05000002.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05000003.xhp b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
index 1ca01fac10..219f2a70c8 100755
--- a/helpcontent2/source/text/shared/explorer/database/05000003.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05000003.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,16 +44,16 @@
<body>
<paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1" l10n="U" oldref="1">Enter / change password</paragraph>
<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="U" oldref="2">Allows you to enter and confirm a new or changed password. If you have defined a new user, enter the user's name in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:DLG_PASSWD:ED_PASSWD_USER" id="bm_id3149283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER" id="bm_id3149283" localize="false"/>
<paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="2" l10n="U" oldref="3">User</paragraph>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SFX2:EDIT:DLG_PASSWD:ED_PASSWD_USER">Specifies the name of the new user.</ahelp> This field is only visible if you have defined a new user.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORD" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD" id="bm_id3145346" localize="false"/>
<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="9">Old password</paragraph>
<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_OLDPASSWORD">Enter the old password.</ahelp> This field is visible when you have started the dialog via <emph>Change password</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD" id="bm_id3166411" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD" id="bm_id3166411" localize="false"/>
<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="2" l10n="U" oldref="5">Password</paragraph>
<paragraph role="paragraph" id="par_id3147243" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD">Enter the new password.</ahelp></paragraph><comment>UFI: removed help id</comment>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEAT" id="bm_id3163802" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT" id="bm_id3163802" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="7">Confirm (password)</paragraph>
<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_EDIT_DLG_PASSWORD_ED_PASSWORD_REPEAT">Enter the new password again.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05010000.xhp b/helpcontent2/source/text/shared/explorer/database/05010000.xhp
index ac3f40fcba..85d7bf403d 100644
--- a/helpcontent2/source/text/shared/explorer/database/05010000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05010000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05010000.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05010100.xhp b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
index 0286983fd7..ffcb8e5368 100644
--- a/helpcontent2/source/text/shared/explorer/database/05010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05010100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05010100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<section id="indexentwurf">
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MODALDIALOG_DLG_INDEXDESIGN" id="bm_id3156410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ModalDialog:DLG_INDEXDESIGN" id="bm_id3156410" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DBIndexDesign" id="bm_id3149828" localize="false"/><paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05010100.xhp" name="Index design">Index design</link></paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DBIndexDesign">The <emph>Index Design </emph>dialog allows you edit the indexes for the current table.</ahelp></paragraph>
</section>
@@ -66,7 +63,7 @@
<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_DLGIDX_RESETINDEX">Resets the current index to the setting that it had when the dialog was started.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="2" l10n="U" oldref="15">Index details</paragraph>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="16">As soon as you change a detail of the current index and then select another index, the change is immediately passed to the data source. You can only leave the dialog, or select another index, if the change has been successfully acknowledged by the data source. However, you can undo the change by clicking the <emph>Reset Current Index </emph>icon.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_DLG_INDEXDESIGN_CB_UNIQUE" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="17">Unique</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="17">Unique</paragraph>
<paragraph role="paragraph" id="par_id3156282" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="DBACCESS_CHECKBOX_DLG_INDEXDESIGN_CB_UNIQUE">Specifies whether the current index allows only unique values.</ahelp> Checking the <emph>Unique </emph>option prevents duplicate data from being entered in the field and ensures data integrity.</paragraph>
<paragraph role="heading" id="hd_id3150448" xml-lang="en-US" level="3" l10n="U" oldref="19">Fields</paragraph>
<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="20">The<emph> Fields</emph> area displays a list of fields in the current table. You can also select multiple fields. In order to remove a field from the selection, select the empty entry at the start of the list.</paragraph>
@@ -74,7 +71,7 @@
<paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="HID_DLGINDEX_INDEXDETAILS_FIELD">Displays a list of the fields in the current table. You can select more than one field.</ahelp><comment>i73718</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGINDEX_INDEXDETAILS_SORTORDER" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="3" l10n="U" oldref="23">Sort order</paragraph>
<paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_DLGINDEX_INDEXDETAILS_SORTORDER">Determines the sort order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_INDEXDESIGN_PB_CLOSE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="2" l10n="U" oldref="25">Close</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="2" l10n="U" oldref="25">Close</paragraph>
<paragraph role="paragraph" id="par_id3154190" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_INDEXDESIGN_PB_CLOSE">Closes the dialog.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/05020000.xhp b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
index e648dca7a2..5ab4003832 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020000.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05020100.xhp b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
index 757510f362..c2f49abaf5 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05020100.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,8 +52,8 @@
<embed href="text/shared/00/00000450.xhp#relationen"/>
</section>
<paragraph role="note" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="3">The update and delete options are only available if they are supported by the database used.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_LEFT_TABLE" id="bm_id3145120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE" id="bm_id3153088" localize="false"/>
+<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_LEFT_TABLE -->
+<!-- removed HID DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE -->
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="27">Tables</paragraph>
<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE" visibility="hidden">This is where the two related tables are listed.</ahelp>If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog.</paragraph>
<paragraph role="paragraph" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="29">If you opened the <emph>Relations</emph> dialog for an existing relation by double-clicking the connection lines in the Relation window, then the tables involved in the relation cannot be modified.</paragraph>
@@ -68,31 +65,31 @@
<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="HID_RELATIONDIALOG_RIGHTFIELDCELL">The names of the tables selected for the link appear here as column names.</ahelp> If you click a field, you can use the arrow buttons to select a field from the table. Each relation is written in a row.</paragraph>
<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="6">Update options</paragraph>
<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="7">Here you can select options that take effect when there are changes to a primary key field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD" id="bm_id3148550" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD -->
<paragraph role="heading" id="hd_id3149046" xml-lang="en-US" level="3" l10n="U" oldref="8">No action</paragraph>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_UPD">Specifies that any change made to a primary key does not affect other external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD" id="bm_id3153379" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD -->
<paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="3" l10n="U" oldref="10">Updating cascade</paragraph>
<paragraph role="paragraph" id="par_id3154073" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD">Updates all the external key fields if the value of the corresponding primary key has been modified (Cascading Update).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL" id="bm_id3156280" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL -->
<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="3" l10n="U" oldref="12">Set null</paragraph>
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_NULL"> If the corresponding primary key has been modified, use this option to set the "IS NULL" value to all external key fields. IS NULL means that the field is empty.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT" id="bm_id3150767" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT -->
<paragraph role="heading" id="hd_id3150448" xml-lang="en-US" level="3" l10n="U" oldref="14">Set default</paragraph>
<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_UPD_DEFAULT"> If the corresponding primary key has been modified, use this option to set a default value to all external key fields.</ahelp> During the creation of the corresponding table, the default value of an external key field will be defined when you assign the field properties.</paragraph>
<paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="2" l10n="U" oldref="16">Delete options</paragraph>
<paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U" oldref="17">Here you can select options that take effect when a primary key field is deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL" id="bm_id3150439" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL -->
<paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3" l10n="U" oldref="18">No action</paragraph>
<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_NO_CASC_DEL">Specifies that the deletion of a primary key will not have any effect on other external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL" id="bm_id3149260" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL -->
<paragraph role="heading" id="hd_id3154146" xml-lang="en-US" level="3" l10n="U" oldref="20">Delete cascade</paragraph>
<paragraph role="paragraph" id="par_id3155309" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL">Specifies that all external key fields will be deleted if you delete the corresponding primary key field.</ahelp></paragraph>
<paragraph role="warning" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="22">When you delete a primary key field with the<emph> Delete cascade </emph>option, all records from other tables that have this key as their foreign key are also deleted. Use this option with great care; it is possible that a major portion of the database can be deleted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL" id="bm_id3154987" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL -->
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="23">Set null</paragraph>
<paragraph role="paragraph" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_NULL">If you delete the corresponding primary key, the "IS NULL" value will be assigned to all external key fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT" id="bm_id3163712" localize="false"/>
+<!-- removed HID DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT -->
<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="25">Set Default</paragraph>
<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="DBACCESS_RADIOBUTTON_DLG_REL_PROPERTIES_RB_CASC_DEL_DEFAULT">If you delete the corresponding primary key, a set value will be set to all external key fields.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030000.xhp b/helpcontent2/source/text/shared/explorer/database/05030000.xhp
index cf3b3992c0..5e1085234f 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030000.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05030100.xhp b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
index 3a4584273f..253a03adab 100644
--- a/helpcontent2/source/text/shared/explorer/database/05030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030100.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,13 +47,13 @@
<bookmark xml-lang="en-US" branch="hid/HID_TAB_WIZ_TABLENAME_EDIT" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_TAB_WIZ_TABLENAME_EDIT">Specifies a name for the copy.</ahelp> Some databases only accept names containing eight or fewer characters.</paragraph>
<paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="2" l10n="U" oldref="5">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
<paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA">Creates a 1:1 copy of the database table.</ahelp> The table definition and the complete data are copied. The table definition includes the table structure and format from different data fields, including special field properties. The field contents supply the data.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF">Copies only the table definition and not the corresponding data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW">If the database supports Views, you can select this option only when a query is copied in a table container. This option enables you to see and edit a query as a normal table view.</ahelp> The table will be filtered in the view with a "Select" SQL statement.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA">Appends the data of the table to be copied to an existing table.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="13">The table definition must be exactly the same so that data can be copied. Data cannot be copied if a data field in the target table has another format than the data field in the source table.</paragraph>
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="31">Match the data field names in the<emph> Copy Table</emph> dialog on the <link href="text/shared/explorer/database/05030400.xhp" name="Apply Columns">Apply Columns</link> page.</paragraph>
@@ -64,10 +61,9 @@
<paragraph role="note" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="15">If the fields of the target table have a smaller field length than in the source table when data is being attached, the source data fields will automatically be truncated to match the field lengths in the target table.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149164"><bookmark_value>primary keys; defining</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN"> Automatically generates a primary key data field and fills it with values.</ahelp><switchinline select="distrib"><caseinline select="COMMERCIAL">You should use this field if you copy a dBASE table to the Adabas format, since in the Adabas format a primary key must always be available in order to edit the table.
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN">Automatically generates a primary key data field and fills it with values.</ahelp> You should always use this field, since a primary key must always be available in order to edit the table.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/explorer/database/05030200.xhp" name="Next page">Next page</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030200.xhp b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
index c26abc7c60..a18e4b9bdb 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030200.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,14 +45,14 @@
<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="2">In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. The <emph>Apply columns </emph>dialog is the second window of the <emph>Copy table</emph> dialog.</paragraph>
</section>
<paragraph role="heading" id="hd_id3155552" xml-lang="en-US" level="2" l10n="U" oldref="3">Existing columns</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="4">Left list box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES" id="bm_id3155805" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="4">Left list box</paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES">Lists the available data fields that you can include in the copied table. To copy a data field, click its name, and then click the &gt; button. To copy all of the fields, click the <emph>&gt;&gt;</emph> button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="6">Right list box</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="3" l10n="U" oldref="6">Right list box</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES">Lists the fields that you want to include in the copied table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_RH" id="bm_id3152781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_RH" id="bm_id3147653" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMN_LH" id="bm_id3151110" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH" id="bm_id3152996" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="8">Buttons</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH" id="bm_id3152781" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH" id="bm_id3151110" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH" id="bm_id3152996" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="8">Buttons</paragraph>
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_COLUMN_SELECT_IB_COLUMNS_LH">Adds or removes the selected field (&gt; or &lt; button) or all of the fields (&lt;&lt; or &gt;&gt; button).</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/explorer/database/05030300.xhp" name="Next page">Next page</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030300.xhp b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
index e2b36b3aca..eb97219d79 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030300.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030300.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
<paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/05030300.xhp" name="Type formatting">Type formatting</link></paragraph>
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="2">In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. The<emph> Type formatting </emph>dialog is the third window of the <emph>Copy table</emph> dialog.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES" id="bm_id3147291" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES" id="bm_id3147291" localize="false"/>
<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">List box</paragraph>
<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES">Lists the data fields that will be included in to the copied table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2" l10n="U" oldref="5">Column information</paragraph>
@@ -71,10 +68,10 @@
<paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_TAB_ENT_BOOL_DEFAULT">Select the default value for a Yes/No field.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="2" l10n="U" oldref="17">Automatic type recognition</paragraph>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="18">$[officename] can automatically recognize field contents when you copy database tables by drag and drop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO" id="bm_id3153061" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO" id="bm_id3153061" localize="false"/>
<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="3" l10n="U" oldref="19">(max.) lines</paragraph>
<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO">Enter the number of lines to use for automatic type recognition.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO" id="bm_id3148946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO" id="bm_id3148946" localize="false"/>
<paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="21">Auto</paragraph>
<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO">Enables automatic type recognition.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030400.xhp b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
index 1d8c29a159..aca297e55f 100755
--- a/helpcontent2/source/text/shared/explorer/database/05030400.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030400.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,18 +52,18 @@
<bookmark xml-lang="en-US" branch="hid/HID_TAB_NAMEMATCHING_COLS_ASSIGN" id="bm_id3147242" localize="false"/>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="6">Destination table</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_ASSIGN">Lists the possible data fields in the destination table. Only the data fields that are selected in the source table list will be included the destination table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP" id="bm_id3149516" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT" id="bm_id3155342" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP" id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT" id="bm_id3155342" localize="false"/>
<paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="2" l10n="U" oldref="8">up</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT">Moves the selected entry up one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN" id="bm_id3154307" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN" id="bm_id3154307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT" id="bm_id3153716" localize="false"/>
<paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="2" l10n="U" oldref="10">down</paragraph>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT">Moves the selected entry down one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL" id="bm_id3147619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL" id="bm_id3147619" localize="false"/>
<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="12">all</paragraph>
<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL">Selects all of the data fields in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE" id="bm_id3155341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE" id="bm_id3155341" localize="false"/>
<paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="2" l10n="U" oldref="14">none</paragraph>
<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE">Clears all of the check boxes in the list.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05040000.xhp b/helpcontent2/source/text/shared/explorer/database/05040000.xhp
index a865febb6b..5528a6bf9a 100755
--- a/helpcontent2/source/text/shared/explorer/database/05040000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05040000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05040100.xhp b/helpcontent2/source/text/shared/explorer/database/05040100.xhp
index de92a9db83..a603258de7 100755
--- a/helpcontent2/source/text/shared/explorer/database/05040100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05040100.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/05040200.xhp b/helpcontent2/source/text/shared/explorer/database/05040200.xhp
index 22a74cd625..c4c54c110a 100755
--- a/helpcontent2/source/text/shared/explorer/database/05040200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05040200.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11000002.xhp b/helpcontent2/source/text/shared/explorer/database/11000002.xhp
index 18fdb269ee..e2705cf956 100644
--- a/helpcontent2/source/text/shared/explorer/database/11000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11000002.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11000002.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11020000.xhp b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
index f314718e31..aca738877a 100644
--- a/helpcontent2/source/text/shared/explorer/database/11020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11020000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11020000.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@
<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_DSADMIN_ODBC_OPTIONS">Use this text field to enter additional optional driver settings if this is necessary.</ahelp></paragraph>
</section>
<section id="zeichensatz">
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_ODBC" id="bm_id3144511" localize="false"/><paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="2" l10n="U" oldref="12">Character Set</paragraph>
+<!-- removed HID HID_DSADMIN_CHARSET_ODBC --><paragraph role="heading" id="hd_id3152472" xml-lang="en-US" level="2" l10n="U" oldref="12">Character Set</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_DSADMIN_CHARSET_ODBC">Select the code conversion that you want to use to view the database in $[officename]. This does not affect the database.</ahelp> Choose "System" to use the default character set of your operating system. Text and dBASE databases are restricted to character sets with a fixed-size character length, where all characters are encoded with the same number of bytes.</paragraph>
</section>
<section id="retrieve">
diff --git a/helpcontent2/source/text/shared/explorer/database/11030000.xhp b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
index 069f855c6b..558d0cb75e 100644
--- a/helpcontent2/source/text/shared/explorer/database/11030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11030000.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
<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"/>
+<!-- removed HID HID_DSADMIN_CHARSET_DBASE -->
<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"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/11030100.xhp b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
index 57108aa806..733522a0ce 100755
--- a/helpcontent2/source/text/shared/explorer/database/11030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11030100.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,19 +45,19 @@
<section id="howtoget">
<embed href="text/shared/00/00000450.xhp#dBasein"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_COMBOBOX_DLG_DBASE_INDEXES_CB_TABLES" id="bm_id3146958" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="3">Table</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES" id="bm_id3146958" localize="false"/><paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="2" l10n="U" oldref="3">Table</paragraph>
<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_COMBOBOX_DLG_DBASE_INDEXES_CB_TABLES">Select the database table that you want to index.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_TABLEINDEXES" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="2" l10n="U" oldref="4">Table Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES" id="bm_id3153312" localize="false"/><paragraph role="heading" id="hd_id3159233" xml-lang="en-US" level="2" l10n="U" oldref="4">Table Indexes</paragraph>
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_TABLEINDEXES">Lists the current indexes for the selected database table.</ahelp> To remove an index from the list, click the index, and then click the right arrow.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_FREEINDEXES" id="bm_id3147276" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="5">Free Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES" id="bm_id3147276" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="5">Free Indexes</paragraph>
<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_LISTBOX_DLG_DBASE_INDEXES_LB_FREEINDEXES">Lists the available indexes that you can assign to a table.</ahelp> To assign an index to a selected table, click the left arrow icon. The left double arrow assigns all available indexes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADD" id="bm_id3146949" localize="false"/><paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="2" l10n="U" oldref="6">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD" id="bm_id3146949" localize="false"/><paragraph role="heading" id="hd_id3156152" xml-lang="en-US" level="2" l10n="U" oldref="6">&lt;</paragraph>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADD">Moves the selected index to the <emph>Table Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADDALL" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="7">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL" id="bm_id3153147" localize="false"/><paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="7">&lt;&lt;</paragraph>
<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_ADDALL">Moves all of the free indexes to the <emph>Table Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVE" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3149579" xml-lang="en-US" level="2" l10n="U" oldref="8">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE" id="bm_id3147619" localize="false"/><paragraph role="heading" id="hd_id3149579" xml-lang="en-US" level="2" l10n="U" oldref="8">&gt;</paragraph>
<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVE">Moves the selected table indexes to the <emph>Free Indexes</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVEALL" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="9">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="9">&gt;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="DBACCESS_IMAGEBUTTON_DLG_DBASE_INDEXES_IB_REMOVEALL">Moves all of the table indexes to the <emph>Free Indexes</emph> list.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/11080000.xhp b/helpcontent2/source/text/shared/explorer/database/11080000.xhp
index 35b5a848a5..33e9fb1de6 100644
--- a/helpcontent2/source/text/shared/explorer/database/11080000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11080000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11080000.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,16 +52,16 @@
<embed href="text/shared/guide/data_enter_sql.xhp#data_enter_sql"/>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="23">You can only enter administration commands in this dialog, such as Grant, Create Table, or Drop Table, and not filter commands. The commands that you can enter depend on the data source, for example, dBASE can only run some of the SQL commands list here.</paragraph>
<paragraph role="note" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="10">To run an SQL query for filtering data in the database, use the <link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design View</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQL" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="U" oldref="3">Command to execute</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL" id="bm_id3150772" localize="false"/><paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="U" oldref="3">Command to execute</paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQL">Enter the SQL administration command that you want to run.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="24">For example, for a "Bibliography" data source, you can enter the following SQL command:</paragraph>
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="25">SELECT "Address" FROM "biblio" "biblio"</paragraph>
<paragraph role="paragraph" id="par_id3145611" xml-lang="en-US" l10n="U" oldref="21">For more information on SQL commands, please consult the documentation that came with the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_DIRECTSQL_LB_HISTORY" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="26">Previous commands</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3156024" xml-lang="en-US" level="2" l10n="U" oldref="26">Previous commands</paragraph>
<paragraph role="paragraph" id="par_id3149045" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_LISTBOX_DLG_DIRECTSQL_LB_HISTORY">Lists the previously executed SQL commands. To run a command again, click the command, and then click <emph>Run</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_STATUS" id="bm_id3161656" localize="false"/><paragraph role="heading" id="hd_id3154348" xml-lang="en-US" level="2" l10n="U" oldref="5">Status</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS" id="bm_id3161656" localize="false"/><paragraph role="heading" id="hd_id3154348" xml-lang="en-US" level="2" l10n="U" oldref="5">Status</paragraph>
<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_STATUS">Displays the results, including errors, of the SQL command that you ran.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_DLG_DIRECTSQL_PB_EXECUTE" id="bm_id3148798" localize="false"/><paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="7">Run</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE" id="bm_id3148798" localize="false"/><paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="7">Run</paragraph>
<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_PUSHBUTTON_DLG_DIRECTSQL_PB_EXECUTE">Runs the command that you entered in the <emph>Command to execute </emph>box.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen2"/>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/11090000.xhp b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
index 0bcc8a157f..68990208c9 100755
--- a/helpcontent2/source/text/shared/explorer/database/11090000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11090000.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11150200.xhp b/helpcontent2/source/text/shared/explorer/database/11150200.xhp
index 44f87ee1e2..f1abe9b45a 100755
--- a/helpcontent2/source/text/shared/explorer/database/11150200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11150200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11150200.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/11170000.xhp b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
index 2e360806db..f05730913c 100755
--- a/helpcontent2/source/text/shared/explorer/database/11170000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11170000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,17 +44,17 @@
<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/11170000.xhp" name="Adabas D Statistics">Adabas D Statistics</link></paragraph>
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the access options for the Adabas database.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE" id="bm_id3151226" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="4">Data Buffer Size</paragraph>
+<!-- removed HID DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE --><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="4">Data Buffer Size</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_CACHE_SIZE">Enter the size of the data buffer for the database.</ahelp> The setting takes effect after you restart the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT" id="bm_id3149827" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="6">Increment size</paragraph>
+<!-- removed HID DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT --><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="6">Increment size</paragraph>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="DBACCESS_NUMERICFIELD_TAB_PAG_ADABAS_SETTINGS_NF_DATA_INCREMENT">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB.</ahelp> The setting takes effect after you restart the database.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME" id="bm_id3149399" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="8">Control User Name</paragraph>
+<!-- removed HID DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME --><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="8">Control User Name</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLUSERNAME">Enter the name of a user that you want to give limited control to modify some parameters of the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD" id="bm_id3149233" localize="false"/><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="10">Control Password</paragraph>
+<!-- removed HID DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD --><paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="10">Control Password</paragraph>
<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="DBACCESS_EDIT_TAB_PAG_ADABAS_SETTINGS_ET_CTRLPASSWORD">Enter the password of the Control User.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB" id="bm_id3149516" localize="false"/><paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="12">Shut down the service when closing $[officename]</paragraph>
+<!-- removed HID DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB --><paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2" l10n="U" oldref="12">Shut down the service when closing $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="DBACCESS_CHECKBOX_TAB_PAG_ADABAS_SETTINGS_CB_SHUTDB">Exits the Adabas database server when you exit $[officename].</ahelp> This option is only available if you start the database server from $[officename] with a control user and password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT" id="bm_id3150670" localize="false"/><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="2" l10n="U" oldref="14">Extended</paragraph>
+<!-- removed HID DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT --><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="2" l10n="U" oldref="14">Extended</paragraph>
<paragraph role="paragraph" id="par_id3156002" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="DBACCESS_PUSHBUTTON_TAB_PAG_ADABAS_SETTINGS_PB_STAT">Opens the <link href="text/shared/explorer/database/11170100.xhp" name="Database Statistics">Database Statistics</link> dialog, where you can view statistics about the Adabas database.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/11170100.xhp b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
index e129b6e10c..f8df2f7319 100755
--- a/helpcontent2/source/text/shared/explorer/database/11170100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11170100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,18 +43,18 @@
<paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1">Database Statistics</paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2">Displays statistics about the Adabas database.</paragraph>
<paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="2" l10n="U" oldref="3">Database files</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_SYSDEVSPACE" id="bm_id3149346" localize="false"/><paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="3" l10n="U" oldref="5">SYSDEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_SYSDEVSPACE" id="bm_id3149346" localize="false"/><paragraph role="heading" id="hd_id3152594" xml-lang="en-US" level="3" l10n="U" oldref="5">SYSDEVSPACE</paragraph>
<paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_SYSDEVSPACE">Displays the path and the name of the SYSDEVSPACE file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_TRANSACTIONLOG" id="bm_id3156427" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="7">TRANSACTIONLOG</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_TRANSACTIONLOG" id="bm_id3156427" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="7">TRANSACTIONLOG</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_TRANSACTIONLOG">Displays the path and the name of the TRANSACTIONLOG file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_LISTBOX_DLG_ADABASSTAT_LB_DATADEVS" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="9">DATADEVSPACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ListBox:DLG_ADABASSTAT:LB_DATADEVS" id="bm_id3147089" localize="false"/><paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="3" l10n="U" oldref="9">DATADEVSPACE</paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_LISTBOX_DLG_ADABASSTAT_LB_DATADEVS">Displays the path and the name of the DATADEVSPACE file.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152996" xml-lang="en-US" level="2" l10n="U" oldref="11">Database sizes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_SIZE" id="bm_id3150085" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="13">Size (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_SIZE" id="bm_id3150085" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="13">Size (MB)</paragraph>
<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_SIZE">Displays the full size (in megabytes) of the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_DLG_ADABASSTAT_ET_FREESIZE" id="bm_id3152350" localize="false"/><paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="3" l10n="U" oldref="15">Free space (MB)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_ADABASSTAT:ET_FREESIZE" id="bm_id3152350" localize="false"/><paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="3" l10n="U" oldref="15">Free space (MB)</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="DBACCESS_EDIT_DLG_ADABASSTAT_ET_FREESIZE">Displays the amount of free space (in megabytes) that is available in the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_NUMERICFIELD_DLG_ADABASSTAT_ET_MEMORYUSING" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="17">Memory utilization (in %)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:NumericField:DLG_ADABASSTAT:ET_MEMORYUSING" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3149237" xml-lang="en-US" level="3" l10n="U" oldref="17">Memory utilization (in %)</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="DBACCESS_NUMERICFIELD_DLG_ADABASSTAT_ET_MEMORYUSING">Displays the amount of used space in the database as a percentage.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
index 194cbc1abb..9c02ce07a1 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -1,18 +1,12 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 30000000.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -34,8 +28,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabase30000000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Adabas D Database</title>
@@ -44,11 +37,9 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph>
-<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph>
-<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
-<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The Adabas D database that you may have installed together with $[officename] is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph>
+<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">The Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
<paragraph role="heading" id="hd_id3152997" xml-lang="en-US" level="2" l10n="CHG" oldref="3">About Adabas</paragraph>
-<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The Adabas database that you may have installed together with $[officename] is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
+<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The free available Adabas database is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="97">The name of an Adabas file cannot exceed 8 characters. The path to the Adabas file, including the file name, cannot exceed 30 characters, and must be compliant with the 7-bit ASCII code. Both the path and the file name cannot contain spaces.</paragraph>
<paragraph role="note" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="6">Under Windows, the Adabas setup application adds the DBROOT environment variable that contains the path information for the database. If the setup application finds this variable, it does not install the database.</paragraph>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="37">Create New Adabas Database</paragraph>
@@ -66,76 +57,5 @@
</list>
<paragraph role="heading" id="hd_id3154270" xml-lang="en-US" level="2" l10n="U" oldref="42">Deleting an Adabas Database</paragraph>
<paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="CHG" oldref="43">To delete the reference to an Adabas database, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>. Select the database, and then click <emph>Delete</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="103">To delete an Adabas database:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153927" xml-lang="en-US" l10n="CHG" oldref="45">Determine which directories are referred to by the system variables DBCONFIG and DBWORK. <switchinline select="sys"><caseinline select="WIN">Under Windows these variables are defined in the system settings or in the c:\Autoexec.bat file.
-</caseinline></switchinline><switchinline select="sys"><caseinline select="UNIX"> Under Unix these variables are defined in a startup script.
-</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="94">In the $DBCONFIG$ directory, delete the three files that have the same name as the database, but with different extensions. For example, for a database named "Big", delete the "Big.sys", "Big.trs", and "Big.dat" files in the "C:\Adabas\".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="46">In the $DBCONFIG$\Config directory, delete the file that has the same name as the database, for example, " C:\Adabas\Sql\Config\Big".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156712" xml-lang="en-US" l10n="U" oldref="47">In the $DBWORKS$\Wrk directory, delete the directory that has the same name as the database., for example "C:\Adabas\Sql\Wrk\Big".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3166447" xml-lang="en-US" level="2" l10n="U" oldref="71">Starting and Shutting Down an Adabas Database</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147361" xml-lang="en-US" l10n="U" oldref="72">strt -d &lt;DBNAME&gt; -NoDBWindow -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3145298" xml-lang="en-US" l10n="U" oldref="73">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155961" xml-lang="en-US" l10n="U" oldref="74">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; shutdown</paragraph>
-<paragraph role="listitem" id="par_id3154965" xml-lang="en-US" l10n="U" oldref="75">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147252" xml-lang="en-US" l10n="U" oldref="76">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; restart</paragraph>
-<paragraph role="listitem" id="par_id3154663" xml-lang="en-US" l10n="U" oldref="77">switches the database to WARM.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="78">stp -d &lt;DBNAME&gt; -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3148479" xml-lang="en-US" l10n="U" oldref="79">completely shuts down the database</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154020" xml-lang="en-US" level="2" l10n="U" oldref="61">Error Messages in an Adabas Database</paragraph>
-<paragraph role="paragraph" id="par_id3147004" xml-lang="en-US" l10n="U" oldref="62">The following is a list of possible error messages and solutions for working with the Adabas D database.</paragraph>
-<paragraph role="heading" id="hd_id3153273" xml-lang="en-US" level="3" l10n="U" oldref="69">The database cannot be shut down / restarted as a user is still connected to it.</paragraph>
-<paragraph role="paragraph" id="par_id3145761" xml-lang="en-US" l10n="U" oldref="70">Close any other open tasks that show the database contents. On multi-user systems, ensure that all users are disconnected from the database, and then restart $[officename].</paragraph>
-<paragraph role="heading" id="hd_id3157971" xml-lang="en-US" level="3" l10n="U" oldref="63">Client unable to establish connection; -813 SERVERDB MUST BE RESTARTED</paragraph>
-<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="64">This error occurs if you try to access an Adabas D database that has not been started. Ensure that you have defined a Control User for the database, and then start the database.</paragraph>
-<paragraph role="heading" id="hd_id3149529" xml-lang="en-US" level="3" l10n="U" oldref="65">Client unable to establish connection; -8022 USER ALREADY CONNECTED</paragraph>
-<paragraph role="paragraph" id="par_id3153197" xml-lang="en-US" l10n="U" oldref="66">This error occurs if you try to access an Adabas D database more than one time.</paragraph>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="3" l10n="U" oldref="86">Errors occurring when writing the data in the database</paragraph>
-<paragraph role="paragraph" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="87">Restart $[officename], and then change the database properties.</paragraph>
-<paragraph role="heading" id="hd_id3155582" xml-lang="en-US" level="2" l10n="U" oldref="80">Running an Adabas Server on a Network</paragraph>
-<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="81">To run Adabas on a network, you need to install the Adabas server on one machine and the client on the workstations that you want to access the database from.</paragraph>
-<paragraph role="note" id="par_id3149337" xml-lang="en-US" l10n="U" oldref="92">You can only create a new database on the server.</paragraph>
-<paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="3" l10n="U" oldref="82">Enabling a Remote Connection</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="83">Under Windows, start the xtcpupd.exe support program on both the client and the server, and ensure that "Remote SQL via TCP/IP" is selected in the xtcpupd.exe dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="84">On the server, start the x_server program in <switchinline select="sys"><caseinline select="UNIX">adabas\bin
-</caseinline><defaultinline>Adabas\bin</defaultinline></switchinline> directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155141" xml-lang="en-US" l10n="CHG" oldref="104">Choose <emph>File - New - Database</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166428" xml-lang="en-US" l10n="CHG" oldref="88">Click <emph>Connect to an existing database</emph>, and select "Adabas D" in the listbox. Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id296334" xml-lang="en-US" l10n="NEW">In the <emph>Name of the Adabas D database </emph>box, enter the name of the server, a colon, and the name of the database on the server, for example, computername:database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155508" xml-lang="en-US" l10n="CHG" oldref="105">Fill in the remaining pages of the Database Wizard.</paragraph>
-</listitem>
-</list>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/30100000.xhp b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
index 61ec25a288..c673f7af1c 100644
--- a/helpcontent2/source/text/shared/explorer/database/30100000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30100000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 30100000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
<paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="3" l10n="U" oldref="37">Database name</paragraph>
<paragraph role="paragraph" id="par_id3158432" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_DLG_ADABAS_DBNAME">Type the name of the database.</ahelp> The name is added to the <emph>Data source URL</emph> field.</paragraph>
<paragraph role="heading" id="hd_id3150256" xml-lang="en-US" level="2" l10n="U" oldref="3">User settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_EDIT_DLG_INSERT_PAGE_EDT_NAME" id="bm_id3144510" localize="false"/>
+<!-- removed HID SD_EDIT_DLG_INSERT_PAGE_EDT_NAME -->
<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_SYSUSR" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="5">Administrator</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLG_ADABAS_SYSUSR" visibility="hidden">Enter the name of the database administrator.</ahelp> The administrator name and password is assigned when you create an Adabas database. Apart from the administrator, two more users can access the Adabas database.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_ADABAS_CONUSR" id="bm_id3149670" localize="false"/><paragraph role="heading" id="hd_id3149045" xml-lang="en-US" level="3" l10n="U" oldref="7">Control User</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
index 9d266f3ce3..b10574c408 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabaadvprop.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 54d89b3bd9..6dd9b75476 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: dabaadvpropdat.xhp,v $
- * $Revision: 1.10.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,64 +29,72 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
-<title id="tit" xml-lang="en-US">Special Settings</title>
-<filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="data">
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/explorer/database/dabaadvpropdat.xhp">Special Settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW">Specifies the way you can work with data in a database.</paragraph>
-</section>
-<section id="howtoget">
-<paragraph role="paragraph" id="par_id7679372" xml-lang="en-US" l10n="NEW">In a database window, choose <emph>Edit - Database - Advanced Settings</emph>
-</paragraph>
-</section>
-<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>
-<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>
+ <topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Special Settings</title>
+ <filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="data">
+ <paragraph xml-lang="en-US" id="par_idN10556" role="heading" level="1" l10n="CHG"><link href="text/shared/explorer/database/dabaadvpropdat.xhp">Special Settings</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">Specifies the way you can work with data in a database.</paragraph>
+ </section>
+ <section id="howtoget">
+ <paragraph xml-lang="en-US" id="par_id7679372" role="paragraph" l10n="NEW">In a database window, choose <emph>Edit - Database - Advanced Settings</emph>
+ </paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id4572283" role="paragraph" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" 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>
+
+ <paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2" l10n="NEW">Use keyword AS before table alias names</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105947" role="paragraph" l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
+
+
+ <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3534958" role="heading" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id6151921" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN1059E" role="heading" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A2" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN105A5" role="heading" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105A9" role="paragraph" 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 xml-lang="en-US" id="par_idN105BE" role="paragraph" l10n="NEW">Example:</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105C1" role="example" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN105C4" role="heading" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105C8" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN105CB" role="heading" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105CF" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN105D2" role="heading" level="2" l10n="NEW">Display version columns (when available)</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105D6" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN105FA" role="heading" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105FE" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN10613" role="heading" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10617" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN1061A" role="heading" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1061E" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="par_idN10621" role="heading" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10625" role="paragraph" 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>
-<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>
+<paragraph xml-lang="en-US" id="hd_id1101718" role="heading" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3783989" role="paragraph" 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 xml-lang="en-US" id="par_id6684163" role="paragraph" 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 xml-lang="en-US" id="par_id3837397" role="paragraph" 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 xml-lang="en-US" id="hd_id0909200811170166" role="heading" level="2" l10n="NEW">Ignore currency field information</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0909200811170221" role="paragraph" 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>
+<!-- removed HID 39067 -->
+<paragraph xml-lang="en-US" id="hd_id040920092139524" role="heading" level="2" l10n="NEW">Use ODBC conformant date/time literals</paragraph>
+ <paragraph xml-lang="en-US" id="par_id040920092139526" role="paragraph" l10n="NEW"><ahelp hid=".">Check to use ODBC conformant date/time literals.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
index 95bc82db92..990c8691c4 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabaadvpropgen.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp b/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
index dc2e256c0b..712665e3a8 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabadoc.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,26 +27,23 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasedabadocxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Database File</title>
-<filename>/text/shared/explorer/database/dabadoc.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-28T12:47:12">UFI: the main database document window</created>
-<lastedited date="2004-09-22T11:43:42">YJ: checked</lastedited>
-</history>
-</meta>
-<body>
-<section id="dabadoc">
-<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabadoc.xhp">Database File</link></paragraph>
-<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The database file window organizes the tables, views, queries, links, and reports of a database in %PRODUCTNAME.</ahelp></paragraph>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN105B7" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <topic id="textsharedexplorerdatabasedabadocxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Database File</title>
+ <filename>/text/shared/explorer/database/dabadoc.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="dabadoc">
+ <paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabadoc.xhp">Database File</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10554" role="paragraph" l10n="NEW"><ahelp hid=".">The database file window organizes the tables, views, queries, and reports of a database in %PRODUCTNAME.</ahelp></paragraph>
+ </section>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN105B7" role="paragraph" l10n="NEW"><link href="text/shared/explorer/database/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp b/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
index a6e68d8c0c..6365b365c5 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabaprop.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
index 4880d01ebc..f9fcdbbf6d 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabapropadd.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,8 +73,7 @@
<paragraph role="tip" id="par_idN10718" xml-lang="en-US" l10n="NEW">To view changes that you make to the database, close the connection to the database, and then reconnect to the database.</paragraph>
<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Indexes<comment>UFI: seen for dBase</comment></paragraph>
<paragraph role="paragraph" id="par_idN10725" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><comment>UFI: Commercial means Adabas</comment><paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
+<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10742" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size of the data buffer for the database. The setting takes effect after you restart the database.</ahelp><comment>copied from shared\explorer\database\11170000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Data increment (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10761" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB. The setting takes effect after you restart the database.</ahelp></paragraph>
@@ -89,8 +85,6 @@
<paragraph role="paragraph" id="par_idN10788" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Exits the Adabas database server when you exit $[officename]. This option is only available if you start the database server from $[officename] with a control user and password.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Extended</paragraph>
<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/11170100.xhp" name="Database Statistics">Database Statistics</link> dialog, where you can view statistics about the Adabas database.</ahelp></paragraph>
-</case>
-</switch>
<paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2" l10n="NEW">Text contains headers<comment>UFI: the following found for a text file folder, but HELP Ids are somewhere else</comment></paragraph>
<paragraph role="paragraph" id="par_idN107B0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this check box if the first line of the text file contains field names.</ahelp><comment>copied from shared\explorer\database\11040000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105BD" xml-lang="en-US" level="2" l10n="NEW">Field separator</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
index 71bdc226cd..4c75609805 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropcon.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabapropcon.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
index 19a732b0b3..77892be6b7 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabapropgen.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
<paragraph role="warning" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Ensure that the *.dbf file name extension of the dBASE files is lowercase.<comment>moved from shared\explorer\database\11030000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">Browse<comment>UFI: found for dBase</comment></paragraph>
<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can select a file or a directory.</ahelp><comment>which one? or depends?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION" id="bm_id7854243" localize="false"/><paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION" id="bm_id7854243" localize="false"/><paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection with the current settings.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/><paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Path to the text files<comment>UFI: found for text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the path to the folder of the text files.</ahelp></paragraph>
@@ -66,7 +63,7 @@
<paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the ODBC data source.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name that is required to access the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED" id="bm_id4072084" localize="false"/><paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2" l10n="NEW">Password required<comment>UFI: found for Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED" id="bm_id4072084" localize="false"/><paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2" l10n="NEW">Password required<comment>UFI: found for Calc doc</comment></paragraph>
<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, the user will be asked to enter the password that is required to access the database.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/><paragraph role="heading" id="hd_id7806329" xml-lang="en-US" level="2" l10n="NEW">Name of the database<comment>UFI: found for JDBC</comment></paragraph>
<paragraph role="paragraph" id="par_id5589159" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
@@ -81,16 +78,12 @@
<paragraph role="heading" id="par_idN105F7" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
<paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the location of the JDBC data source as a URL.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" id="bm_id9936216" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/39110" id="bm_id5591296" localize="false"/><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
+<!-- removed HID 39110 --><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
<paragraph role="paragraph" id="par_idN10602" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the JDBC driver class that connects to the data source.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" id="bm_id7953123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/39111" id="bm_id4361705" localize="false"/><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
+<!-- removed HID 39111 --><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
<paragraph role="paragraph" id="par_idN10609" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="3" l10n="NEW">Choose a database</paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="heading" id="par_idN1061E" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
-<paragraph role="paragraph" id="par_idN10622" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/30100000.xhp">Create New Adabas D Database</link> dialog.</ahelp></paragraph>
-</case>
-</switch></body>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
index 402ffb81e8..e2d6fe116a 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz00.xhp,v $
- * $Revision: 1.14.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index f291ee3af7..6ce4165036 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz01.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,16 +48,16 @@
<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"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_RB_OPENEXISTINGDOC -->
+<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"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_LB_DOCUMENTLIST -->
+<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"/>
+<!-- removed HID HID_PAGE_DBWIZARD_GENERAL_PB_OPENDOCUMENT -->
+<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"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
index 0269a85a0a..ad52969bf6 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
index 16bfb0366c..b17ecbba7e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02access.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
index a4d150ee86..03bebac157 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02adabas.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02adabas.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
index 283951d5d8..f5a54f9d3e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02ado.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
index 6ed78e6944..9eb29c2ae6 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02dbase.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index 3c78b6b1d6..c15dfe0b0e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02jdbc.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
<paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="2" l10n="NEW">JDBC Examples</paragraph>
<paragraph role="paragraph" id="par_idN10627" xml-lang="en-US" l10n="NEW">
<item type="productname">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL.</paragraph>
-<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in Tools - Options - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
+<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
<paragraph role="heading" id="par_idN10634" xml-lang="en-US" level="3" l10n="NEW">Oracle database</paragraph>
<paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph>
<switch select="sys">
@@ -92,14 +89,14 @@
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
<paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_CONNURL_JDBCPAGE">Enter the URL for the database. For example, for the MySQL JDBC driver, enter "jdbc:mysql://&lt;Servername&gt;/&lt;name of the database&gt;". For more information on the JDBC driver, consult the documentation that came with the driver.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DRIVERCLASS" id="bm_id3153970" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/852248660" id="bm_id3400372" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/852330580" id="bm_id7055879" localize="false"/><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
+<!-- removed HID 852248660 -->
+<!-- removed HID 852330580 --><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
<paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
<section id="classpath">
-<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph>Tools - Options - %PRODUCTNAME</emph>
+<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME</emph>
<emph>- Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/852251216" id="bm_id3968932" localize="false"/><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
+<!-- removed HID 852251216 --><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
<paragraph role="paragraph" id="par_idN106E4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
<paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
index 71321aab36..a3ed715800 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02ldap.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,10 +35,6 @@
<title id="tit" xml-lang="en-US">LDAP Connection</title>
<filename>/text/shared/explorer/database/dabawiz02ldap.xhp</filename>
</topic>
-<history>
-<created date="2004-07-28T15:24:27">UFI: Database Wizard LDAP page</created>
-<lastedited date="2006-04-28T12:20:09">YJ: checked</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id22583"><bookmark_value>LDAP server; address books (Base)</bookmark_value>
@@ -66,7 +59,9 @@
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_CB_USESSL" id="bm_id9989623" localize="false"/>
<paragraph role="heading" id="par_idN105CA" xml-lang="en-US" level="3" l10n="NEW">Use secure connection (SSL)</paragraph>
<paragraph role="paragraph" id="par_idN105CE" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_USESSL_LDAP">Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL).</ahelp> By default, an SSL connection uses port 636. A regular connection uses port 389.</paragraph>
+<section id="relatedtopics">
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
<paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
index 6f5e555579..488a4c75ce 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02mysql.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
index 28daab627b..caef678b8e 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02odbc.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02odbc.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
index 5b44a023c6..ead2ab3e44 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02oracle.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02oracle.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -80,10 +77,10 @@
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT" id="bm_id7325357" localize="false"/>
<paragraph role="heading" id="par_idN10616" xml-lang="en-US" level="2" l10n="NEW">Port number</paragraph>
<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the port number for the database server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/852231276" id="bm_id3172399" localize="false"/>
+<!-- removed HID 852231276 -->
<paragraph role="heading" id="par_idN1061D" xml-lang="en-US" level="2" l10n="NEW">Oracle JDBC Driver Class</paragraph>
<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/852234832" id="bm_id209051" localize="false"/>
+<!-- removed HID 852234832 -->
<paragraph role="heading" id="par_idN10630" xml-lang="en-US" level="2" l10n="NEW">Test Class</paragraph>
<paragraph role="paragraph" id="par_idN10634" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
index 1ec3a89afc..1842d906ec 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02spreadsheet.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
index e08bc1da5b..c8e01bef11 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02text.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz02text.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
index 6ac3ce33f5..a745063c56 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabawiz03auth.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/main.xhp b/helpcontent2/source/text/shared/explorer/database/main.xhp
index 16f75310d3..bde780c01b 100755
--- a/helpcontent2/source/text/shared/explorer/database/main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/main.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/makefile.mk b/helpcontent2/source/text/shared/explorer/database/makefile.mk
index 3492dd4323..207808b4c8 100644
--- a/helpcontent2/source/text/shared/explorer/database/makefile.mk
+++ b/helpcontent2/source/text/shared/explorer/database/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -112,6 +108,7 @@ XHPFILES = \
menuinsert.xhp \
menutools.xhp \
menuview.xhp \
+ migrate_macros.xhp \
password.xhp \
querywizard00.xhp \
querywizard01.xhp \
@@ -138,4 +135,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/explorer/database/menubar.xhp b/helpcontent2/source/text/shared/explorer/database/menubar.xhp
index 01c98996e3..d1579ddc61 100755
--- a/helpcontent2/source/text/shared/explorer/database/menubar.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menubar.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: menubar.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
index b1359b82d5..130b0653fd 100755
--- a/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuedit.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: menuedit.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,12 +54,12 @@
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts an item from the clipboard. If you want, you can insert forms and reports, including subfolders, from one database file to another.</ahelp></paragraph>
<section id="tabbea">
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_TABLE_EDIT" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/12293" id="bm_id2726523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_DB_APP_EDIT" id="bm_id2726523" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DBEdit" id="bm_id2447279" localize="false"/>
<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Edit</paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid=".">Opens a window where you can edit the selected table, query, form, or report.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_TABLE_DELETE" id="bm_id3153824" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/12291" id="bm_id4481643" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_DB_APP_DELETE" id="bm_id4481643" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDelete" id="bm_id1720023" localize="false"/>
<paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="2" l10n="U" oldref="29">Delete</paragraph>
<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BROWSER_TABLE_DELETE">Deletes the selected table, query, form, or report.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/menufile.xhp b/helpcontent2/source/text/shared/explorer/database/menufile.xhp
index adacdc360f..c5741c79ee 100755
--- a/helpcontent2/source/text/shared/explorer/database/menufile.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menufile.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: menufile.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp b/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
index 5676db7ac1..a06681d9d2 100644
--- a/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menufilesave.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: menufilesave.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,16 +44,16 @@
<body>
<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW">Save</paragraph>
<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US" l10n="NEW">In this dialog, you can specify the position and name of a form <comment>UFI: spec says also for report, but reports can be created only by Wizard and are autosaved there</comment><comment>UFI: spec says also for query, cannot verify</comment> that you save within a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link>. The dialog opens automatically when you save a form the first time.<comment>UFI: no chance to open the dialog a second time</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id2862636" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER" id="bm_id2862636" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Create New Directory</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to create a new folder within the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP" id="bm_id2447279" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP" id="bm_id2447279" localize="false"/>
<paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2" l10n="NEW">Up One Level</paragraph>
<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to go up one level in the folder hierarchy.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_Edit_DLG_COLLECTION_VIEW_ED_EXPLORERFILE_FILENAME" id="bm_id1669362" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME" id="bm_id1669362" localize="false"/>
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">File name</paragraph>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the file name for the saved form.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE" id="bm_id1720023" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE" id="bm_id1720023" localize="false"/>
<paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Save</paragraph>
<paragraph role="paragraph" id="par_idN105B9" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click to save the form to the database file.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp b/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
index 1eee2c2b9b..a54cd8a6e6 100755
--- a/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuinsert.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: menuinsert.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menutools.xhp b/helpcontent2/source/text/shared/explorer/database/menutools.xhp
index 4bcb1a86c8..a25e2060f8 100755
--- a/helpcontent2/source/text/shared/explorer/database/menutools.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menutools.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: menutools.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/menuview.xhp b/helpcontent2/source/text/shared/explorer/database/menuview.xhp
index ed1a944b0b..bbfa747913 100755
--- a/helpcontent2/source/text/shared/explorer/database/menuview.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuview.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: menuview.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
new file mode 100644
index 0000000000..11b48dd44f
--- /dev/null
+++ b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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="textsharedexplorerdatabasemigrate_macrosxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Migrate Macros</title>
+ <filename>/text/shared/explorer/database/migrate_macros.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="migrate_macros">
+<bookmark xml-lang="en-US" branch="index" id="bm_id6009095"><bookmark_value>wizards;macros (Base)</bookmark_value>
+ <bookmark_value>Macro Wizard (Base)</bookmark_value>
+ <bookmark_value>macros;attaching new (Base)</bookmark_value>
+ <bookmark_value>migrating macros (Base)</bookmark_value>
+</bookmark><comment>MW added 2 index entries</comment>
+<paragraph xml-lang="en-US" id="hd_id0112200902353472" role="heading" level="1" l10n="NEW"><link href="text/shared/explorer/database/migrate_macros.xhp">Migrate Macros</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBMigrateScripts" id="bm_id0224200911384751" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0112200902353466" role="paragraph" l10n="NEW"><ahelp hid=".">The Database Document Macro Migration Wizard moves existing macros from sub-documents of an old Base file into the new Base file's macro storage area.</ahelp></paragraph>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION" id="bm_id022420091141368" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0224200911454780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string "backup" in the name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES" id="bm_id0224200911450172" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id022420091145472" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The list shows all changes that were applied to the database file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200902353542" role="paragraph" l10n="NEW">Previously, macros have been allowed to reside only in the text sub-documents of forms and reports. Now macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075865" role="paragraph" l10n="NEW">However, it is technically not possible to store macros both in a Base file and in its sub-documents at the same time. So, if you want to attach some new macros to the Base file, while retaining any existing old macros that were stored in the sub-documents, you must move the existing old macros up to the Base file's macro storage area. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075830" role="paragraph" l10n="NEW">The Database Document Macro Migration Wizard can move the macros up into the Base file's storage area. You can then examine the macros and edit them as needed. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075951" role="paragraph" l10n="NEW">For example, it is possible that macros from the sub-documents had the same module names and macro names. After you moved the macros into one common macro storage area, you must edit the macros to make the names unique. The wizard cannot do this.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200903075915" role="paragraph" l10n="NEW">The wizard can backup the Base file to another folder of your choice. The wizard changes the original Base file. The backup remains unchanged.</paragraph>
+ <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"/>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/password.xhp b/helpcontent2/source/text/shared/explorer/database/password.xhp
index 7329f0c2b1..18782424a4 100644
--- a/helpcontent2/source/text/shared/explorer/database/password.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/password.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: password.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,13 +41,13 @@
</meta>
<body>
<paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="1" l10n="NEW">User Name and Password Required</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_Edit_DLG_LOGIN_ED_LOGIN_USERNAME" id="bm_id1444135" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_USERNAME" id="bm_id1444135" localize="false"/>
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN10551" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name to connect to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_Edit_DLG_LOGIN_ED_LOGIN_PASSWORD" id="bm_id7426984" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:Edit:DLG_LOGIN:ED_LOGIN_PASSWORD" id="bm_id7426984" localize="false"/>
<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Password</paragraph>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password to connect to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_CheckBox_DLG_LOGIN_CB_LOGIN_SAVEPASSWORD" id="bm_id9922788" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_LOGIN:CB_LOGIN_SAVEPASSWORD" id="bm_id9922788" localize="false"/>
<paragraph role="heading" id="par_idN10583" xml-lang="en-US" level="2" l10n="NEW">Remember password till end of session</paragraph>
<paragraph role="paragraph" id="par_idN10587" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the same user name and password without further dialog, when you connect again to the same data source in the current %PRODUCTNAME session.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
index 0019cd3083..6baf02dc4e 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard00.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
index ea6dd5a01d..450e2f8b50 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard01.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
index f9de67fb94..2e7ae511f9 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard02.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard02.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
index 605775ec52..7c818e7087 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard03.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard03.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
index 8c236291d1..32600760c6 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard04.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard04.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
index cd5d31bb94..f283f1f4f7 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard05.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
index 99bf15df79..66e7e4a6c3 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard06.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard06.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
index d7f1b7472c..1293b5bc48 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard07.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard07.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
index e516037e92..0f1cbd156a 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard08.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: querywizard08.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp b/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
index c997db7bff..e08f3b0657 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_datetime.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: rep_datetime.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,14 +44,14 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can open the Date and Time dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Date and Time</item>.</ahelp></paragraph>
<paragraph role="tip" id="par_id6278878" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878529" id="bm_id5607470" localize="false"/><paragraph role="paragraph" id="par_id393078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878018" id="bm_id9102145" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878019" id="bm_id3624073" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878020" id="bm_id1140781" localize="false"/><paragraph role="paragraph" id="par_id1271401" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the date.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878533" id="bm_id6481215" localize="false"/><paragraph role="paragraph" id="par_id8718832" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577878022" id="bm_id5113681" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878023" id="bm_id3558458" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1577878024" id="bm_id3776360" localize="false"/><paragraph role="paragraph" id="par_id8561052" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the time.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_DATE" id="bm_id5607470" localize="false"/><paragraph role="paragraph" id="par_id393078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed.</ahelp></paragraph>
+<!-- removed HID 1577878018 -->
+<!-- removed HID 1577878019 -->
+<!-- removed HID 1577878020 --><paragraph role="paragraph" id="par_id1271401" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the date.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_TIME" id="bm_id6481215" localize="false"/><paragraph role="paragraph" id="par_id8718832" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed.</ahelp></paragraph>
+<!-- removed HID 1577878022 -->
+<!-- removed HID 1577878023 -->
+<!-- removed HID 1577878024 --><paragraph role="paragraph" id="par_id8561052" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a format to display the time.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id5992919" xml-lang="en-US" l10n="NEW">Click OK to insert the field.</paragraph>
<paragraph role="paragraph" id="par_id4320810" xml-lang="en-US" l10n="NEW">You can click the date or time field and drag to another position within the same area, or edit the properties in the Properties window.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index ee3e9162f4..a154988d03 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: rep_main.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,204 +31,223 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Report Builder</title>
-<filename>/text/shared/explorer/database/rep_main.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Report Builder</title>
+ <filename>/text/shared/explorer/database/rep_main.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id1614429"><bookmark_value>Report Builder</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id8773155" xml-lang="en-US" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
+<paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id5248573" xml-lang="en-US" l10n="NEW">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
-<paragraph role="note" id="par_id7128818" xml-lang="en-US" l10n="NEW">To use the Report Builder, the Report Builder extension must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
-<paragraph role="heading" id="hd_id3753776" xml-lang="en-US" level="2" l10n="NEW">To Install the Report Builder Extension</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5284279" xml-lang="en-US" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4494766" xml-lang="en-US" l10n="NEW">Click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7858516" xml-lang="en-US" l10n="NEW">Find the Sun Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id973540" xml-lang="en-US" l10n="NEW">Click the "Get it!" icon. The file "sun-report-builder.oxt" will be downloaded to your computer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4680928" xml-lang="en-US" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9014252" xml-lang="en-US" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6011841" xml-lang="en-US" l10n="NEW">Select the "sun-report-builder.oxt" file that you downloaded. Click Open.</paragraph>
-<paragraph role="paragraph" id="par_id2591326" xml-lang="en-US" l10n="NEW">This starts the installation of the Sun Report Builder extension.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6201666" xml-lang="en-US" l10n="NEW">Read the license. If you accept the license, click Accept to continue the installation.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id208136" xml-lang="en-US" l10n="NEW">Click Close to close the Extension Manager.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id556047" xml-lang="en-US" level="3" l10n="NEW">To install the JRE software</paragraph>
-<paragraph role="paragraph" id="par_id4515823" xml-lang="en-US" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id4044312" xml-lang="en-US" l10n="NEW">Choose Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id1369060" xml-lang="en-US" l10n="NEW">Wait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system.</paragraph>
-<paragraph role="paragraph" id="par_id860927" xml-lang="en-US" l10n="NEW">If a recent JRE version is found on your system, you see an entry in the list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id8581804" xml-lang="en-US" l10n="NEW">Click the option button in front of the entry to enable this JRE version for use in %PRODUCTNAME.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW">Ensure that <emph>Use a Java runtime environment</emph> is enabled.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id6317636" xml-lang="en-US" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open Tools - Options - %PRODUCTNAME - Java again.</paragraph>
-<paragraph role="heading" id="hd_id9759514" xml-lang="en-US" level="2" l10n="NEW">To open the Report Builder</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id9076509" xml-lang="en-US" l10n="NEW">Open a Base file or create a new database. The database must contain at least one table with at least one data field and a primary key field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7050691" xml-lang="en-US" l10n="NEW">Click the Reports icon in the Base window, then choose Create Report in Design View.</paragraph>
-<paragraph role="paragraph" id="par_id7118747" xml-lang="en-US" l10n="NEW">The Report Builder window opens. </paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8283639" xml-lang="en-US" l10n="NEW">The Report Builder is divided into three parts. On the top you see the menu, with the toolbars below.</paragraph>
-<paragraph role="paragraph" id="par_id2291024" xml-lang="en-US" l10n="NEW">On the right you see the Properties window with the property values of the currently selected object.</paragraph>
-<paragraph role="paragraph" id="par_id2100589" xml-lang="en-US" l10n="NEW">The left part of the Report Builder window shows the Report Builder view. The Report Builder view is initially divided into three sections, from top to bottom:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5022125" xml-lang="en-US" l10n="NEW">
-<emph>Page Header</emph> - drag control fields with fixed text into the Page Header area</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6844386" xml-lang="en-US" l10n="NEW">
-<emph>Detail</emph> - drag and drop database fields into the Detail area</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7018646" xml-lang="en-US" l10n="NEW">
-<emph>Page Footer</emph> - drag control fields with fixed text into the Page Footer area</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id5857112" xml-lang="en-US" l10n="NEW">To insert an additional <emph>Report Header</emph> and <emph>Report Footer</emph> area choose <item type="menuitem">Edit - Insert Report Header/Footer</item>. These areas contain text that appears at the start and end of the whole report.</paragraph><comment>id="par_id2685323" l10n="NEW"If you want a multi-column report, choose Format - Page, click the Columns tab, and set the number of columns. Now you can also specify a Column Header and Column Footer in the Report Builder view.</comment><comment>column header/footer</comment><paragraph role="paragraph" id="par_id6042664" xml-lang="en-US" l10n="NEW">Click the "-" icon in front of an area name to collapse that area to one line in the Report Builder view. The "-" icon changes to a "+" icon, and you can click this to expand the area again.</paragraph>
-<paragraph role="paragraph" id="par_id1589098" xml-lang="en-US" l10n="NEW">You insert database fields by drag-and-drop into the Detail area. See the section "To insert fields into the report" below.</paragraph>
-<paragraph role="paragraph" id="par_id1278420" xml-lang="en-US" l10n="NEW">In addition, you can click the Label Field or Text Box icon in the toolbar, then drag a rectangle in the Page Header or Page Footer area, to define a text that is the same on all pages. You enter the text in the Label box of the corresponding Properties window. You can also add graphics by using the Graphics icon.</paragraph>
-<paragraph role="heading" id="par_id7479476" xml-lang="en-US" level="2" l10n="NEW">To connect the report to a database table</paragraph>
-<paragraph role="paragraph" id="par_id3099154" xml-lang="en-US" l10n="NEW">First you must connect the report to a database table.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2218390" xml-lang="en-US" l10n="NEW">Move the mouse to the Properties view. You see two tab pages General and Data.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7771538" xml-lang="en-US" l10n="NEW">On the Data tab page, click Content to open the combo box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id366527" xml-lang="en-US" l10n="NEW">Select the table for that you want to create the report.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7996459" xml-lang="en-US" l10n="NEW">After selecting the table, press the <item type="keycode">Tab</item> key to leave the Content box.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id2531815" xml-lang="en-US" l10n="NEW">The Add Field window opens automatically and shows all fields of the selected table.</paragraph>
-<paragraph role="heading" id="par_id5927304" xml-lang="en-US" level="2" l10n="NEW">To insert fields into the report</paragraph>
-<paragraph role="paragraph" id="par_id4503921" xml-lang="en-US" l10n="NEW">The Add Field window helps you to insert the table entries in the report. Click the Add Field icon in the toolbar to open the Add Field window.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id4051026" xml-lang="en-US" l10n="NEW">Drag and drop the field names one by one from the Add Field window into the Detail area of the report. Position the fields as you like. Use the icons in the toolbars to align the fields.</paragraph>
-<paragraph role="paragraph" id="par_id3397320" xml-lang="en-US" l10n="NEW">It is not possible to overlap the fields. If you drop a table field on the Detail area, then a label and a text box are inserted.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3059785" xml-lang="en-US" l10n="NEW">You can also insert text that should be the same on every page of the report. Click the Label Field icon
-<image id="img_id5605334" src="res/commandimagelist/sc_label.png" width="0.0902inch" height="0.0902inch" localize="true"><alt id="alt_id5605334" xml-lang="en-US">label field icon</alt>
+ <paragraph xml-lang="en-US" id="par_id5248573" role="paragraph" l10n="NEW">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7128818" role="note" l10n="NEW">To use the Report Builder, the Report Builder extension must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3753776" role="heading" level="2" l10n="NEW">To Install the Report Builder Extension</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5284279" role="paragraph" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The extension file will be downloaded to your computer.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the extension file that you downloaded. Click Open.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Report Builder extension.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6201666" role="paragraph" l10n="NEW">Read the license. If you accept the license, click Accept to continue the installation.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id208136" role="paragraph" l10n="NEW">Click Close to close the Extension Manager.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id20813699" role="paragraph" l10n="NEW">Restart %PRODUCTNAME. If the Quickstarter is running, also close the Quickstarter.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2" l10n="NEW">To install the JRE software</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1369060" role="paragraph" l10n="NEW">Wait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id860927" role="paragraph" l10n="NEW">If a recent JRE version is found on your system, you see an entry in the list.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id8581804" role="paragraph" l10n="NEW">Click the option button in front of the entry to enable this JRE version for use in %PRODUCTNAME.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7730033" role="paragraph" l10n="NEW">Ensure that <emph>Use a Java runtime environment</emph> is enabled.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java again.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9759514" role="heading" level="2" l10n="NEW">To open the Report Builder</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9076509" role="paragraph" l10n="NEW">Open a Base file or create a new database. The database must contain at least one table with at least one data field and a primary key field.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7050691" role="paragraph" l10n="NEW">Click the Reports icon in the Base window, then choose Create Report in Design View.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7118747" role="paragraph" l10n="NEW">The Report Builder window opens. </paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id8283639" role="paragraph" l10n="NEW">The Report Builder is divided into three parts. On the top you see the menu, with the toolbars below.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2291024" role="paragraph" l10n="NEW">On the right you see the Properties window with the property values of the currently selected object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2100589" role="paragraph" l10n="NEW">The left part of the Report Builder window shows the Report Builder view. The Report Builder view is initially divided into three sections, from top to bottom:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5022125" role="paragraph" l10n="NEW">
+ <emph>Page Header</emph> - drag control fields with fixed text into the Page Header area</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6844386" role="paragraph" l10n="NEW">
+ <emph>Detail</emph> - drag and drop database fields into the Detail area</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7018646" role="paragraph" l10n="NEW">
+ <emph>Page Footer</emph> - drag control fields with fixed text into the Page Footer area</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id5857112" role="paragraph" l10n="NEW">To insert an additional <emph>Report Header</emph> and <emph>Report Footer</emph> area choose <item type="menuitem">Edit - Insert Report Header/Footer</item>. These areas contain text that appears at the start and end of the whole report.</paragraph><comment>id="par_id2685323" l10n="NEW"If you want a multi-column report, choose Format - Page, click the Columns tab, and set the number of columns. Now you can also specify a Column Header and Column Footer in the Report Builder view.</comment><comment>column header/footer</comment>
+<paragraph xml-lang="en-US" id="par_id6042664" role="paragraph" l10n="NEW">Click the "-" icon in front of an area name to collapse that area to one line in the Report Builder view. The "-" icon changes to a "+" icon, and you can click this to expand the area again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1589098" role="paragraph" l10n="NEW">You insert database fields by drag-and-drop into the Detail area. See the section "To insert fields into the report" below.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1278420" role="paragraph" l10n="NEW">In addition, you can click the Label Field or Text Box icon in the toolbar, then drag a rectangle in the Page Header or Page Footer area, to define a text that is the same on all pages. You enter the text in the Label box of the corresponding Properties window. You can also add graphics by using the Graphics icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7479476" role="heading" level="2" l10n="NEW">To connect the report to a database table</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3099154" role="paragraph" l10n="NEW">First you must connect the report to a database table.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2218390" role="paragraph" l10n="NEW">Move the mouse to the Properties view. You see two tab pages General and Data.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7771538" role="paragraph" l10n="NEW">On the Data tab page, click Content to open the combo box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id366527" role="paragraph" l10n="NEW">Select the table for that you want to create the report.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7996459" role="paragraph" l10n="NEW">After selecting the table, press the Tab key to leave the Content box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id2531815" role="paragraph" l10n="NEW">The Add Field window opens automatically and shows all fields of the selected table.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5927304" role="heading" level="2" l10n="NEW">To insert fields into the report</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4503921" role="paragraph" l10n="NEW">The Add Field window helps you to insert the table entries in the report. Click the Add Field icon in the toolbar to open the Add Field window.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4051026" role="paragraph" l10n="NEW">Drag and drop the field names one by one from the Add Field window into the Detail area of the report. Position the fields as you like. Use the icons in the toolbars to align the fields.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW">It is not possible to overlap the fields. If you drop a table field on the Detail area, then a label and a text box are inserted.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3059785" role="paragraph" l10n="NEW">You can also insert text that should be the same on every page of the report. Click the Label Field icon
+<image id="img_id5605334" src="res/commandimagelist/sc_label.png" width="0.566cm" height="0.566cm" localize="true"><alt xml-lang="en-US" id="alt_id5605334">Icon</alt>
</image>, then drag a rectangle in the Page Header or Page Footer area. Edit the Label property to show the text you want.</paragraph>
-</listitem>
-</list><comment>Align at Section toolbar</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignLeft" id="bm_id7889950" localize="false"/><paragraph role="paragraph" id="par_id7657399" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the left margin of the area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignRight" id="bm_id3236182" localize="false"/><paragraph role="paragraph" id="par_id8925138" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the right margin of the area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignTop" id="bm_id1251258" localize="false"/><paragraph role="paragraph" id="par_id5461897" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the top margin of the area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignBottom" id="bm_id8111819" localize="false"/><paragraph role="paragraph" id="par_id8919339" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the bottom margin of the area.</ahelp></paragraph><comment>Object Resizing toolbar</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:SmallestWidth" id="bm_id9116794" localize="false"/><paragraph role="paragraph" id="par_id4634235" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SmallestHeight" id="bm_id4381847" localize="false"/><paragraph role="paragraph" id="par_id1393475" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:GreatestWidth" id="bm_id1336710" localize="false"/><paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest width.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:GreatestHeight" id="bm_id1221655" localize="false"/><paragraph role="paragraph" id="par_id5376140" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest height.</ahelp></paragraph><comment>Report Controls toolbar</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:HFixedLine" id="bm_id4408093" localize="false"/><paragraph role="paragraph" id="par_id9611499" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a horizontal line to the current area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:VFixedLine" id="bm_id6949369" localize="false"/><paragraph role="paragraph" id="par_id6765953" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a vertical line to the current area.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1511581" xml-lang="en-US" l10n="NEW">After inserting fields in the Detail view, the report is ready for execution.</paragraph>
-<paragraph role="heading" id="par_id4881740" xml-lang="en-US" level="2" l10n="NEW">To execute a report</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id8286385" xml-lang="en-US" l10n="NEW">Click the Execute Report icon
-<image id="img_id3380230" src="res/commandimagelist/sc_executereport.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3380230" xml-lang="en-US">execute report icon</alt>
+ </listitem>
+ </list><comment>Align at Section toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignLeft" id="bm_id7889950" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7657399" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the left margin of the area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignRight" id="bm_id3236182" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8925138" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the right margin of the area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignTop" id="bm_id1251258" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5461897" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the top margin of the area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignBottom" id="bm_id8111819" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8919339" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the bottom margin of the area.</ahelp></paragraph><comment>Object Resizing toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:SmallestWidth" id="bm_id9116794" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4634235" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest width.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SmallestHeight" id="bm_id4381847" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1393475" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the smallest height.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GreatestWidth" id="bm_id1336710" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6571550" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest width.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GreatestHeight" id="bm_id1221655" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5376140" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to resize the objects to the greatest height.</ahelp></paragraph><comment>Report Controls toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:HFixedLine" id="bm_id4408093" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id9611499" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a horizontal line to the current area.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:VFixedLine" id="bm_id6949369" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6765953" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts a vertical line to the current area.</ahelp></paragraph><comment>Shrink toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionShrink" id="bm_id040920092222313" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922242612" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shrinks the selected section to remove top and bottom empty space.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionShrinkTop" id="bm_id0409200922231489" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922242617" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shrinks the selected section to remove top empty space.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SectionShrinkBottom" id="bm_id040920092223576" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922242661" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Shrinks the selected section to remove bottom empty space.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1511581" role="paragraph" l10n="NEW">After inserting fields in the Detail view, the report is ready for execution.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4881740" role="heading" level="2" l10n="NEW">To execute a report</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id8286385" role="paragraph" l10n="NEW">Click the Execute Report icon
+<image id="img_id3380230" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3380230">Icon</alt>
</image> on the toolbar.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id2354197" xml-lang="en-US" l10n="NEW">A Writer document opens and shows the report you have created, which contains all values of the database table which you have insert.</paragraph>
-<paragraph role="paragraph" id="par_id2485122" xml-lang="en-US" l10n="NEW">If the database contents did change, execute the report again to update the result report.<comment>automatic? message?</comment></paragraph>
-<paragraph role="heading" id="hd_id8746910" xml-lang="en-US" level="2" l10n="NEW">To edit a report</paragraph>
-<paragraph role="paragraph" id="par_id9636524" xml-lang="en-US" l10n="NEW">First decide if you want to edit the generated report, which is a static Writer document, or if you want to edit the Report Builder view and then generate a new report based on the new design.</paragraph>
-<paragraph role="paragraph" id="par_id5941648" xml-lang="en-US" l10n="NEW">The Writer document is opened read-only. To edit the Writer document, click Edit File
-<image id="img_id8237556" src="res/commandimagelist/sc_editdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id8237556" xml-lang="en-US">edit file icon</alt>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id2354197" role="paragraph" l10n="NEW">A Writer document opens and shows the report you have created, which contains all values of the database table which you have insert.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2485122" role="paragraph" l10n="NEW">If the database contents did change, execute the report again to update the result report.<comment>automatic? message?</comment></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id8746910" role="heading" level="2" l10n="NEW">To edit a report</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9636524" role="paragraph" l10n="NEW">First decide if you want to edit the generated report, which is a static Writer document, or if you want to edit the Report Builder view and then generate a new report based on the new design.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5941648" role="paragraph" l10n="NEW">The Writer document is opened read-only. To edit the Writer document, click Edit File
+<image id="img_id8237556" src="res/commandimagelist/sc_editdoc.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id8237556">Icon</alt>
</image> on the Standard toolbar.<comment>saved automatically with the Base file?</comment></paragraph>
-<paragraph role="paragraph" id="par_id8307138" xml-lang="en-US" l10n="CHG">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
-<paragraph role="paragraph" id="par_id7138889" xml-lang="en-US" l10n="NEW">Click in the Details area. Then in the Properties window, change some properties, for example the background color.</paragraph>
-<paragraph role="paragraph" id="par_id9869380" xml-lang="en-US" l10n="NEW">After finishing, click the Execute Report icon
-<image id="Graphic2" src="res/commandimagelist/sc_executereport.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">execute report icon</alt>
+ <paragraph xml-lang="en-US" id="par_id8307138" role="paragraph" l10n="CHG">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7138889" role="paragraph" l10n="NEW">Click in the Details area. Then in the Properties window, change some properties, for example the background color.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9869380" role="paragraph" l10n="NEW">After finishing, click the Execute Report icon
+<image id="Graphic2" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
</image> to create a new report.</paragraph>
-<paragraph role="paragraph" id="par_id12512" xml-lang="en-US" l10n="NEW">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
-<paragraph role="heading" id="par_id2676168" xml-lang="en-US" level="2" l10n="NEW">Sorting the report</paragraph>
-<paragraph role="paragraph" id="par_id2626422" xml-lang="en-US" l10n="NEW">Without sorting or grouping, the records will be inserted into the report in the order in which they are retrieved from the database.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id1743827" xml-lang="en-US" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="img_id9557786" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id9557786" xml-lang="en-US">sorting and grouping icon</alt>
+ <paragraph xml-lang="en-US" id="par_id12512" role="paragraph" l10n="NEW">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id2676168" role="heading" level="2" l10n="NEW">Sorting the report</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2626422" role="paragraph" l10n="NEW">Without sorting or grouping, the records will be inserted into the report in the order in which they are retrieved from the database.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1743827" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
+<image id="img_id9557786" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt>
</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4331797" xml-lang="en-US" l10n="NEW">In the Groups box, click the field which you want as the first sort field, and set the Sorting property.<comment>what meaning has the order of fields / move up down button?</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4191717" xml-lang="en-US" l10n="NEW">Execute the report.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_id2318796" xml-lang="en-US" level="2" l10n="NEW">Grouping</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id399182" xml-lang="en-US" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="Graphic21" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">sorting and grouping icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4331797" role="paragraph" l10n="NEW">In the Groups box, click the field which you want as the first sort field, and set the Sorting property.<comment>what meaning has the order of fields / move up down button?</comment></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id4191717" role="paragraph" l10n="NEW">Execute the report.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id2318796" role="heading" level="2" l10n="NEW">Grouping</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id399182" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
+<image id="Graphic21" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7588732" xml-lang="en-US" l10n="NEW">In the Groups box, open the Group Header list box and select to show a group header.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id95828" xml-lang="en-US" l10n="NEW">Click the Add Field icon
-<image id="Graphic3" src="res/commandimagelist/sc_addfield.png" width="0.2201inch" height="0.2201inch"><alt id="alt_" xml-lang="en-US">add field icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7588732" role="paragraph" l10n="NEW">In the Groups box, open the Group Header list box and select to show a group header.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="NEW">Click the Add Field icon
+<image id="Graphic3" src="res/commandimagelist/sc_addfield.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
</image> to open the Add Field window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5675527" xml-lang="en-US" l10n="NEW">Drag-and-drop the field entry that you want to group into the group header section. Then drag-and-drop the remaining fields into the Detail section.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3496200" xml-lang="en-US" l10n="NEW">Execute the report. The report shows the grouped records.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id7599108" xml-lang="en-US" l10n="NEW">If you like to sort and group, open the Report Builder view, then open the Sorting and Grouping dialog. Select to show a Group Header for the fields that you want to group, and select to hide the Group Header for the fields that you want to be sorted. Close the Sorting and Grouping window and execute the report.</paragraph>
-<paragraph role="heading" id="par_id888698" xml-lang="en-US" level="2" l10n="NEW">Updating and printing your data</paragraph>
-<paragraph role="paragraph" id="par_id3394573" xml-lang="en-US" l10n="NEW">When you insert some new data or edit data in the table, a new report will show the updated data.</paragraph>
-<paragraph role="paragraph" id="par_id7594225" xml-lang="en-US" l10n="NEW">Click the Reports icon
-<image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.222inch" height="0.222inch"><alt id="alt_id4678487" xml-lang="en-US">reports icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5675527" role="paragraph" l10n="NEW">Drag-and-drop the field entry that you want to group into the group header section. Then drag-and-drop the remaining fields into the Detail section.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3496200" role="paragraph" l10n="NEW">Execute the report. The report shows the grouped records.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="NEW">If you like to sort and group, open the Report Builder view, then open the Sorting and Grouping dialog. Select to show a Group Header for the fields that you want to group, and select to hide the Group Header for the fields that you want to be sorted. Close the Sorting and Grouping window and execute the report.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id888698" role="heading" level="2" l10n="NEW">Updating and printing your data</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW">When you insert some new data or edit data in the table, a new report will show the updated data.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">Click the Reports icon
+<image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4678487">Icon</alt>
</image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
-<paragraph role="paragraph" id="par_id8147221" xml-lang="en-US" l10n="NEW">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp b/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
index add37e669a..a2c4323d92 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: rep_navigator.xhp,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +47,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id1150852" xml-lang="en-US" l10n="NEW">You can open the Report Navigator window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">View - Report Navigator</item>.</paragraph>
<paragraph role="paragraph" id="par_id1111484" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Report Navigator reveals the structure of the report. You can use the Report Navigator to insert functions into the report.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/64521" id="bm_id7007354" localize="false"/><paragraph role="paragraph" id="par_id8314157" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click an entry in the Report Navigator. The corresponding object or area is selected in the Report Builder view. Right-click an entry to open the context menu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_REPORT_NAVIGATOR_TREE" id="bm_id7007354" localize="false"/><paragraph role="paragraph" id="par_id8314157" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click an entry in the Report Navigator. The corresponding object or area is selected in the Report Builder view. Right-click an entry to open the context menu.</ahelp></paragraph>
<paragraph role="heading" id="hd_id2932828" xml-lang="en-US" level="2" l10n="NEW">To enter functions to the report</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:NewFunction" id="bm_id974456" localize="false"/><paragraph role="paragraph" id="par_id5091708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the context menu of the Report Navigator, you see the same commands as in the Report Builder view, plus additional commands to create new functions or to delete them.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id9449446" xml-lang="en-US" l10n="NEW">Functions can be entered using a syntax as specified by the <link href="http://en.wikipedia.org/wiki/OpenFormula">OpenFormula</link> proposal.</paragraph>
@@ -82,9 +78,9 @@
<paragraph role="paragraph" id="par_id9256874" xml-lang="en-US" l10n="NEW">Maybe you have to set the initial value to the value of the field like [field].<comment>these 3 paras copied from another mail by Ocke in users@dba.o.o</comment></paragraph>
<paragraph role="paragraph" id="par_id4601886" xml-lang="en-US" l10n="NEW">If there are blank fields in the cost column, use the following formula to replace the blank fields' content with zero:</paragraph>
<paragraph role="code" id="par_id1754509" xml-lang="en-US" l10n="NEW">[SumCost] + IF(ISBLANK([field]);0;[field])</paragraph><comment>need some real working examples. See i81874</comment><comment>Formula</comment>
-<bookmark xml-lang="en-US" branch="hid/64522" id="bm_id2767113" localize="false"/><paragraph role="paragraph" id="par_id8122196" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the formula that defines the function. Use OpenFormula syntax.</ahelp></paragraph><comment>Initial value</comment>
-<bookmark xml-lang="en-US" branch="hid/64523" id="bm_id301828" localize="false"/><paragraph role="paragraph" id="par_id9909665" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Enter the initial value for the evaluation of the formula. Often this is set to 0 or to 1.</ahelp></paragraph><comment>Deep traversing</comment>
-<bookmark xml-lang="en-US" branch="hid/64518" id="bm_id8996246" localize="false"/><paragraph role="paragraph" id="par_id9141819" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Deep traversing is enabled, functions are evaluated considering all lower levels of hierarchy. This would be used for instance for line numbering. If Deep traversing is not enabled, only the first level of hierarchy is evaluated.</ahelp></paragraph><comment>Pre evaluation</comment>
-<bookmark xml-lang="en-US" branch="hid/64519" id="bm_id5729544" localize="false"/><paragraph role="paragraph" id="par_id6354869" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Pre evaluation is enabled, functions are evaluated only when the report is finished.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_FORMULA" id="bm_id2767113" localize="false"/><paragraph role="paragraph" id="par_id8122196" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the formula that defines the function. Use OpenFormula syntax.</ahelp></paragraph><comment>Initial value</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_INITIALFORMULA" id="bm_id301828" localize="false"/><paragraph role="paragraph" id="par_id9909665" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Enter the initial value for the evaluation of the formula. Often this is set to 0 or to 1.</ahelp></paragraph><comment>Deep traversing</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_DEEPTRAVERSING" id="bm_id8996246" localize="false"/><paragraph role="paragraph" id="par_id9141819" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Deep traversing is enabled, functions are evaluated considering all lower levels of hierarchy. This would be used for instance for line numbering. If Deep traversing is not enabled, only the first level of hierarchy is evaluated.</ahelp></paragraph><comment>Pre evaluation</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PREEVALUATED" id="bm_id5729544" localize="false"/><paragraph role="paragraph" id="par_id6354869" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">If Pre evaluation is enabled, functions are evaluated only when the report is finished.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp b/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
index 171b5bbc21..b1e09930b7 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_pagenumbers.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: rep_pagenumbers.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,11 +44,11 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can open the Page Numbers dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Page Numbers</item>.</ahelp></paragraph>
<paragraph role="tip" id="par_id1068758" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861634" id="bm_id7565843" localize="false"/><paragraph role="paragraph" id="par_id1559190" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861635" id="bm_id6649372" localize="false"/><paragraph role="paragraph" id="par_id9879146" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N of M</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861637" id="bm_id7334208" localize="false"/><paragraph role="paragraph" id="par_id9404278" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Top of Page (Header)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577861638" id="bm_id8313852" localize="false"/><paragraph role="paragraph" id="par_id7626880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Bottom of Page (Footer)</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1577864712" id="bm_id8829309" localize="false"/><paragraph role="paragraph" id="par_id6124149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Alignment</ahelp></paragraph><comment>Show Number On First Page - not in UI</comment><paragraph role="paragraph" id="par_id9651478" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Show Number on First Page</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N" id="bm_id7565843" localize="false"/><paragraph role="paragraph" id="par_id1559190" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N_OF_M" id="bm_id6649372" localize="false"/><paragraph role="paragraph" id="par_id9879146" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Page N of M</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_TOPPAGE" id="bm_id7334208" localize="false"/><paragraph role="paragraph" id="par_id9404278" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Top of Page (Header)</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_BOTTOMPAGE" id="bm_id8313852" localize="false"/><paragraph role="paragraph" id="par_id7626880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Bottom of Page (Footer)</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_PAGENUMBERS_LST_ALIGNMENT" id="bm_id8829309" localize="false"/><paragraph role="paragraph" id="par_id6124149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Alignment</ahelp></paragraph><comment>Show Number On First Page - not in UI</comment><paragraph role="paragraph" id="par_id9651478" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Show Number on First Page</ahelp></paragraph>
<list type="unordered">
<listitem>
<paragraph role="paragraph" id="par_id8257087" xml-lang="en-US" l10n="NEW">Select the format for the page numbers, either "Page N" or "Page N of M", where N stands for the current page number, and M for the total number of pages in the report.</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp b/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
index 1e22300e1d..6f83c36817 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_prop.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: rep_prop.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,35 +46,35 @@
<paragraph role="tip" id="par_id1080660" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
<paragraph role="paragraph" id="par_id7175817" xml-lang="en-US" l10n="NEW">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
<paragraph role="paragraph" id="par_id9895931" xml-lang="en-US" l10n="NEW">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64473" id="bm_id5135044" localize="false"/><paragraph role="paragraph" id="par_id3587145" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_FIELD_SEL" id="bm_id5135044" localize="false"/><paragraph role="paragraph" id="par_id3587145" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id6993926" xml-lang="en-US" l10n="NEW">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/><paragraph role="tip" id="par_id3729361" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To display the Data or General tab page for the whole report, choose Edit - Select Report.</ahelp></paragraph><comment>Group keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/64505" id="bm_id5392315" localize="false"/><paragraph role="paragraph" id="par_id1768852" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
-<bookmark xml-lang="en-US" branch="hid/64506" id="bm_id7852412" localize="false"/><paragraph role="paragraph" id="par_id6304818" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
-<bookmark xml-lang="en-US" branch="hid/64507" id="bm_id9031952" localize="false"/><paragraph role="paragraph" id="par_id401623" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
-<bookmark xml-lang="en-US" branch="hid/64493" id="bm_id7956785" localize="false"/><paragraph role="paragraph" id="par_id2162236" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/><paragraph role="paragraph" id="par_id1768852" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/><paragraph role="paragraph" id="par_id6304818" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/><paragraph role="paragraph" id="par_id401623" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/><paragraph role="paragraph" id="par_id2162236" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id7022003" xml-lang="en-US" l10n="NEW">If you click the Page Header or Page Footer area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
<paragraph role="paragraph" id="par_id7004303" xml-lang="en-US" l10n="NEW">You can edit some visual properties for the area.<comment>screen only or also in report?</comment></paragraph><comment>Background color</comment>
-<bookmark xml-lang="en-US" branch="hid/64511" id="bm_id9801324" localize="false"/><paragraph role="paragraph" id="par_id2561723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
-<bookmark xml-lang="en-US" branch="hid/64504" id="bm_id7446516" localize="false"/><paragraph role="paragraph" id="par_id1064485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
-<bookmark xml-lang="en-US" branch="hid/64515" id="bm_id8859828" localize="false"/><paragraph role="paragraph" id="par_id2356028" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
-<bookmark xml-lang="en-US" branch="hid/64494" id="bm_id4359874" localize="false"/><paragraph role="paragraph" id="par_id1404461" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" l10n="NEW"Conditions use the following form:</comment><comment>Background transparent</comment>
-<bookmark xml-lang="en-US" branch="hid/64527" id="bm_id5689565" localize="false"/><paragraph role="paragraph" id="par_id7404705" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/><paragraph role="paragraph" id="par_id2561723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/><paragraph role="paragraph" id="par_id1064485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/><paragraph role="paragraph" id="par_id2356028" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/><paragraph role="paragraph" id="par_id1404461" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" l10n="NEW"Conditions use the following form:</comment><comment>Background transparent</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/><paragraph role="paragraph" id="par_id7404705" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
<paragraph role="paragraph" id="par_id7466963" xml-lang="en-US" l10n="NEW">If you click the <emph>Detail</emph> area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
<paragraph role="paragraph" id="par_id3644215" xml-lang="en-US" l10n="NEW">You can specify some properties to fine-tune the way the records are printed.</paragraph><comment>Force New Page</comment>
-<bookmark xml-lang="en-US" branch="hid/64477" id="bm_id66225" localize="false"/><paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
-<bookmark xml-lang="en-US" branch="hid/64478" id="bm_id3920102" localize="false"/><paragraph role="paragraph" id="par_id6164433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/64479" id="bm_id8053529" localize="false"/><paragraph role="paragraph" id="par_id7405011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/><paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/><paragraph role="paragraph" id="par_id6164433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/><paragraph role="paragraph" id="par_id7405011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id1536606" xml-lang="en-US" l10n="NEW">Insert some data fields into the Detail area, or insert other control fields into any area. When you select an inserted field, you can set the properties in the Properties window.</paragraph>
<paragraph role="paragraph" id="par_id9631641" xml-lang="en-US" l10n="NEW">For a Label field, you can change the displayed text in the Label input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64526" id="bm_id7422711" localize="false"/><paragraph role="paragraph" id="par_id7749565" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
-<bookmark xml-lang="en-US" branch="hid/64512" id="bm_id6006958" localize="false"/><paragraph role="paragraph" id="par_id4041871" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
-<bookmark xml-lang="en-US" branch="hid/64513" id="bm_id7606128" localize="false"/><paragraph role="paragraph" id="par_id9930722" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
-<bookmark xml-lang="en-US" branch="hid/64514" id="bm_id5778374" localize="false"/><paragraph role="paragraph" id="par_id5749687" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
-<bookmark xml-lang="en-US" branch="hid/64524" id="bm_id3184301" localize="false"/><paragraph role="paragraph" id="par_id79348" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
-<bookmark xml-lang="en-US" branch="hid/64501" id="bm_id2129276" localize="false"/><paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
-<bookmark xml-lang="en-US" branch="hid/37854" id="bm_id9719229" localize="false"/><paragraph role="paragraph" id="par_id7617114" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/><paragraph role="paragraph" id="par_id7749565" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/><paragraph role="paragraph" id="par_id4041871" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/><paragraph role="paragraph" id="par_id9930722" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/><paragraph role="paragraph" id="par_id5749687" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/><paragraph role="paragraph" id="par_id79348" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/><paragraph role="paragraph" id="par_id2414014" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/><paragraph role="paragraph" id="par_id7617114" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
<paragraph role="paragraph" id="par_id1593676" xml-lang="en-US" l10n="NEW">On the <emph>General</emph> tab page of a data field, you can set the Formatting properties, among others.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64510" id="bm_id3860896" localize="false"/><paragraph role="paragraph" id="par_id1243629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/><paragraph role="paragraph" id="par_id1243629" xml-lang="en-US" l10n="NEW"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp b/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
index 39edac3b06..b7cb9952de 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_sort.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: rep_sort.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,56 +29,70 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabaserep_sortxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Sorting and Grouping</title>
-<filename>/text/shared/explorer/database/rep_sort.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="sort">
-<bookmark xml-lang="en-US" branch="hid/.uno:DbSortingAndGrouping" id="bm_id9569078" localize="false"/><paragraph role="heading" id="hd_id3486434" xml-lang="en-US" level="1" l10n="NEW"><variable id="rep_sort"><link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link>
+ <topic id="textsharedexplorerdatabaserep_sortxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Sorting and Grouping</title>
+ <filename>/text/shared/explorer/database/rep_sort.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="sort">
+<bookmark xml-lang="en-US" branch="hid/.uno:DbSortingAndGrouping" id="bm_id9569078" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3486434" role="heading" level="1" l10n="NEW"><variable id="rep_sort"><link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3068636" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the Sorting and Grouping dialog of <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>, you can define the fields that should be sorted in your report, and the fields that should be kept together to form a group.</ahelp> If you group your report by a certain field, all records with the same value of that field will be kept together in one group.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id876186" xml-lang="en-US" l10n="NEW">The Groups box shows the fields in an order from top to bottom. You can select any field, then click the Move Up or Move Down button to move this field up or down in the list. </paragraph>
-<paragraph role="paragraph" id="par_id3939634" xml-lang="en-US" l10n="NEW">The sorting and grouping will be applied in the order of the list from top to bottom.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/64463" id="bm_id2480849" localize="false"/><paragraph role="paragraph" id="par_id599688" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the fields that will be used for sorting or grouping. The field at the top has the highest priority, the second field has the second priority, and so on.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/64461" id="bm_id4181951" localize="false"/><paragraph role="paragraph" id="par_id1371501" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open a list from which you can select a field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114727444" id="bm_id2927335" localize="false"/><paragraph role="paragraph" id="par_id4661702" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field up in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114727445" id="bm_id2107303" localize="false"/><paragraph role="paragraph" id="par_id7868892" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field down in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719249" id="bm_id4071779" localize="false"/><paragraph role="paragraph" id="par_id2188787" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the sorting order.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719234" id="bm_id7844477" localize="false"/><paragraph role="paragraph" id="par_id5833307" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719236" id="bm_id6478469" localize="false"/><paragraph role="paragraph" id="par_id7726676" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/2114719238" id="bm_id9038972" localize="false"/><paragraph role="paragraph" id="par_id3729361" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select to create a new group on each changed value, or on other properties.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3405560" xml-lang="en-US" l10n="NEW">By default a new group is created on every changed value of a record from the selected field. You can change this property depending on the type of field:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3409527" xml-lang="en-US" l10n="NEW">For fields of type Text, you can select Prefix Characters and enter a number n of characters in the text box below. The records which are identical in the first n characters will be grouped together.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7112338" xml-lang="en-US" l10n="NEW">For fields of type Date/Time, you can group the records by the same year, quarter, month, week, day, hour, or minute. You can additionally specify an interval for weeks and hours: 2 weeks groups data in biweekly groups, 12 hours groups data in half-day groups.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2855616" xml-lang="en-US" l10n="NEW">For fields of type AutoNumber, Currency, or Number, you specify an interval.<comment>how?</comment></paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/2114721800" id="bm_id7985168" localize="false"/><paragraph role="paragraph" id="par_id7700430" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the group interval value that records are grouped by.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/21147219242" id="bm_id9573961" localize="false"/><paragraph role="paragraph" id="par_id1180455" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the level of detail by which a group is kept together on the same page.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id2091433" xml-lang="en-US" l10n="NEW">When you specify to keep together some records on the same page, you have three choices:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id5092318" xml-lang="en-US" l10n="NEW">No - page boundaries are not taken into account.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9312417" xml-lang="en-US" l10n="NEW">Whole Group - prints the group header, detail section, and group footer on the same page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9089022" xml-lang="en-US" l10n="NEW">With First Detail - prints the group header on a page only if the first detail record also can be printed on the same page.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3068636" role="paragraph" l10n="NEW"><ahelp hid=".">In the Sorting and Grouping dialog of <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>, you can define the fields that should be sorted in your report, and the fields that should be kept together to form a group.</ahelp> If you group your report by a certain field, all records with the same value of that field will be kept together in one group.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id876186" role="paragraph" l10n="NEW">The Groups box shows the fields in an order from top to bottom. You can select any field, then click the Move Up or Move Down button to move this field up or down in the list. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW">The sorting and grouping will be applied in the order of the list from top to bottom.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSBRW" id="bm_id2480849" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id599688" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the fields that will be used for sorting or grouping. The field at the top has the highest priority, the second field has the second priority, and so on.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_FIELDEXPRESSION" id="bm_id4181951" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1371501" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open a list from which you can select a field.</ahelp></paragraph>
+<!-- removed HID 2114727444 -->
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_MOVE_UP" id="bm_id2927436" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4661702" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field up in the list.</ahelp></paragraph>
+<!-- removed HID 2114727445 -->
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_MOVE_DOWN" id="bm_id2107304" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7868892" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected field down in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_ORDER" id="bm_id4071779" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id2188787" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the sorting order.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_HEADERLST" id="bm_id7844477" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id5833307" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_FOOTERLST" id="bm_id6478469" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7726676" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to show or hide the Group Footer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_LISTBOX_RID_GROUPS_SORTING_LST_GROUPONLST" id="bm_id9038972" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3729361" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select to create a new group on each changed value, or on other properties.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_RPT_GROUPSORT_DELETE" id="bm_id9038973" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0409200922142041" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected field from the list.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3405560" role="paragraph" l10n="NEW">By default a new group is created on every changed value of a record from the selected field. You can change this property depending on the type of field:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3409527" role="paragraph" l10n="NEW">For fields of type Text, you can select Prefix Characters and enter a number n of characters in the text box below. The records which are identical in the first n characters will be grouped together.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7112338" role="paragraph" l10n="NEW">For fields of type Date/Time, you can group the records by the same year, quarter, month, week, day, hour, or minute. You can additionally specify an interval for weeks and hours: 2 weeks groups data in biweekly groups, 12 hours groups data in half-day groups.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2855616" role="paragraph" l10n="NEW">For fields of type AutoNumber, Currency, or Number, you specify an interval.<comment>how?</comment></paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_NUMERICFIELD_RID_GROUPS_SORTING_ED_GROUPINTERVALLST" id="bm_id7985168" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id7700430" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the group interval value that records are grouped by.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST" id="bm_id9573961" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1180455" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the level of detail by which a group is kept together on the same page.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id2091433" role="paragraph" l10n="NEW">When you specify to keep together some records on the same page, you have three choices:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5092318" role="paragraph" l10n="NEW">No - page boundaries are not taken into account.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9312417" role="paragraph" l10n="NEW">Whole Group - prints the group header, detail section, and group footer on the same page.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9089022" role="paragraph" l10n="NEW">With First Detail - prints the group header on a page only if the first detail record also can be printed on the same page.</paragraph>
+ </listitem>
+ </list>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
index 44889a3944..aef55c0652 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tablewizard00.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
index 043f97aefb..b7144ede96 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tablewizard01.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
index e985d2219c..1d213ef501 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard02.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tablewizard02.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
index 501962dccc..df0ff12d11 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard03.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tablewizard03.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
index 50b1266dc0..8b591ef9b3 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard04.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tablewizard04.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/explorer/database/toolbars.xhp b/helpcontent2/source/text/shared/explorer/database/toolbars.xhp
index ca3db92767..0f92cddebb 100644
--- a/helpcontent2/source/text/shared/explorer/database/toolbars.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/toolbars.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: toolbars.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/fontwork_toolbar.xhp b/helpcontent2/source/text/shared/fontwork_toolbar.xhp
index 2a3f12596b..6622bfaeed 100644
--- a/helpcontent2/source/text/shared/fontwork_toolbar.xhp
+++ b/helpcontent2/source/text/shared/fontwork_toolbar.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: fontwork_toolbar.xhp,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,55 +29,49 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedfontwork_toolbarxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fontwork</title>
-<filename>/text/shared/fontwork_toolbar.xhp</filename>
-</topic>
-<history>
-<created date="2004-09-28T09:50:02">UFI: Fontwork Toolbar</created>
-<lastedited date="2007-01-17T09:50:08">DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="fontwork">
-<paragraph role="heading" id="par_idN1055A" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork</link></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Fontwork toolbar opens when you select a Fontwork object.</paragraph>
-</section>
-<paragraph role="heading" id="par_idN1056D" xml-lang="en-US" level="2" l10n="NEW">Fontwork Gallery</paragraph>
-<paragraph role="paragraph" id="par_idN10571" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_SHAPE_FLOATER" id="bm_id7158421" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_SHAPE_TYPES" id="bm_id5036025" localize="false"/>
+ <topic id="textsharedfontwork_toolbarxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Fontwork</title>
+ <filename>/text/shared/fontwork_toolbar.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="fontwork">
+ <paragraph xml-lang="en-US" id="par_idN1055A" role="heading" level="1" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1056A" role="paragraph" l10n="NEW">The Fontwork toolbar opens when you select a Fontwork object.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN1056D" role="heading" level="2" l10n="NEW">Fontwork Gallery</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10571" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FontworkShapeTypes" id="bm_id1966307" localize="false"/>
-<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Fontwork Shape</paragraph>
-<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Shape toolbar. Click a shape to apply the shape to all selected Fontwork objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN10588" role="heading" level="2" l10n="NEW">Fontwork Shape</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Shape toolbar. Click a shape to apply the shape to all selected Fontwork objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_SAME_LETTER_HEIGHTS" id="bm_id2198858" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FontworkSameLetterHeights" id="bm_id3509323" localize="false"/>
-<paragraph role="heading" id="par_idN105A6" xml-lang="en-US" level="2" l10n="NEW">Fontwork Same Letter Heights</paragraph>
-<paragraph role="paragraph" id="par_idN105AA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the letter height of the selected Fontwork objects from normal to the same height for all objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105A6" role="heading" level="2" l10n="NEW">Fontwork Same Letter Heights</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105AA" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the letter height of the selected Fontwork objects from normal to the same height for all objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_ALIGNMENT_FLOATER" id="bm_id7484969" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FontworkAlignmentFloater" id="bm_id8592791" localize="false"/>
-<paragraph role="heading" id="par_idN105C1" xml-lang="en-US" level="2" l10n="NEW">Fontwork Alignment</paragraph>
-<paragraph role="paragraph" id="par_idN105C5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Alignment window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CALL" id="bm_id734885" localize="false"/>
-<paragraph role="paragraph" id="par_idN105DC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to apply the alignment to the selected Fontwork objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105C1" role="heading" level="2" l10n="NEW">Fontwork Alignment</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105C5" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Alignment window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FontWork1TBO" id="bm_id734885" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN105DC" role="paragraph" l10n="NEW"><ahelp hid=".">Click to apply the alignment to the selected Fontwork objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK_CHARACTER_SPACING_FLOATER" id="bm_id1930906" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FontworkCharacterSpacingFloater" id="bm_id2658162" localize="false"/>
-<paragraph role="heading" id="par_idN105F3" xml-lang="en-US" level="2" l10n="NEW">Fontwork Character Spacing</paragraph>
-<paragraph role="paragraph" id="par_idN105F7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/40018" id="bm_id7804193" localize="false"/>
-<paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to apply the character spacing to the selected Fontwork objects.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1061D" xml-lang="en-US" level="3" l10n="NEW">Custom</paragraph>
-<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing dialog where you can enter a new character spacing value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1237899783" id="bm_id2257759" localize="false"/>
-<paragraph role="heading" id="par_idN10638" xml-lang="en-US" level="4" l10n="NEW">Value</paragraph>
-<paragraph role="paragraph" id="par_idN1063C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the Fontwork character spacing value.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1064B" xml-lang="en-US" level="3" l10n="NEW">Kern Character Pairs</paragraph>
-<paragraph role="paragraph" id="par_idN1064F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the <link href="text/shared/00/00000005.xhp#kerning"> kerning</link> of character pairs on and off.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/fontwork.xhp#fontwork"/>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN105F3" role="heading" level="2" l10n="NEW">Fontwork Character Spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105F7" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing window.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL" id="bm_id7804193" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1060E" role="paragraph" l10n="NEW"><ahelp hid=".">Click to apply the character spacing to the selected Fontwork objects.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1061D" role="heading" level="3" l10n="NEW">Custom</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10621" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Fontwork Character Spacing dialog where you can enter a new character spacing value.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/FontWork2TBO" id="bm_id2257759" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10638" role="heading" level="4" l10n="NEW">Value</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1063C" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the Fontwork character spacing value.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1064B" role="heading" level="3" l10n="NEW">Kern Character Pairs</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the <link href="text/shared/00/00000005.xhp#kerning"> kerning</link> of character pairs on and off.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/fontwork.xhp#fontwork"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/aaa_start.xhp b/helpcontent2/source/text/shared/guide/aaa_start.xhp
index 186deae3c7..14126e9352 100755
--- a/helpcontent2/source/text/shared/guide/aaa_start.xhp
+++ b/helpcontent2/source/text/shared/guide/aaa_start.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: aaa_start.xhp,v $
- * $Revision: 1.5.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/accessibility.xhp b/helpcontent2/source/text/shared/guide/accessibility.xhp
index 8e7a282fc3..45deab4bfe 100644
--- a/helpcontent2/source/text/shared/guide/accessibility.xhp
+++ b/helpcontent2/source/text/shared/guide/accessibility.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: accessibility.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -36,15 +33,8 @@
<title xml-lang="en-US" id="tit">Accessibility in %PRODUCTNAME</title>
<filename>/text/shared/guide/accessibility.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="index" id="bm_id3150502"><bookmark_value>accessibility; %PRODUCTNAME features</bookmark_value></bookmark><paragraph id="hd_id3150502" role="heading" level="1" oldref="7" l10n="U" xml-lang="en-US"><variable id="accessibility"><link name="Accessibility in %PRODUCTNAME" href="text/shared/guide/accessibility.xhp">Accessibility in <item type="productname">%PRODUCTNAME</item></link></variable></paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3154894" l10n="U" oldref="6">The following accessibility features are part of <item type="productname">%PRODUCTNAME</item>:</paragraph>
<list type="unordered">
@@ -59,15 +49,15 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146957" l10n="U" xml-lang="en-US" oldref="8">Zooming of on-screen user interface for menus, icons, and documents</paragraph>
- <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph>Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
+ <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
</listitem>
</list>
- <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Sun Microsystems Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
+ <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/assistive.xhp#assistive"/>
- <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><link name="Tools - Options - %PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><link name="Tools - Options - %PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><link name="Tools - Options - %PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp"><item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp"><item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp"><item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
index 13c0439eed..3ca6aba2ea 100755
--- a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
+++ b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: active_help_on_off.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
<paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="3" l10n="U" oldref="3">To turn Extended Tips on and off:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph>Tools - Options - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
<paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG" oldref="5">A check mark indicates that the extended tips are activated.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/shared/guide/activex.xhp b/helpcontent2/source/text/shared/guide/activex.xhp
index dd57b5e942..2227463043 100755
--- a/helpcontent2/source/text/shared/guide/activex.xhp
+++ b/helpcontent2/source/text/shared/guide/activex.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: activex.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,7 +94,8 @@
<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Edit the copy of the document.</paragraph>
</listitem>
</list>
-<section id="relatedtopics"><comment>replaced embedvar by embed. Embedvar doesnt work</comment><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+<section id="relatedtopics">
+<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
<embed href="text/shared/guide/doc_open.xhp#doc_open"/>
<embed href="text/shared/guide/import_ms.xhp#import_ms"/>
diff --git a/helpcontent2/source/text/shared/guide/assistive.xhp b/helpcontent2/source/text/shared/guide/assistive.xhp
index dabe745c9a..4694bb2d45 100644
--- a/helpcontent2/source/text/shared/guide/assistive.xhp
+++ b/helpcontent2/source/text/shared/guide/assistive.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: assistive.xhp,v $
- *
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -98,9 +94,9 @@
<paragraph role="note" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="11">When accessibility support in $[officename] is enabled, the Java Runtime Environment is loaded, and increases the startup time for $[officename].</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link></paragraph>
-<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance">Tools - Options - $[officename] - Appearance</link></paragraph>
-<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01013000.xhp" name="Tools - Options - $[officename] - Accessibility">Tools - Options - $[officename] - Accessibility</link></paragraph>
+<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance">$[officename] - Appearance</link></paragraph>
+<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp" name="$[officename] - Accessibility">$[officename] - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 851d823829..a59255c60b 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: autocorr_url.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,52 +32,53 @@
<meta>
-<topic id="textsharedguideautocorr_urlxml" indexer="include">
-<title id="tit" xml-lang="en-US">Turning off Automatic URL Recognition</title>
-<filename>/text/shared/guide/autocorr_url.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguideautocorr_urlxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Turning off Automatic URL Recognition</title>
+ <filename>/text/shared/guide/autocorr_url.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>AutoCorrect function; URL recognition</bookmark_value>
-<bookmark_value>recognizing URLs automatically</bookmark_value>
-<bookmark_value>Internet; turning off recognition of addresses</bookmark_value>
-<bookmark_value>automatic hyperlink formatting</bookmark_value>
-<bookmark_value>URL;turning off URL recognition</bookmark_value>
-<bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
-<bookmark_value>links;turning off automatic recognition</bookmark_value>
+ <bookmark_value>recognizing URLs automatically</bookmark_value>
+ <bookmark_value>automatic hyperlink formatting</bookmark_value>
+ <bookmark_value>URL;turning off URL recognition</bookmark_value>
+ <bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
+ <bookmark_value>links;turning off automatic recognition</bookmark_value>
+ <bookmark_value>predictive text, see also AutoCorrect function/AutoFill function/AutoInput function/word completion/text completion</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
-<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
-<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
-<list type="ordered">
-<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>
-</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>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
-<paragraph role="listitem" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
-<paragraph role="listitem" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153561" role="paragraph" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149233" role="listitem" 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 xml-lang="en-US" id="par_id3149235" role="listitem" 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>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3152350" role="heading" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151246" role="listitem" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148550" role="listitem" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="listitem" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156423" role="listitem" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/autohide.xhp b/helpcontent2/source/text/shared/guide/autohide.xhp
index ba649d369e..6ec0f9f0de 100644
--- a/helpcontent2/source/text/shared/guide/autohide.xhp
+++ b/helpcontent2/source/text/shared/guide/autohide.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: autohide.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/background.xhp b/helpcontent2/source/text/shared/guide/background.xhp
index eaf1a20f12..927f8b3b72 100755
--- a/helpcontent2/source/text/shared/guide/background.xhp
+++ b/helpcontent2/source/text/shared/guide/background.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: background.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/border_paragraph.xhp b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
index e8e17d00e2..3566abf3ce 100755
--- a/helpcontent2/source/text/shared/guide/border_paragraph.xhp
+++ b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: border_paragraph.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/border_table.xhp b/helpcontent2/source/text/shared/guide/border_table.xhp
index e4467b81af..4455968b8e 100755
--- a/helpcontent2/source/text/shared/guide/border_table.xhp
+++ b/helpcontent2/source/text/shared/guide/border_table.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: border_table.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -43,9 +40,9 @@
</topic>
</meta>
<body>
-
-
-
+
+
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>tables in text; defining borders</bookmark_value>
<bookmark_value>tables in spreadsheets;defining borders</bookmark_value>
<bookmark_value>borders; for tables</bookmark_value>
@@ -53,7 +50,7 @@
<bookmark_value>defining;table borders</bookmark_value>
</bookmark>
<comment>mw deleted "adding;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
+ <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="hd_id3147008" role="heading" level="2" l10n="U" oldref="1">Setting a Predefined Border Style</paragraph>
<list type="ordered">
@@ -79,6 +76,10 @@
<listitem>
<paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="10">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
</listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31594132" role="listitem" l10n="NEW">If you select more than one row or column, you can change the middle lines between rows or columns. Select the middle markers in the <emph>User-defined</emph> area.</paragraph>
+ </listitem>
+
<listitem>
<paragraph xml-lang="en-US" id="par_id3153526" role="listitem" l10n="U" oldref="11">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
</listitem>
@@ -93,19 +94,19 @@
</listitem>
</list>
<section id="relatedtopics">
-
-
+
+
<switch select="appl">
-
+
<case select="WRITER">
<embed href="text/swriter/guide/border_object.xhp#border_object"/>
<embed href="text/swriter/guide/border_page.xhp#border_page"/>
-
+
</case>
-
+
</switch>
<embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/breaking_lines.xhp b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
index 943d1988b5..6a896e43fc 100755
--- a/helpcontent2/source/text/shared/guide/breaking_lines.xhp
+++ b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: breaking_lines.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,61 +29,58 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidebreaking_linesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Line Breaks in Cells</title>
-<filename>/text/shared/guide/breaking_lines.xhp</filename>
-</topic>
-<history>
-<created date="2004-04-27T13:22:20"/>
-<lastedited date="2006-04-19T14:46:12">UFI 04/04/27, added links to this file in scalc/guide/main.xhp and swriter/guide/main.xhp
-YJ: checked</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidebreaking_linesxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Inserting Line Breaks in Cells</title>
+ <filename>/text/shared/guide/breaking_lines.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id6305734"><bookmark_value>line breaks; in cells</bookmark_value>
-<bookmark_value>cells; line breaks</bookmark_value>
-<bookmark_value>text flow; in cells</bookmark_value>
-<bookmark_value>text breaks in cells</bookmark_value>
-<bookmark_value>wrapping text; in cells</bookmark_value>
-<bookmark_value>words; wrapping in cells</bookmark_value>
-<bookmark_value>automatic line breaks</bookmark_value>
-<bookmark_value>new lines in cells</bookmark_value>
-<bookmark_value>inserting;line breaks in cells</bookmark_value>
-<bookmark_value>tables;inserting line breaks</bookmark_value>
+ <bookmark_value>cells; line breaks</bookmark_value>
+ <bookmark_value>text flow; in cells</bookmark_value>
+ <bookmark_value>text breaks in cells</bookmark_value>
+ <bookmark_value>wrapping text; in cells</bookmark_value>
+ <bookmark_value>words; wrapping in cells</bookmark_value>
+ <bookmark_value>automatic line breaks</bookmark_value>
+ <bookmark_value>new lines in cells</bookmark_value>
+ <bookmark_value>inserting;line breaks in cells</bookmark_value>
+ <bookmark_value>tables;inserting line breaks</bookmark_value>
</bookmark>
-<paragraph role="heading" id="par_idN106D5" xml-lang="en-US" level="1" l10n="NEW"><variable id="breaking_lines"><link href="text/shared/guide/breaking_lines.xhp">Inserting Line Breaks in Cells</link>
+<paragraph xml-lang="en-US" id="par_idN106D5" role="heading" level="1" l10n="NEW"><variable id="breaking_lines"><link href="text/shared/guide/breaking_lines.xhp">Inserting Line Breaks in Cells</link>
</variable></paragraph>
-<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 <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>
-<paragraph role="heading" id="par_idN106E6" xml-lang="en-US" level="2" l10n="NEW">Formatting $[officename] Calc cells for automatic line wrapping</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106ED" xml-lang="en-US" l10n="NEW">Select the cells for which you want an automatic line break.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106F1" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Cells - Alignment</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106F9" xml-lang="en-US" l10n="CHG">Select <emph>Wrap text automatically</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="2" l10n="NEW">Inserting line breaks in $[officename] Writer text document tables</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">To insert a line break in a text document table cell, press the Enter key.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1070A" xml-lang="en-US" l10n="NEW">An automatic line break will be performed while you type across the end of each cell.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN10718" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/05340300.xhp">Alignment</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN106D9" role="heading" level="2" l10n="NEW">Inserting line breaks in $[officename] Calc spreadsheet cells</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106E0" role="paragraph" 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 xml-lang="en-US" id="par_idN106E3" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="par_id0509200914160968" role="note" l10n="NEW">You can search for a newline character in the Find &amp; Replace dialog by searching for \n as a regular expression. You can use the text function CHAR(10) to insert a newline character into a text formula.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E6" role="heading" level="2" l10n="NEW">Formatting $[officename] Calc cells for automatic line wrapping</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106ED" role="paragraph" l10n="NEW">Select the cells for which you want an automatic line break.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106F1" role="paragraph" l10n="NEW">Choose <emph>Format - Cells - Alignment</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106F9" role="paragraph" l10n="CHG">Select <emph>Wrap text automatically</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10700" role="heading" level="2" l10n="NEW">Inserting line breaks in $[officename] Writer text document tables</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10707" role="paragraph" l10n="NEW">To insert a line break in a text document table cell, press the Enter key.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">An automatic line break will be performed while you type across the end of each cell.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN10718" role="paragraph" l10n="NEW"><link href="text/shared/01/05340300.xhp">Alignment</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/change_title.xhp b/helpcontent2/source/text/shared/guide/change_title.xhp
index 290dabe1d7..58527f35a4 100755..100644
--- a/helpcontent2/source/text/shared/guide/change_title.xhp
+++ b/helpcontent2/source/text/shared/guide/change_title.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: change_title.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -30,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidechange_titlexml" indexer="include" status="PUBLISH">
@@ -51,7 +48,7 @@ YJ: checked</lastedited>
</bookmark>
<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="change_title"><link href="text/shared/guide/change_title.xhp" name="Changing the Title of a Document">Changing the Title of a Document</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.<comment>UFI: we don't show the title any more on the title bar - see http://specs.openoffice.org/appwide/module_name_in_caption_bar/module_name_in_caption_bar.sxw</comment></paragraph>
+<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.</paragraph>
<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="4">How to change the title of the current document</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/chart_axis.xhp b/helpcontent2/source/text/shared/guide/chart_axis.xhp
index bacf064b0b..2a8d55eea5 100755
--- a/helpcontent2/source/text/shared/guide/chart_axis.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_axis.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_axis.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_barformat.xhp b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
index 5b072486d9..cdf29addb4 100755
--- a/helpcontent2/source/text/shared/guide/chart_barformat.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_barformat.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_insert.xhp b/helpcontent2/source/text/shared/guide/chart_insert.xhp
index 16242d0d55..e830a22f2c 100644
--- a/helpcontent2/source/text/shared/guide/chart_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_insert.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_insert.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_legend.xhp b/helpcontent2/source/text/shared/guide/chart_legend.xhp
index 5801e0de05..6e17d903c4 100644
--- a/helpcontent2/source/text/shared/guide/chart_legend.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_legend.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_legend.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_title.xhp b/helpcontent2/source/text/shared/guide/chart_title.xhp
index ee89c841a4..7b4c54a9b1 100755
--- a/helpcontent2/source/text/shared/guide/chart_title.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_title.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_title.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 928c7664c8..d0222dcbd6 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: collab.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -43,26 +40,22 @@
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id4459669"><bookmark_value>sharing documents</bookmark_value>
<bookmark_value>collaboration</bookmark_value>
</bookmark>
<comment>MW changed the index entries to one level entries.</comment>
- <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
+ <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW">In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.</paragraph>
<comment>Tools - Share Document menu</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/>
<paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph>
<comment>Share Document dialog - Share this spreadsheet with other users</comment>
-
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/>
<paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph>
- <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph>Tools - Options - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
<paragraph xml-lang="en-US" id="par_id6799218" role="warning" l10n="NEW">Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me that this is work in progress and may change any time</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3274941" role="heading" level="3" l10n="NEW">Creating a new spreadsheet</paragraph>
<paragraph xml-lang="en-US" id="par_id9804681" role="paragraph" l10n="NEW">User A creates a new spreadsheet document. The following conditions can apply:</paragraph>
@@ -90,23 +83,23 @@
</listitem>
</list>
<comment>Resolve Conflicts dialog</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/>
<paragraph xml-lang="en-US" id="par_id5800653" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph>
<comment>Keep Mine</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/>
<paragraph xml-lang="en-US" id="par_id6263924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph>
<comment>Keep Other</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3609118" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph>
<comment>Keep All Mine</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/>
<paragraph xml-lang="en-US" id="par_id7184057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph>
<comment>Keep All Others</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/>
<paragraph xml-lang="en-US" id="par_id786767" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id2934965" role="heading" level="3" l10n="NEW">Saving a shared spreadsheet document</paragraph>
@@ -127,6 +120,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id7186498" role="paragraph" l10n="NEW">When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents.</paragraph>
+
<paragraph xml-lang="en-US" id="hd_id2871791" role="heading" level="2" l10n="NEW">Collaboration in Writer, Impress, and Draw</paragraph>
<paragraph xml-lang="en-US" id="par_id2675862" role="paragraph" l10n="NEW">For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems:</paragraph>
<paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW">User A opens a document. The following conditions can apply:</paragraph>
@@ -144,10 +138,23 @@
<paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW">User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command.</paragraph>
</listitem>
</list>
+
+ <paragraph xml-lang="en-US" id="hd_id29349651" role="heading" level="2" l10n="NEW">User access permissions and sharing documents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id11746571" role="paragraph" l10n="NEW">Some conditions must be met on operating systems with a user permission management.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id25775931" role="paragraph" l10n="NEW">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id90496531" role="paragraph" l10n="NEW">The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id71864981" role="warning" l10n="NEW">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph>
+
<section id="relatedtopics">
-
+
<paragraph xml-lang="en-US" id="par_id4263740" role="paragraph" l10n="NEW"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/configure_overview.xhp b/helpcontent2/source/text/shared/guide/configure_overview.xhp
index cbaaf0b898..0bf4e119f8 100755
--- a/helpcontent2/source/text/shared/guide/configure_overview.xhp
+++ b/helpcontent2/source/text/shared/guide/configure_overview.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: configure_overview.xhp,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/contextmenu.xhp b/helpcontent2/source/text/shared/guide/contextmenu.xhp
index 3c8683bfa7..b096269f71 100755
--- a/helpcontent2/source/text/shared/guide/contextmenu.xhp
+++ b/helpcontent2/source/text/shared/guide/contextmenu.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: contextmenu.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
index b685a7bf2c..9098756ad3 100644
--- a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
+++ b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: copy_drawfunctions.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copytable2application.xhp b/helpcontent2/source/text/shared/guide/copytable2application.xhp
index 3ca3e1144d..53c48ed5ba 100755
--- a/helpcontent2/source/text/shared/guide/copytable2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytable2application.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: copytable2application.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copytext2application.xhp b/helpcontent2/source/text/shared/guide/copytext2application.xhp
index f8cca36797..feaff89db2 100644
--- a/helpcontent2/source/text/shared/guide/copytext2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytext2application.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: copytext2application.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index a539c61509..fc83807b1f 100755
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ctl.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,17 +29,12 @@
*
************************************************************************
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidectlxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Languages Using Complex Text Layout</title>
<filename>/text/shared/guide/ctl.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T14:43:30">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153662"><bookmark_value>CTL;complex text layout languages</bookmark_value>
@@ -88,7 +80,7 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/language_select.xhp#language_select"/>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/optionen/01150300.xhp" name="Tools - Options - Language Settings - Complex Text Layout">Tools - Options - Language Settings - Complex Text Layout</link></paragraph>
+<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01150300.xhp" name="Language Settings - Complex Text Layout">Language Settings - Complex Text Layout</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/data_addressbook.xhp b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
index 21fa70e963..5a812d6cb5 100755
--- a/helpcontent2/source/text/shared/guide/data_addressbook.xhp
+++ b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_addressbook.xhp,v $
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -71,7 +68,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>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>
+<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>Address Data Source ...</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_dbase2office.xhp b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
index 50a78ed064..bd129a0482 100755
--- a/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
+++ b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_dbase2office.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
index 4708c94732..9809e47ae8 100644
--- a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
+++ b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_enter_sql.xhp,v $
- * $Revision: 1.16 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,60 +30,57 @@
************************************************************************
-->
-<helpdocument version="1.0">
+
<meta>
-<topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Executing SQL Commands</title>
-<filename>/text/shared/guide/data_enter_sql.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-14T15:10:58">fpe: changed to match new database interface</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Executing SQL Commands</title>
+ <filename>/text/shared/guide/data_enter_sql.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152801"><bookmark_value>SQL; executing SQL commands</bookmark_value>
-<bookmark_value>queries;creating in SQL view</bookmark_value>
-<bookmark_value>commands;SQL</bookmark_value>
-<bookmark_value>executing;SQL commands</bookmark_value>
-</bookmark><comment>mw changed "SQL;executing commands"</comment>
-<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="1" l10n="U" oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
+ <bookmark_value>queries;creating in SQL view</bookmark_value>
+ <bookmark_value>commands;SQL</bookmark_value>
+ <bookmark_value>executing SQL commands</bookmark_value>
+</bookmark><comment>mw changed "SQL;executing commands"</comment><comment>mw made "executing;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3152801" role="heading" level="1" l10n="U"
+ oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
-<paragraph role="note" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
-<paragraph role="heading" id="hd_id9577929" xml-lang="en-US" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7923825" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9448530" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon
-<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154071" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153562" role="note" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9577929" role="heading" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7923825" role="paragraph" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9448530" role="paragraph" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon
+<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3154071">Icon</alt>
</image> or</paragraph>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon
-<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156212" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3145786" role="paragraph" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon
+<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3156212">Icon</alt>
</image>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="U" oldref="96">Click the <emph>Run</emph> icon
-<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152886" xml-lang="en-US">Icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="paragraph" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="U" oldref="96">Click the <emph>Run</emph> icon
+<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152886">Icon</alt>
</image>. The result of the query is displayed in the upper window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon
-<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153159" xml-lang="en-US">Icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon
+<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153159">Icon</alt>
</image> to save the query.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</section>
-</body>
-</helpdocument>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
+ <embed href="text/shared/guide/database_main.xhp#database_main"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_forms.xhp b/helpcontent2/source/text/shared/guide/data_forms.xhp
index aebc732d07..62266338a5 100644
--- a/helpcontent2/source/text/shared/guide/data_forms.xhp
+++ b/helpcontent2/source/text/shared/guide/data_forms.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_forms.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_im_export.xhp b/helpcontent2/source/text/shared/guide/data_im_export.xhp
index 82fe49f2d8..3c7a9e194d 100644
--- a/helpcontent2/source/text/shared/guide/data_im_export.xhp
+++ b/helpcontent2/source/text/shared/guide/data_im_export.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_im_export.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_new.xhp b/helpcontent2/source/text/shared/guide/data_new.xhp
index 3982a178ad..8f5c003b7a 100644
--- a/helpcontent2/source/text/shared/guide/data_new.xhp
+++ b/helpcontent2/source/text/shared/guide/data_new.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_new.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_queries.xhp b/helpcontent2/source/text/shared/guide/data_queries.xhp
index aaac2a2282..0a19014f07 100644
--- a/helpcontent2/source/text/shared/guide/data_queries.xhp
+++ b/helpcontent2/source/text/shared/guide/data_queries.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_queries.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_register.xhp b/helpcontent2/source/text/shared/guide/data_register.xhp
index 313003ed0b..25517a221c 100644
--- a/helpcontent2/source/text/shared/guide/data_register.xhp
+++ b/helpcontent2/source/text/shared/guide/data_register.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_register.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguidedata_registerxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Registering and Deleting a Database </title>
@@ -54,7 +50,7 @@
<paragraph role="heading" id="par_idN105C8" xml-lang="en-US" level="3" l10n="NEW">To register an existing database file:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="CHG">Click <emph>New</emph> and select the database file.<comment>i60224</comment></paragraph>
@@ -63,7 +59,7 @@
<paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="3" l10n="NEW">To remove a registered database from %PRODUCTNAME</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10719" xml-lang="en-US" l10n="NEW">Select the database file and click <emph>Delete</emph>. </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/data_report.xhp b/helpcontent2/source/text/shared/guide/data_report.xhp
index abf6e9459f..e325125dc2 100755
--- a/helpcontent2/source/text/shared/guide/data_report.xhp
+++ b/helpcontent2/source/text/shared/guide/data_report.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_report.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_reports.xhp b/helpcontent2/source/text/shared/guide/data_reports.xhp
index a0863872ee..5949820331 100644
--- a/helpcontent2/source/text/shared/guide/data_reports.xhp
+++ b/helpcontent2/source/text/shared/guide/data_reports.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_reports.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_search.xhp b/helpcontent2/source/text/shared/guide/data_search.xhp
index 570b08bebc..f0a797cdae 100644
--- a/helpcontent2/source/text/shared/guide/data_search.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_search.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_search2.xhp b/helpcontent2/source/text/shared/guide/data_search2.xhp
index 05a10019eb..dcbe7f9aa7 100644
--- a/helpcontent2/source/text/shared/guide/data_search2.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search2.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_search2.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
index 4fb9917c12..80bff489dd 100644
--- a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
+++ b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_tabledefine.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,47 +29,50 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Design</title>
-<filename>/text/shared/guide/data_tabledefine.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view</bookmark_value>
-<bookmark_value>designing; database tables</bookmark_value>
-<bookmark_value>properties;fields in databases</bookmark_value>
-<bookmark_value>fields;database tables</bookmark_value>
-<bookmark_value>AutoValue;database tables</bookmark_value>
-<bookmark_value>primary key;database tables</bookmark_value>
-</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><paragraph role="paragraph" id="par_id3155448" xml-lang="en-US" l10n="E" oldref="103" localize="false"/>
-<paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
+ <topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Table Design</title>
+ <filename>/text/shared/guide/data_tabledefine.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view (manually)</bookmark_value>
+ <bookmark_value>designing; database tables</bookmark_value>
+ <bookmark_value>properties;fields in databases</bookmark_value>
+ <bookmark_value>fields;database tables</bookmark_value>
+ <bookmark_value>AutoValue (Base)</bookmark_value>
+ <bookmark_value>primary keys;design view</bookmark_value>
+</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><comment>MW changed Tables in databases, AutoValue and Primary Key entries</comment>
+<paragraph xml-lang="en-US" id="par_id3155448" role="paragraph" l10n="E" oldref="103"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U"
+ oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id1595507" xml-lang="en-US" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
-<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
-<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="2" l10n="U" oldref="42">Field Properties</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
-<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
-<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3155535" role="paragraph" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146798" role="paragraph" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153349" role="listitem" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1595507" role="listitem" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="listitem" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154760" role="note" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153379" role="heading" level="2" l10n="U"
+ oldref="42">Field Properties</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144762" role="paragraph" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150869" role="paragraph" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/database_main.xhp#database_main"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_tables.xhp b/helpcontent2/source/text/shared/guide/data_tables.xhp
index de0cf9c869..43d0cde3f4 100644
--- a/helpcontent2/source/text/shared/guide/data_tables.xhp
+++ b/helpcontent2/source/text/shared/guide/data_tables.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_tables.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_view.xhp b/helpcontent2/source/text/shared/guide/data_view.xhp
index 843fdc6fe0..f2fff1fa7d 100644
--- a/helpcontent2/source/text/shared/guide/data_view.xhp
+++ b/helpcontent2/source/text/shared/guide/data_view.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_view.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/database_main.xhp b/helpcontent2/source/text/shared/guide/database_main.xhp
index 1d49cc5eec..2039a3175f 100755
--- a/helpcontent2/source/text/shared/guide/database_main.xhp
+++ b/helpcontent2/source/text/shared/guide/database_main.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: database_main.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/digital_signatures.xhp b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
index f1369473ab..9812393661 100755..100644
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -1,17 +1,13 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: digital_signatures.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,41 +28,89 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<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>
+ <topic id="textsharedguidedigital_signaturesxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">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_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 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>
+<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>
</variable></paragraph>
-<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>
+ <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="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200911571878" role="paragraph" l10n="NEW">You can see any of the following icons and messages when you open a signed document.</paragraph>
+ <table id="tbl_id0821200912400398">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504050" role="tablehead" l10n="NEW">Icon in Status bar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504061" role="tablehead" l10n="NEW">Signature status</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504010" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912421569" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912421569">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504189" role="tablecontent" l10n="NEW">The signature is valid.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id082120091250418" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912431081" src="xmlsecurity/res/notcertificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912431081">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504133" role="tablecontent" l10n="NEW">The signature is OK, but the certificates could not be validated.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200912504165" role="tablecontent" l10n="NEW">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with old versions of the software, see note below.)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504237" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912435090" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id0821200912435090">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504233" role="tablecontent" l10n="NEW">The signature is invalid.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="hd_id0821200910191787" role="heading" level="3" l10n="NEW">Signatures and software versions</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200910191747" role="paragraph" l10n="NEW">The signing of contents got changed with OpenOffice.org 3.2 and StarOffice 9.2. Now all contents of the files, except the signature file itself (META-INF/documentsignatures.xml) are signed. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200910191774" role="paragraph" l10n="NEW">When you sign a document with OpenOffice.org 3.2 or StarOffice 9.2 or a later version, and you open that document in an older version of the software, the signature will be displayed as "invalid". Signatures created with older versions of the software will be marked with "only parts of the documents are signed" when loaded in the newer software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2008200911583098" role="note" l10n="NEW">When you load an ODF document, you might see an icon in the status bar and the status field in the dialog that indicates that the document is only partially signed. This status will appear when the signature and certificate are valid, but they were created with a version of OpenOffice.org before 3.2 or StarOffice before 9.2. In versions of OpenOffice.org before 3.0 or StarOffice before 9.0, the document signature was applied to the main contents, pictures and embedded objects only and some contents, like macros, were not signed. In OpenOffice.org 3.0 and StarOffice 9.0 the document signature was applied to most content, including macros. However, the mimetype and the content of the META-INF folder were not signed. And in OpenOffice.org 3.2 and StarOffice 9.2 all contents, except the signature file itself (META-INF/documentsignatures.xml), are signed.</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 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 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>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
index 21fca6ab59..8d917da300 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digitalsign_receive.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
<paragraph xml-lang="en-US" id="par_id598162" role="paragraph" l10n="NEW">You must use the %PRODUCTNAME file dialogs to use WebDAV over HTTPS.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog box.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id1227759" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - Open</item>.</paragraph>
@@ -78,24 +75,24 @@
</list>
<paragraph xml-lang="en-US" id="par_id3236182" role="paragraph" l10n="NEW">If there is a mismatch of the domain name given in the certificate and the domain name you entered in the file dialog, then you see a dialog that allows you to choose from any of the following options:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1311773189" id="bm_id9141819" localize="false"/>
+<!-- removed HID 1311773189 -->
<paragraph xml-lang="en-US" id="par_id1251258" role="paragraph" l10n="NEW"> <emph>View Certificate</emph> - <ahelp hid=".">Opens the View Certificate dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1311773188" id="bm_id6354869" localize="false"/>
+<!-- removed HID 1311773188 -->
<paragraph xml-lang="en-US" id="par_id8111819" role="paragraph" l10n="NEW"> <emph>Continue</emph> - <ahelp hid=".">If you are sure both domains are the same, click the Continue button.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id9116794" role="paragraph" l10n="NEW"> <emph>Cancel Connection</emph> - Cancels the connection.</paragraph>
<paragraph xml-lang="en-US" id="par_id4381847" role="paragraph" l10n="NEW">If you click <emph>Continue</emph>, you may see a dialog that asks you to enter your user name and password.</paragraph>
<comment>user name</comment>
-<bookmark xml-lang="en-US" branch="hid/1311344666" id="bm_id2685323" localize="false"/>
+<!-- removed HID 1311344666 -->
<paragraph xml-lang="en-US" id="par_id1336710" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your user name to log on to the WebDAV server.</ahelp></paragraph>
<comment>password</comment>
-<bookmark xml-lang="en-US" branch="hid/1311344669" id="bm_id6042664" localize="false"/>
+<!-- removed HID 1311344669 -->
<paragraph xml-lang="en-US" id="par_id1221655" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your password.</ahelp></paragraph>
<comment>remember password till end of session</comment>
-<bookmark xml-lang="en-US" branch="hid/1311343648" id="bm_id7889950" localize="false"/>
+<!-- removed HID 1311343648 -->
<paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If you enable <emph>Remember password till end of session</emph>, your password will be remembered for subsequent WebDAV connections until you exit %PRODUCTNAME.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
index 774e0f4069..0aa75256bf 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digitalsign_send.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,109 +29,88 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
-<filename>/text/shared/guide/digitalsign_send.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
+ <filename>/text/shared/guide/digitalsign_send.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>signing documents with digital signatures</bookmark_value>
-<bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
-</bookmark>
- <comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
- <paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
-</variable></paragraph>
- <comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
- <paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link> , <link href="http://www.thawte.com">Thawte</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
-
+ <bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
+</bookmark><comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
+<paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
+</variable></paragraph><comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
+<paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
<switch select="sys">
-
<case select="WIN">
- <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
-
+<paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
</case>
-
<default>
- <paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
- </listitem>
- </list>
-
+<paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.<comment>how about Mac OS X?</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
+ </listitem>
+ </list>
</default>
-
</switch>
- <paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon
-<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id262764">icon</alt>
- </image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon
-<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id9252296">icon</alt>
+<paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon
+<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id262764">Icon</alt>
</image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
- <comment>WebDAV see issue 32935</comment>
- <comment>main dialog IDs are here to lead the user initially to this help page</comment>
- <comment>Examine certificate button</comment>
-
-<bookmark xml-lang="en-US" branch="hid/1311740419" id="bm_id2454298" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph>
- <comment>Accept this certificate temporarily for this session radio button</comment>
-
-<bookmark xml-lang="en-US" branch="hid/1311736321" id="bm_id2307199" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph>
- <comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
-
-<bookmark xml-lang="en-US" branch="hid/1311736326" id="bm_id9983825" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></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_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
-
- </section>
- </body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon
+<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id9252296">Icon</alt>
+ </image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph><comment>WebDAV see issue 32935</comment><comment>main dialog IDs are here to lead the user initially to this help page</comment><comment>Examine certificate button</comment>
+<!-- removed HID 1311740419 -->
+<paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph><comment>Accept this certificate temporarily for this session radio button</comment>
+<!-- removed HID 1311736321 -->
+<paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph><comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
+<!-- removed HID 1311736326 -->
+<paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></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_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/doc_autosave.xhp b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index f98667aeb4..cdea018b30 100755
--- a/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: doc_autosave.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,7 +59,7 @@
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="3">To create a backup file every time you save a document</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="5">Mark <emph>Always create backup copy</emph>.</paragraph>
@@ -71,7 +68,7 @@
<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="CHG" oldref="6">If the <emph>Always create backup copy</emph> option is selected, the old version of the file is saved to the backup directory whenever you save the current version of the file. </paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph>Tools - Options - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
+<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="8">The backup copy has the same name as the document, but the extension is .BAK. If the backup folder already contains such a file, it will be overwritten without warning.</paragraph>
@@ -80,7 +77,7 @@
<paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="CHG" oldref="9">To save recovery information automatically every n minutes</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="CHG" oldref="11">Mark <emph>Save AutoRecovery information every</emph> and select the time interval.</paragraph>
@@ -92,7 +89,7 @@
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="15"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
<paragraph role="paragraph" id="par_idN10838" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/error_report.xhp">Error Report Tool</link></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/guide/doc_open.xhp b/helpcontent2/source/text/shared/guide/doc_open.xhp
index 745b7ebecf..e62f2c692f 100644
--- a/helpcontent2/source/text/shared/guide/doc_open.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_open.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: doc_open.xhp,v $
- * $Revision: 1.15.4.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,7 +72,7 @@
<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 name of the author was entered in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</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 name of the author was entered in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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>
@@ -88,7 +85,7 @@
<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>
+<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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>
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index 3a4fca1ed1..19f88f17d3 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: doc_save.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,8 +60,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E">
-<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt>
- </image></paragraph>
+<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="8">The document is saved under its path and name on the current local data medium or network drive or on the Internet, overwriting any file of the same name.</paragraph>
@@ -72,7 +68,7 @@
</tablerow>
</table>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="2">When you save a new file for the first time, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog opens, in which you can enter a name, folder and drive or volume for the file. To open this dialog, choose <emph>File - Save As</emph>.</paragraph>
-<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
<paragraph role="heading" id="hd_id7146824" xml-lang="en-US" level="2" l10n="NEW">Automatic extension to the file name</paragraph>
<paragraph role="paragraph" id="par_id9359111" xml-lang="en-US" l10n="NEW">When saving a file, %PRODUCTNAME always appends an extension to the file name, except when the file name already has an extension that matches the file type. See the list of <link href="text/shared/00/00000021.xhp">ODF extensions</link>. </paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW">Some examples for the automatic extensions are listed in the following table:</paragraph>
@@ -139,7 +135,7 @@
<embed href="text/shared/00/00000021.xhp#xmlformat"/>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop.xhp b/helpcontent2/source/text/shared/guide/dragdrop.xhp
index fc6d407bce..ac2f4041fa 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
index c2a327abc9..62849a2c1a 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_beamer.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
index 9601093494..4c793cf502 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_fromgallery.xhp,v $
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
index c4baa16d10..c795bf2f61 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_gallery.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
index 0f1f0a7034..c3beacc89d 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_graphic.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
index 81fb5cf138..a8ef05a7e0 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_table.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
index e046bebe34..b00ca693e2 100755
--- a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: edit_symbolbar.xhp,v $
- *
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/email.xhp b/helpcontent2/source/text/shared/guide/email.xhp
index 021f2daa68..dcdabf8f5c 100755
--- a/helpcontent2/source/text/shared/guide/email.xhp
+++ b/helpcontent2/source/text/shared/guide/email.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: email.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,14 +50,13 @@
<bookmark_value>drawings; sending as e-mail</bookmark_value>
<bookmark_value>presentations; sending as e-mail</bookmark_value>
<bookmark_value>attachments in e-mails</bookmark_value>
-</bookmark><comment>mw changed "tables;..." to "spreadsheets;..."</comment><comment>mw changed "text;" to "text documents;"</comment><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link>
-</variable></paragraph>
+</bookmark>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="2">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Send - Document as E-mail</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Tools - Options - Internet - E-mail</emph>.
-</caseinline></switchinline></paragraph>
+<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline></paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="5">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/error_report.xhp b/helpcontent2/source/text/shared/guide/error_report.xhp
index bef3d05e18..2eb0204da4 100644
--- a/helpcontent2/source/text/shared/guide/error_report.xhp
+++ b/helpcontent2/source/text/shared/guide/error_report.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: error_report.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,46 +29,36 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Error Report Tool</title>
-<filename>/text/shared/guide/error_report.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:54:29">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Error Report Tool</title>
+ <filename>/text/shared/guide/error_report.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150616"><bookmark_value>Error Report Tool</bookmark_value>
-<bookmark_value>reports;error reports</bookmark_value>
-<bookmark_value>crash reports</bookmark_value>
-<bookmark_value>activating;Error Report Tool</bookmark_value>
+ <bookmark_value>reports;error reports</bookmark_value>
+ <bookmark_value>crash reports</bookmark_value>
+ <bookmark_value>activating;Error Report Tool</bookmark_value>
</bookmark><comment>MW changed "reporting..." to "reports;"</comment>
-<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="1" l10n="U" oldref="17"><variable id="error_report"><link href="text/shared/guide/error_report.xhp" name="Error Report Tool">Error Report Tool</link>
+<paragraph xml-lang="en-US" id="hd_id3150616" role="heading" level="1" l10n="U"
+ oldref="17"><variable id="error_report"><link href="text/shared/guide/error_report.xhp" name="Error Report Tool">Error Report Tool</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="1">The Error Report Tool starts automatically when a program crash occurs. If the program enters into an endless loop, so that it does not respond to mouse-clicks or keypresses, you can also start the Error Report Tool manually.</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2">The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report.</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="3">Sun Microsystems is committed to respecting your online privacy and recognizes your need for appropriate protection and management of any personally identifiable information you share with us. See the statement at http://www.sun.com/privacy/ on your online data privacy at Sun Microsystems.</paragraph>
-<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
-<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="5">With most program crashes the Error Report Tool will start automatically. However, if the program seems to be stuck and the tool does not start automatically, you can start the tool manually:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="6">Go to the {office_install_path}<switchinline select="sys"><caseinline select="WIN">\
-</caseinline><defaultinline>/</defaultinline></switchinline>program folder and start the crashrep<switchinline select="sys"><caseinline select="WIN">.exe
-</caseinline></switchinline> file.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="7">Completing the Report</paragraph>
-<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="8">On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information.</paragraph>
-<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="9">Sending the Error Report</paragraph>
-<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="10">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button.</paragraph>
-<paragraph role="warning" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="11">You will not get an answer to your error report. If you need support, please visit the <link href="text/shared/main0108.xhp">support forum</link> on the Internet.</paragraph>
-<paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="12">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you allow to be contacted by e-mail, should additional information be required. By default this box is not marked, so you will not get any e-mail.</paragraph>
-<paragraph role="heading" id="hd_id3150792" xml-lang="en-US" level="2" l10n="U" oldref="13">What Data is Sent?</paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="14">The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file.</paragraph>
-<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="15">In addition, relevant memory contents and stack traces are gathered by some system standard tools ("dbhhelp.dll" on Windows systems, "pstack" on UNIX systems). This information will be sent also.</paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="U" oldref="1">The Error Report Tool starts automatically when a program crash occurs.<comment>removed sentene about manually - i96770</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="2">The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="U" oldref="5">With most program crashes the Error Report Tool will start automatically.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U" oldref="7">Completing the Report</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147335" role="paragraph" l10n="U" oldref="8">On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159399" role="heading" level="2" l10n="U" oldref="9">Sending the Error Report</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150504" role="paragraph" l10n="U" oldref="10">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149670" role="warning" l10n="U" oldref="11">You will not get an answer to your error report. If you need support, please visit the <link href="text/shared/main0108.xhp">support forum</link> on the Internet.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153526" role="paragraph" l10n="U" oldref="12">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you allow to be contacted by e-mail, should additional information be required. By default this box is not marked, so you will not get any e-mail.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150792" role="heading" level="2" l10n="U"
+ oldref="13">What Data is Sent?</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="14">The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151177" role="paragraph" l10n="U" oldref="15">In addition, relevant memory contents and stack traces are gathered by some system standard tools ("dbhhelp.dll" on Windows systems, "pstack" on UNIX systems). This information will be sent also.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/export_ms.xhp b/helpcontent2/source/text/shared/guide/export_ms.xhp
index 44fb30f082..e9d5e1909e 100755
--- a/helpcontent2/source/text/shared/guide/export_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/export_ms.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: export_ms.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,7 +66,7 @@
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="4">Enter a name in the <emph>File name</emph> box and click <emph>Save</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph>Tools - Options - Load/Save - General</emph> in the <emph>Standard file format </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
</section>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
diff --git a/helpcontent2/source/text/shared/guide/fax.xhp b/helpcontent2/source/text/shared/guide/fax.xhp
index aae5cd1ff7..30c42f8c56 100755
--- a/helpcontent2/source/text/shared/guide/fax.xhp
+++ b/helpcontent2/source/text/shared/guide/fax.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: fax.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,7 +62,7 @@ checked - yj</lastedited>
<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="10">You can configure $[officename] so that a single click on an icon automatically sends the current document as a fax:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="12">Select the fax driver from the <emph>Fax</emph> list box and click <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/filternavigator.xhp b/helpcontent2/source/text/shared/guide/filternavigator.xhp
index 716e6d5cd4..88dfc2e075 100644
--- a/helpcontent2/source/text/shared/guide/filternavigator.xhp
+++ b/helpcontent2/source/text/shared/guide/filternavigator.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: filternavigator.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/find_attributes.xhp b/helpcontent2/source/text/shared/guide/find_attributes.xhp
index c825e9ade7..f48d268976 100644
--- a/helpcontent2/source/text/shared/guide/find_attributes.xhp
+++ b/helpcontent2/source/text/shared/guide/find_attributes.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: find_attributes.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/flat_icons.xhp b/helpcontent2/source/text/shared/guide/flat_icons.xhp
index b01bc6ebdc..c119756122 100755
--- a/helpcontent2/source/text/shared/guide/flat_icons.xhp
+++ b/helpcontent2/source/text/shared/guide/flat_icons.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: flat_icons.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@ checked -yj</lastedited>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="CHG" oldref="4">You can change the icon view between small and large icons.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - Options - $[officename]</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="CHG" oldref="6">On the <emph>View</emph> tab page, select the <emph>Toolbar icon size</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
index 2c4c253758..ced9492191 100644
--- a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: floating_toolbar.xhp,v $
- * $Revision: 1.16.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index d7f5a07157..90247d93ce 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: fontwork.xhp,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,97 +31,97 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
-<filename>/text/shared/guide/fontwork.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
+ <filename>/text/shared/guide/fontwork.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3696707"><bookmark_value>graphical text art</bookmark_value>
-<bookmark_value>designing; fonts</bookmark_value>
-<bookmark_value>TextArt, see Fontwork</bookmark_value>
-<bookmark_value>WordArt, see Fontwork</bookmark_value>
-<bookmark_value>Fontwork icons</bookmark_value>
-<bookmark_value>text effects</bookmark_value>
-<bookmark_value>effects; Fontwork icons</bookmark_value>
-<bookmark_value>text; Fontwork icons</bookmark_value>
-<bookmark_value>3D text creation</bookmark_value>
-<bookmark_value>rotating;3D text</bookmark_value>
-<bookmark_value>editing;Fontwork objects</bookmark_value>
-<bookmark_value>inserting;Fontwork objects</bookmark_value>
-</bookmark>
- <comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
+ <bookmark_value>designing; fonts</bookmark_value>
+ <bookmark_value>TextArt, see Fontwork</bookmark_value>
+ <bookmark_value>WordArt, see Fontwork</bookmark_value>
+ <bookmark_value>Fontwork</bookmark_value>
+ <bookmark_value>text effects</bookmark_value>
+ <bookmark_value>effects; Fontwork icons</bookmark_value>
+ <bookmark_value>text; Fontwork icons</bookmark_value>
+ <bookmark_value>3D text creation</bookmark_value>
+ <bookmark_value>rotating;3D text</bookmark_value>
+ <bookmark_value>editing;Fontwork objects</bookmark_value>
+ <bookmark_value>inserting;Fontwork objects</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
-<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1701inch" height="0.1701inch"><alt xml-lang="en-US" id="alt_id7040009">Fontwork icon</alt>
+ <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0202200911373965" role="paragraph" l10n="NEW">If you don't see the Drawing toolbar or the Fontwork toolbar, choose <item type="menuitem">View - Toolbars</item> to enable the toolbar.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
+<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt>
</image></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="NEW">Click the Fontwork object.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="NEW">Click the Fontwork object to select it.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
- <embed href="text/shared/01/05280000.xhp#hd_id3146959"/>
-
- </section>
- </body>
-</helpdocument>
+ </listitem>
+ <listitem>
+
+ <bookmark xml-lang="en-US" branch="hid/HID_CTL_FONTWORK_FAVORITES" id="bm_id3156415" localize="false"/>
+<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
+
+ <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
+ </listitem>
+ </list>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
+ <embed href="text/shared/01/05280000.xhp#fntwrk"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/formfields.xhp b/helpcontent2/source/text/shared/guide/formfields.xhp
index 9644516874..0dec8b59a3 100755
--- a/helpcontent2/source/text/shared/guide/formfields.xhp
+++ b/helpcontent2/source/text/shared/guide/formfields.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: formfields.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,79 +31,66 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
-<filename>/text/shared/guide/formfields.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
+ <filename>/text/shared/guide/formfields.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149798"><bookmark_value>command buttons, see push buttons</bookmark_value>
-<bookmark_value>controls;adding to documents</bookmark_value>
-<bookmark_value>inserting;push buttons</bookmark_value>
-<bookmark_value>keys;adding push buttons</bookmark_value>
-<bookmark_value>buttons;adding push buttons</bookmark_value>
-<bookmark_value>press buttons, see push buttons</bookmark_value>
-<bookmark_value>push buttons;adding to documents</bookmark_value>
-</bookmark>
- <comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link>
+ <bookmark_value>controls;adding to documents</bookmark_value>
+ <bookmark_value>inserting;push buttons</bookmark_value>
+ <bookmark_value>keys;adding push buttons</bookmark_value>
+ <bookmark_value>buttons;adding push buttons</bookmark_value>
+ <bookmark_value>press buttons, see push buttons</bookmark_value>
+ <bookmark_value>push buttons;adding to documents</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
- </listitem>
- </list>
- <list type="ordered" startwith="2">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
- </listitem>
- </list>
- <list type="ordered" startwith="3">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
-
- <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
-
- </section>
- </body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/gallery_insert.xhp b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
index b23cc2f0b9..42ffad6a96 100755
--- a/helpcontent2/source/text/shared/guide/gallery_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: gallery_insert.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/groups.xhp b/helpcontent2/source/text/shared/guide/groups.xhp
index d40b58e664..1c403a5832 100644
--- a/helpcontent2/source/text/shared/guide/groups.xhp
+++ b/helpcontent2/source/text/shared/guide/groups.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: groups.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
index ec560220f6..9b30ae6c30 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_edit.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
index 079c8d999e..086c1678c2 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_insert.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
index f10a2fcbb1..f94ada5bef 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_rel_abs.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,16 +50,16 @@
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="46">When you include hyperlinks, two factors must be taken into account: whether they are set as relative or absolute on saving, and whether or not the file is present.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
+<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
+<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="49">An absolute path such as "C:\homepage\graphics\picture.gif" would no longer function on the provider server. Neither a server nor the computer of a reader needs to have a C hard drive: operating systems such as Unix or MacOS do not recognize drive letters, and even if the folder homepage\graphics existed, your picture would not be available. It is better to use relative addressing for file links.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.sun.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
+<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.example.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="51">$[officename] also reacts differently, depending on whether the file referred to in the link exists, and where it is located. $[officename] checks every new link and sets a target and protocol automatically. The result can be seen in the generated HTML code after saving the source document.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
index 7d8f67dbdd..d97a2dc8b9 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_search.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,7 +63,7 @@ checked - yj</lastedited>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="CHG" oldref="21">$[officename] opens your Web Browser, which calls the selected Internet search engine. After a short time you see the result of your search on screen.</paragraph>
-<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar"><emph>Tools - Options - Internet - Search</emph></link> to define the search options.</paragraph>
+<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar">Internet - Search</link></emph> to define the search options.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="24"><link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp
index b4204c518e..b4a3f896e1 100755
--- a/helpcontent2/source/text/shared/guide/imagemap.xhp
+++ b/helpcontent2/source/text/shared/guide/imagemap.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: imagemap.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,26 +31,21 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
-<filename>/text/shared/guide/imagemap.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
+ <filename>/text/shared/guide/imagemap.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>ImageMap; editor</bookmark_value>
-<bookmark_value>editors; ImageMap editor</bookmark_value>
-<bookmark_value>images; ImageMap</bookmark_value>
-<bookmark_value>pictures; ImageMap</bookmark_value>
-<bookmark_value>hotspots</bookmark_value>
-<bookmark_value>URL;in pictures</bookmark_value>
-</bookmark>
- <comment>mw added 2 index entries</comment>
- <paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link>
+ <bookmark_value>editors; ImageMap editor</bookmark_value>
+ <bookmark_value>images; ImageMap</bookmark_value>
+ <bookmark_value>pictures; ImageMap</bookmark_value>
+ <bookmark_value>hotspots;adding to images</bookmark_value>
+ <bookmark_value>URL;in pictures</bookmark_value>
+</bookmark><comment>mw added 2 index entries</comment><comment>MW made "hotspots" a two level entry</comment>
+<paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph" l10n="NEW">An ImageMap allows you to attach URLs to specific areas, called hotspots, on a picture in your document. An image map is a group of one or more hotspots.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW">You can draw three types of hotspots: rectangles, ellipses, and polygons. When you click a hotspot, the URL is opened in the browser window or frame that you specify. You can also specify the text that appears when your mouse rests on the hotspot.</paragraph>
@@ -71,7 +62,7 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">Use the icons in the ImageMap Editor to draw a hotspot shape, for example a rectangle, over the image at the background.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106AB" role="paragraph" l10n="NEW">Enter the "Address" URL that will be shown in a Web browser when the user clicks the hotspot.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index ed09d43352..ae56c248b3 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: import_ms.xhp,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,31 +31,33 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Opening documents saved in other formats</title>
-<filename>/text/shared/guide/import_ms.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="chapter_all">
+ <topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Opening documents saved in other formats</title>
+ <filename>/text/shared/guide/import_ms.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="chapter_all">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153988"><bookmark_value>Microsoft Office;opening Microsoft documents</bookmark_value>
-<bookmark_value>documents; importing</bookmark_value>
-<bookmark_value>importing; documents in other formats</bookmark_value>
-<bookmark_value>opening; documents from other formats</bookmark_value>
-<bookmark_value>loading; documents from other formats</bookmark_value>
-<bookmark_value>converting;Microsoft documents</bookmark_value>
-<bookmark_value>saving; default file formats</bookmark_value>
-<bookmark_value>defaults; file formats in file dialogs</bookmark_value>
-<bookmark_value>file formats; saving always in other formats</bookmark_value>
-<bookmark_value>Microsoft Office; as standard file format</bookmark_value>
-<bookmark_value>files;importing</bookmark_value>
-<bookmark_value>XML converters</bookmark_value>
-<bookmark_value>converters; XML</bookmark_value>
-<bookmark_value>Document Converter Wizard</bookmark_value>
-<bookmark_value>wizards; document converter</bookmark_value>
-</bookmark><comment>MW made file import a two level entry ("files;importing")</comment><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
+ <bookmark_value>documents; importing</bookmark_value>
+ <bookmark_value>importing; documents in other formats</bookmark_value>
+ <bookmark_value>opening; documents from other formats</bookmark_value>
+ <bookmark_value>loading; documents from other formats</bookmark_value>
+ <bookmark_value>converting;Microsoft documents</bookmark_value>
+ <bookmark_value>saving; default file formats</bookmark_value>
+ <bookmark_value>defaults;document formats in file dialogs</bookmark_value>
+ <bookmark_value>file formats; saving always in other formats</bookmark_value>
+ <bookmark_value>Microsoft Office; as default file format</bookmark_value>
+ <bookmark_value>files;importing</bookmark_value>
+ <bookmark_value>XML converters</bookmark_value>
+ <bookmark_value>converters; XML</bookmark_value>
+ <bookmark_value>Document Converter Wizard</bookmark_value>
+ <bookmark_value>wizards; document converter</bookmark_value>
+ <bookmark_value>converters; document converter</bookmark_value>
+ <bookmark_value>files, see also documents</bookmark_value>
+</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment><comment>ufi added "converters;document converter"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
<list type="ordered">
@@ -73,7 +71,7 @@
<paragraph role="listitem" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="6">Select a file name and click <emph>Open</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph>Tools - Options - Load/Save - General</emph> and select that format as <emph>Standard file format</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="9">Converting all documents of a folder</paragraph>
<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="10">Open the wizard, which guides you through the operation, to copy and convert all documents from Microsoft Word, Microsoft Excel or Microsoft PowerPoint into OpenDocument file format documents. You can select a source and target directory, specify whether to convert documents and/or templates, and more besides.</paragraph>
<list type="unordered">
@@ -82,27 +80,29 @@
</listitem>
</list>
<switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id4563127" xml-lang="en-US" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id9207434" xml-lang="en-US" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
-<paragraph role="listitem" id="par_id7215491" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id2299874" xml-lang="en-US" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
-<paragraph role="listitem" id="par_id1727347" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
-</listitem>
-</list>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="hd_id4563127" role="heading" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9207434" role="listitem" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7215491" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2299874" role="listitem" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1727347" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
+ </listitem>
+ </list>
</case>
-</switch></section>
-<section id="relatedtopics">
-<embed href="text/shared/00/00000021.xhp#xmlformat"/>
-<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+</switch>
</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <embed href="text/shared/00/00000021.xhp#xmlformat"/>
+ <embed href="text/shared/guide/export_ms.xhp#export_ms"/>
+ <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+ <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+ <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147264" role="paragraph" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index c0f06f2f30..f40f0da77f 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: insert_bitmap.xhp,v $
- * $Revision: 1.14.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,8 +76,7 @@
<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 </emph>
-<emph>- 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 - 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>
diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
index 1a69bdf849..8a238e241b 100644
--- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: insert_graphic_drawit.xhp,v $
- * $Revision: 1.17.4.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,70 +32,71 @@
<meta>
-<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>
+ <topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
+ <title xml-lang="en-US" id="tit">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>
-<bookmark_value>objects; copying when moving in presentations</bookmark_value>
-<bookmark_value>draw objects; adding/editing/copying</bookmark_value>
-<bookmark_value>circle drawings</bookmark_value>
-<bookmark_value>square drawings</bookmark_value>
-<bookmark_value>handles; scaling</bookmark_value>
-<bookmark_value>scaling; objects</bookmark_value>
-<bookmark_value>objects;moving and resizing with mouse</bookmark_value>
-<bookmark_value>resizing;objects, by mouse</bookmark_value>
-<bookmark_value>copying; draw objects</bookmark_value>
-<bookmark_value>pasting;draw objects</bookmark_value>
-<bookmark_value>editing;draw objects</bookmark_value>
-<bookmark_value>pictures;scaling/resizing</bookmark_value>
+ <bookmark_value>scaling, see also zooming</bookmark_value>
+ <bookmark_value>drawings, see also draw objects</bookmark_value>
+ <bookmark_value>graphic objects, see draw objects</bookmark_value>
+ <bookmark_value>text; drawing pictures</bookmark_value>
+ <bookmark_value>inserting; drawings</bookmark_value>
+ <bookmark_value>pictures; drawing</bookmark_value>
+ <bookmark_value>objects; copying when moving in presentations</bookmark_value>
+ <bookmark_value>draw objects; adding/editing/copying</bookmark_value>
+ <bookmark_value>circle drawings</bookmark_value>
+ <bookmark_value>square drawings</bookmark_value>
+ <bookmark_value>handles; scaling</bookmark_value>
+ <bookmark_value>scaling; objects</bookmark_value>
+ <bookmark_value>objects;moving and resizing with mouse</bookmark_value>
+ <bookmark_value>resizing;objects, by mouse</bookmark_value>
+ <bookmark_value>copying; draw objects</bookmark_value>
+ <bookmark_value>pasting;draw objects</bookmark_value>
+ <bookmark_value>editing;draw objects</bookmark_value>
+ <bookmark_value>pictures;scaling/resizing</bookmark_value>
</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>
+<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>
</variable></paragraph>
-<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.
+ <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="ordered">
+ <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.
</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 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
+ </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">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 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
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9448225" role="listitem" 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 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 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
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="listitem" 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 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 <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>
+ </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>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
</case>
@@ -124,5 +122,5 @@
</case>
</switch>
</section>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
index eed0aeebac..ad1e8063e0 100755..100644
--- a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: insert_specialchar.xhp,v $
- * $Revision: 1.12.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -64,13 +61,13 @@
<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.
+<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.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Sun Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers.
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys.
+<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h.
+<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h.
</caseinline></switchinline></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="5"><link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/integratinguno.xhp b/helpcontent2/source/text/shared/guide/integratinguno.xhp
index f4057127b1..426c22d62b 100755
--- a/helpcontent2/source/text/shared/guide/integratinguno.xhp
+++ b/helpcontent2/source/text/shared/guide/integratinguno.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: integratinguno.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index df46aff9da..a578bc236b 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.15.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,370 +31,415 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguidekeyboardxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Shortcuts (%PRODUCTNAME Accessibility)</title>
-<filename>/text/shared/guide/keyboard.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidekeyboardxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Shortcuts (%PRODUCTNAME Accessibility)</title>
+ <filename>/text/shared/guide/keyboard.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3158421"><bookmark_value>accessibility;general shortcuts</bookmark_value>
-<bookmark_value>shortcut keys; %PRODUCTNAME accessibility</bookmark_value>
+ <bookmark_value>shortcut keys; %PRODUCTNAME accessibility</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3158421" xml-lang="en-US" level="1" l10n="U" oldref="52"><variable id="keyboard"><link href="text/shared/guide/keyboard.xhp" name="Shortcuts (%PRODUCTNAME Accessibility)">Shortcuts (<item type="productname">%PRODUCTNAME</item> Accessibility)</link>
+<paragraph xml-lang="en-US" id="hd_id3158421" role="heading" level="1" l10n="U"
+ oldref="52"><variable id="keyboard"><link href="text/shared/guide/keyboard.xhp" name="Shortcuts (%PRODUCTNAME Accessibility)">Shortcuts (<item type="productname">%PRODUCTNAME</item> Accessibility)</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="25">You can control <item type="productname">%PRODUCTNAME</item> without using a mouse device, using only the keyboard.</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="24">On each module's main help page (for example, the <item type="productname">%PRODUCTNAME</item> Writer or <item type="productname">%PRODUCTNAME</item> Calc main help page) there is a link to access the keyboard shortcuts' help for that module.</paragraph>
-<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="23">In addition, under the keyword "Accessibility" you find step-by-step instructions about how to control the selected module without a mouse device.</paragraph>
-<embed href="text/shared/00/00000099.xhp#keys"/>
-<paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="2" l10n="U" oldref="22">Working with the <item type="productname">%PRODUCTNAME</item> user interface without mouse</paragraph>
-<paragraph role="heading" id="hd_id3154749" xml-lang="en-US" level="3" l10n="U" oldref="39">Activating menu bar, toolbars, windows, and document</paragraph>
-<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="38">Repeatedly pressing F6 switches the focus and circles through the following objects:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="37">menu bar,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="36">every toolbar from top to bottom and from left to right,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="35">every free window from left to right,</paragraph>
-</listitem>
-<listitem>
-<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 <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+<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 <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 <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 <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 <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>
-<paragraph role="heading" id="hd_id3150440" xml-lang="en-US" level="3" l10n="U" oldref="14">Special hints for toolbars</paragraph>
-<paragraph role="paragraph" id="par_id3149983" xml-lang="en-US" l10n="U" oldref="13">Press the down arrow or right arrow to open the selected toolbar. This is equivalent to a mouse click. In the toolbar use the right arrow and left arrow keys. The Home and End keys select the first and last icon in the toolbar, respectively.</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="12">Close the toolbar with Esc. It is not possible to move the toolbar without a mouse.</paragraph>
-<paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="3" l10n="U" oldref="11">Selection from a combo box</paragraph>
-<table id="tbl_id3147427">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="E">
-<image id="img_id3148645" src="res/helpimg/zellvor.png" width="1.7602inch" height="0.4898inch" localize="true"><alt id="alt_id3148645" xml-lang="en-US">Combo box</alt>
+ <paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="25">You can control <item type="productname">%PRODUCTNAME</item> without using a mouse device, using only the keyboard.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="24">On each module's main help page (for example, the <item type="productname">%PRODUCTNAME</item> Writer or <item type="productname">%PRODUCTNAME</item> Calc main help page) there is a link to access the keyboard shortcuts' help for that module.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145382" role="paragraph" l10n="U" oldref="23">In addition, under the keyword "Accessibility" you find step-by-step instructions about how to control the selected module without a mouse device.</paragraph>
+ <embed href="text/shared/00/00000099.xhp#keys"/>
+ <paragraph xml-lang="en-US" id="hd_id3166460" role="heading" level="2" l10n="U"
+ oldref="22">Working with the <item type="productname">%PRODUCTNAME</item> user interface without mouse</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154749" role="heading" level="3" l10n="U"
+ oldref="39">Activating menu bar, toolbars, windows, and document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156329" role="paragraph" l10n="U" oldref="38">Repeatedly pressing F6 switches the focus and circles through the following objects:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150669" role="listitem" l10n="U" oldref="37">menu bar,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149234" role="listitem" l10n="U" oldref="36">every toolbar from top to bottom and from left to right,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147618" role="listitem" l10n="U" oldref="35">every free window from left to right,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="34">document</paragraph>
+ </listitem>
+ </list><comment>removed para about Ctrl+Tab</comment>
+<paragraph xml-lang="en-US" id="par_id3153252" role="paragraph" l10n="U" oldref="32">Press Shift+F6 to switch through objects in the opposite direction.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" 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 xml-lang="en-US" id="par_id3152360" role="paragraph" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153896" role="paragraph" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3161656" role="heading" level="3" l10n="U"
+ oldref="21">Calling a menu command</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151056" role="paragraph" 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 xml-lang="en-US" id="par_id3153381" role="paragraph" 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 xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147086" role="heading" level="3" l10n="U"
+ oldref="17">Executing an icon command</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" 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 xml-lang="en-US" id="par_id3144433" role="paragraph" 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 xml-lang="en-US" id="par_id3153968" role="listitem" 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 xml-lang="en-US" id="par_id3150449" role="listitem" 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 xml-lang="en-US" id="par_id3151041" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="hd_id3150440" role="heading" level="3" l10n="U"
+ oldref="14">Special hints for toolbars</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149983" role="paragraph" l10n="U" oldref="13">Press the down arrow or right arrow to open the selected toolbar. This is equivalent to a mouse click. In the toolbar use the right arrow and left arrow keys. The Home and End keys select the first and last icon in the toolbar, respectively.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="12">Close the toolbar with Esc. It is not possible to move the toolbar without a mouse.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151119" role="heading" level="3" l10n="U"
+ oldref="11">Selection from a combo box</paragraph>
+ <table id="tbl_id3147427">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146986" role="paragraph" l10n="E">
+<image id="img_id3148645" src="res/helpimg/zellvor.png" width="1.15in" height="0.3165in" localize="true"><alt xml-lang="en-US" id="alt_id3148645">Combo box</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="U" oldref="10">Select the combo box. Press Enter.</paragraph>
-<paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="9">Use the down arrow or Page Down key to scroll down the combo box entries, or the up arrow or Page Up key to scroll upwards. The Home key takes you to the first entry and the End key takes you to the last entry.</paragraph>
-<paragraph role="paragraph" id="par_id3145749" xml-lang="en-US" l10n="U" oldref="8">Press Enter to execute the selected entry.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="heading" id="hd_id3150685" xml-lang="en-US" level="3" l10n="U" oldref="41">Selection in Tables</paragraph>
-<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="42">In several windows, dialogs, and in the table control field, there are tables to select data, for instance, in the right part of the <link href="text/shared/guide/database_main.xhp" name="Data Source View">Data Source View</link>. The following keys are used for selections in these tables:</paragraph>
-<list type="unordered">
-<listitem>
-<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"><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"><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 <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 <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>
-<paragraph role="listitem" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="4">Choose a command (down arrow, then Enter).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155083" xml-lang="en-US" l10n="U" oldref="3">Now you can use the arrow keys to move or resize the dialog or window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147497" xml-lang="en-US" l10n="U" oldref="2">Press Enter to accept the change. Press Escape to cancel the changes.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146988" xml-lang="en-US" level="3" l10n="U" oldref="150">Docking and Undocking Windows and Toolbars</paragraph>
-<list type="ordered">
-<listitem>
-<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 <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>
-<paragraph role="paragraph" id="par_id3148993" xml-lang="en-US" l10n="CHG" oldref="149">Press <item type="keycode">Shift+F4</item> to select the first object in the current document. When an object is selected, press <item type="keycode">Tab</item> to select the next object, or press <item type="keycode">Esc</item> to go back to the text.</paragraph>
-<paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="3" l10n="U" oldref="54">Edit Objects</paragraph>
-<paragraph role="paragraph" id="par_id3156379" xml-lang="en-US" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph>
-<paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="3" l10n="U" oldref="55">Edit Position and Size of Objects</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
-<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 <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 <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>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="61">Edit the Anchors of Objects</paragraph>
-<paragraph role="paragraph" id="par_id3148534" xml-lang="en-US" l10n="U" oldref="62">You can move the anchor of an object with the arrow keys. First enter the handle edit mode and select the anchor. Depending on the type of anchor, you can then move the anchor in different directions.</paragraph>
-<list type="ordered">
-<listitem>
-<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 <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 <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.
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149666" role="paragraph" l10n="U" oldref="10">Select the combo box. Press Enter.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155366" role="paragraph" l10n="U" oldref="9">Use the down arrow or Page Down key to scroll down the combo box entries, or the up arrow or Page Up key to scroll upwards. The Home key takes you to the first entry and the End key takes you to the last entry.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="U" oldref="8">Press Enter to execute the selected entry.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="hd_id3150685" role="heading" level="3" l10n="U"
+ oldref="41">Selection in Tables</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154320" role="paragraph" l10n="U" oldref="42">In several windows, dialogs, and in the table control field, there are tables to select data, for instance, in the right part of the <link href="text/shared/guide/database_main.xhp" name="Data Source View">Data Source View</link>. The following keys are used for selections in these tables:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154014" role="listitem" 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 xml-lang="en-US" id="par_id3147396" role="listitem" 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 xml-lang="en-US" id="par_id3149488" role="listitem" l10n="U" oldref="45"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+spacebar: switches between selection of the current column and cancellation of this selection.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156286" role="listitem" 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 xml-lang="en-US" id="par_id3145251" role="listitem" 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 xml-lang="en-US" id="hd_id3150592" role="heading" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153221" role="listitem" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148456" role="listitem" 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>
+ <paragraph xml-lang="en-US" id="par_id3149400" role="listitem" l10n="U" oldref="4">Choose a command (down arrow, then Enter).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155083" role="listitem" l10n="U" oldref="3">Now you can use the arrow keys to move or resize the dialog or window.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147497" role="listitem" l10n="U" oldref="2">Press Enter to accept the change. Press Escape to cancel the changes.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3146988" role="heading" level="3" l10n="U"
+ oldref="150">Docking and Undocking Windows and Toolbars</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147176" role="listitem" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="listitem" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3154479" role="heading" level="3" l10n="U"
+ oldref="148">Selecting objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="149">Press Shift+F4 to select the first object in the current document. When an object is selected, press Tab to select the next object, or press Esc to go back to the text.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152962" role="heading" level="3" l10n="U"
+ oldref="54">Edit Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156379" role="paragraph" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="3" l10n="U"
+ oldref="55">Edit Position and Size of Objects</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148405" role="listitem" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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 xml-lang="en-US" id="par_id3166450" role="listitem" 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 xml-lang="en-US" id="par_id3147345" role="listitem" 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 xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="60">In the handle edit mode, the arrow keys move the selected handle, which changes the object size.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3147361" role="heading" level="3" l10n="U"
+ oldref="61">Edit the Anchors of Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148534" role="paragraph" l10n="U" oldref="62">You can move the anchor of an object with the arrow keys. First enter the handle edit mode and select the anchor. Depending on the type of anchor, you can then move the anchor in different directions.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163808" role="listitem" l10n="U" oldref="63">Select the object.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150646" role="listitem" 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 xml-lang="en-US" id="par_id3150940" role="listitem" 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>
-<paragraph role="listitem" id="par_id3153919" xml-lang="en-US" l10n="U" oldref="66">Use the arrow keys to move the anchor. The object follows the anchor as appropriate.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="67">You can change the anchor of the selected object for example in the object's context menu.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148393" xml-lang="en-US" l10n="U" oldref="68">If the object is anchored <emph>To Paragraph</emph>, the arrow keys move the object to the previous or next paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="69">If the object is anchored<emph> To page</emph>, the keys Page Up or Page Down move it to the previous or next page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="70">If the object is anchored <emph>To character</emph>, the Arrow keys move it through the current paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="71">If the object is anchored<emph> As character</emph>, no anchor icon exists. You cannot move the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="72">If the object is anchored <emph>To frame</emph>, the Arrow keys move it to the next frame in the respective direction.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153270" xml-lang="en-US" level="3" l10n="U" oldref="133">Controlling the Dividing Lines</paragraph>
-<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+<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>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3163668" xml-lang="en-US" l10n="U" oldref="137">Shift+Arrow keys: moves the current dividing line a small step in the arrow direction.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148426" xml-lang="en-US" l10n="U" oldref="138">Delete: deletes the current dividing line</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="139">Shift+Delete: deletes both dividing lines</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150383" xml-lang="en-US" l10n="U" oldref="140">Enter: fixes the current position of the dividing lines</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150369" xml-lang="en-US" l10n="U" oldref="141">Escape: resets the current dividing line to its default position</paragraph>
-</listitem>
-</list>
-<section id="datenquellentext">
-<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="112">Controlling the Data Source View</paragraph>
-<paragraph role="paragraph" id="par_id3150515" xml-lang="en-US" l10n="U" oldref="113">F4: opens and closes the data source view.</paragraph>
-<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"><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"><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"><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>
-<paragraph role="paragraph" id="par_id3159624" xml-lang="en-US" l10n="U" oldref="127">Enter: when a table is selected, the Enter key enters the first data field from the list box into the selection area.</paragraph>
-<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"><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>
-<section id="imagemaptext">
-<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 <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 <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>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147073" xml-lang="en-US" l10n="U" oldref="79">Use Ctrl+Tab in the image window to select the next point. Use Shift+Ctrl+Tab to select the previous point.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153285" xml-lang="en-US" l10n="U" oldref="80">Use the Delete key with the focus in the image window to delete the selected object.</paragraph>
-</listitem>
-</list>
-</section>
-<paragraph role="heading" id="hd_id3145377" xml-lang="en-US" level="2" l10n="U" oldref="46">Controlling the Help</paragraph>
-<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="CHG" oldref="47">Press Shift+F1 to display the <link href="text/shared/main0108.xhp" name="Extended Tips">Extended Tips</link> for the currently selected command, icon or control.</paragraph>
-<paragraph role="heading" id="hd_id3154960" xml-lang="en-US" level="3" l10n="U" oldref="48">Navigating the main help pages</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151300" xml-lang="en-US" l10n="U" oldref="49">In the main help pages, use Tab to jump to the next hyperlink or Shift+Tab to jump to the previous link.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155537" xml-lang="en-US" l10n="U" oldref="50">Press Enter to execute the selected hyperlink.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154912" xml-lang="en-US" l10n="U" oldref="51">Press Backspace above the Enter key to return to the previous help page.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150894" xml-lang="en-US" level="2" l10n="U" oldref="81">Controlling the Text Import dialog (CSV file import)</paragraph>
-<paragraph role="heading" id="hd_id3153975" xml-lang="en-US" level="3" l10n="U" oldref="82">Ruler</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152869" xml-lang="en-US" l10n="U" oldref="83">Left or Right Arrow: go one position to the left or to the right</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151000" xml-lang="en-US" l10n="U" oldref="84">Ctrl+Left Arrow or Ctrl+Right Arrow: jump to the previous or to the next split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159203" xml-lang="en-US" l10n="U" oldref="85">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: move a split one position to the left or to the right</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154538" xml-lang="en-US" l10n="U" oldref="86">Home or End: jump to the first or the last possible position</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155382" xml-lang="en-US" l10n="U" oldref="87">Ctrl+Home or Ctrl+End: jump to the first or the last split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155894" xml-lang="en-US" l10n="U" oldref="88">Shift+Ctrl+Home or Shift+Ctrl+End: move split to the first or to the last position</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="89">Space key: insert or remove a split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154647" xml-lang="en-US" l10n="U" oldref="90">Insert key: insert a split (leave existing splits unchanged)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154765" xml-lang="en-US" l10n="U" oldref="91">Delete key: delete a split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154650" xml-lang="en-US" l10n="U" oldref="92">Shift+Delete: delete all splits</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145368" xml-lang="en-US" l10n="U" oldref="93">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155914" xml-lang="en-US" l10n="U" oldref="94">Page Up or Page Down: scroll table down or up one page</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147492" xml-lang="en-US" l10n="U" oldref="95">Escape key (during mouse drag): cancel drag, move split to old position</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145216" xml-lang="en-US" level="3" l10n="U" oldref="96">Preview</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155148" xml-lang="en-US" l10n="U" oldref="97">Left Arrow or Right Arrow: select left or right column and clear other selections</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150780" xml-lang="en-US" l10n="U" oldref="98">Ctrl+Left Arrow or Ctrl+Right Arrow: move focus to the left or to the right column (does not change selection)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="99">Shift+Left Arrow or Shift+Right Arrow: expand or shrink the selected range</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146962" xml-lang="en-US" l10n="U" oldref="100">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: expand or shrink the selected range (does not change other selections)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="101">Home or End: select the first or the last column (use Shift or Ctrl as with cursor keys)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153559" xml-lang="en-US" l10n="U" oldref="102">Space key: select the current column and deselect all of the other columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153804" xml-lang="en-US" l10n="U" oldref="103">Ctrl+Space key: select or deselect the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154733" xml-lang="en-US" l10n="U" oldref="104">Shift+Space key: select the range from the last selected column to the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154171" xml-lang="en-US" l10n="U" oldref="105">Ctrl+Shift+Space key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156368" xml-lang="en-US" l10n="U" oldref="106">Ctrl+A: select all columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151192" xml-lang="en-US" l10n="U" oldref="107">Shift+F10: open a context menu</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150416" xml-lang="en-US" l10n="U" oldref="108">Ctrl+1 ... Ctrl+7: set the 1st ... 7th column type for the selected columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166442" xml-lang="en-US" l10n="U" oldref="109">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146103" xml-lang="en-US" l10n="U" oldref="110">Page Up or Page Down: scroll table down or up one page</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145116" xml-lang="en-US" l10n="U" oldref="111">Ctrl+Home or Ctrl+End: scroll to the top or bottom of a table</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153298" xml-lang="en-US" level="2" l10n="U" oldref="142">Controlling the Insert - Special Character Dialog</paragraph>
-<list type="unordered">
-<listitem>
-<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"><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>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/04/01010000.xhp#common_keys"/>
-<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-</body>
-</helpdocument>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153919" role="listitem" l10n="U" oldref="66">Use the arrow keys to move the anchor. The object follows the anchor as appropriate.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="67">You can change the anchor of the selected object for example in the object's context menu.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148393" role="listitem" l10n="U" oldref="68">If the object is anchored <emph>To Paragraph</emph>, the arrow keys move the object to the previous or next paragraph.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145615" role="listitem" l10n="U" oldref="69">If the object is anchored<emph> To page</emph>, the keys Page Up or Page Down move it to the previous or next page.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145135" role="listitem" l10n="U" oldref="70">If the object is anchored <emph>To character</emph>, the Arrow keys move it through the current paragraph.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145256" role="listitem" l10n="U" oldref="71">If the object is anchored<emph> As character</emph>, no anchor icon exists. You cannot move the object.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149527" role="listitem" l10n="U" oldref="72">If the object is anchored <emph>To frame</emph>, the Arrow keys move it to the next frame in the respective direction.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
+ oldref="133">Controlling the Dividing Lines</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158413" role="paragraph" 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 xml-lang="en-US" id="par_id3149814" role="listitem" 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 xml-lang="en-US" id="par_id3158444" role="listitem" l10n="U" oldref="136">Arrow keys: moves the current dividing line a big step in the arrow direction.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163668" role="listitem" l10n="U" oldref="137">Shift+Arrow keys: moves the current dividing line a small step in the arrow direction.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148426" role="listitem" l10n="U" oldref="138">Delete: deletes the current dividing line</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151277" role="listitem" l10n="U" oldref="139">Shift+Delete: deletes both dividing lines</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150383" role="listitem" l10n="U" oldref="140">Enter: fixes the current position of the dividing lines</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150369" role="listitem" l10n="U" oldref="141">Escape: resets the current dividing line to its default position</paragraph>
+ </listitem>
+ </list>
+ <section id="datenquellentext">
+ <paragraph xml-lang="en-US" id="hd_id3154492" role="heading" level="2" l10n="U"
+ oldref="112">Controlling the Data Source View</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150515" role="paragraph" l10n="U" oldref="113">F4: opens and closes the data source view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159109" role="paragraph" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153229" role="paragraph" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150312" role="paragraph" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" 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 xml-lang="en-US" id="hd_id3147171" role="heading" level="3" l10n="U"
+ oldref="118">Shortcuts in the Query Design Window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152455" role="paragraph" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151180" role="paragraph" 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 xml-lang="en-US" id="hd_id3156288" role="heading" level="3" l10n="U"
+ oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156166" role="paragraph" 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 xml-lang="en-US" id="par_id3147310" role="paragraph" 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 xml-lang="en-US" id="par_id3152986" role="paragraph" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145384" role="paragraph" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154529" role="paragraph" l10n="U" oldref="126">Enter: when a connection is selected, the Enter key opens the <emph>Properties</emph> dialog of the connection.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="127">Enter: when a table is selected, the Enter key enters the first data field from the list box into the selection area.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153816" role="heading" level="3" l10n="U"
+ oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152896" role="paragraph" 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 xml-lang="en-US" id="hd_id3146152" role="heading" level="3" l10n="U"
+ oldref="131">Keys in the Table Design Window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151243" role="paragraph" l10n="CHG" oldref="132">F6: switches between toolbar, column view, and properties area.</paragraph>
+ </section>
+ <section id="imagemaptext">
+ <paragraph xml-lang="en-US" id="hd_id3145075" role="heading" level="2" l10n="U"
+ oldref="74">Controlling the ImageMap Editor</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159096" role="listitem" 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 xml-lang="en-US" id="par_id3156016" role="listitem" 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 xml-lang="en-US" id="par_id3149587" role="listitem" 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 xml-lang="en-US" id="par_id3154343" role="listitem" l10n="U" oldref="78">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147073" role="listitem" l10n="U" oldref="79">Use Ctrl+Tab in the image window to select the next point. Use Shift+Ctrl+Tab to select the previous point.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153285" role="listitem" l10n="U" oldref="80">Use the Delete key with the focus in the image window to delete the selected object.</paragraph>
+ </listitem>
+ </list>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3145377" role="heading" level="2" l10n="U"
+ oldref="46">Controlling the Help</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149441" role="paragraph" l10n="CHG" oldref="47">Press Shift+F1 to display the <link href="text/shared/main0108.xhp" name="Extended Tips">Extended Tips</link> for the currently selected command, icon or control.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154960" role="heading" level="3" l10n="U"
+ oldref="48">Navigating the main help pages</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151300" role="listitem" l10n="U" oldref="49">In the main help pages, use Tab to jump to the next hyperlink or Shift+Tab to jump to the previous link.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155537" role="listitem" l10n="U" oldref="50">Press Enter to execute the selected hyperlink.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154912" role="listitem" l10n="U" oldref="51">Press Backspace above the Enter key to return to the previous help page.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3150894" role="heading" level="2" l10n="U"
+ oldref="81">Controlling the Text Import dialog (CSV file import)</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153975" role="heading" level="3" l10n="U"
+ oldref="82">Ruler</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152869" role="listitem" l10n="U" oldref="83">Left or Right Arrow: go one position to the left or to the right</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151000" role="listitem" l10n="U" oldref="84">Ctrl+Left Arrow or Ctrl+Right Arrow: jump to the previous or to the next split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159203" role="listitem" l10n="U" oldref="85">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: move a split one position to the left or to the right</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154538" role="listitem" l10n="U" oldref="86">Home or End: jump to the first or the last possible position</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155382" role="listitem" l10n="U" oldref="87">Ctrl+Home or Ctrl+End: jump to the first or the last split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155894" role="listitem" l10n="U" oldref="88">Shift+Ctrl+Home or Shift+Ctrl+End: move split to the first or to the last position</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145195" role="listitem" l10n="U" oldref="89">Space key: insert or remove a split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154647" role="listitem" l10n="U" oldref="90">Insert key: insert a split (leave existing splits unchanged)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154765" role="listitem" l10n="U" oldref="91">Delete key: delete a split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154650" role="listitem" l10n="U" oldref="92">Shift+Delete: delete all splits</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145368" role="listitem" l10n="U" oldref="93">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155914" role="listitem" l10n="U" oldref="94">Page Up or Page Down: scroll table down or up one page</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147492" role="listitem" l10n="U" oldref="95">Escape key (during mouse drag): cancel drag, move split to old position</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3145216" role="heading" level="3" l10n="U"
+ oldref="96">Preview</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="U" oldref="97">Left Arrow or Right Arrow: select left or right column and clear other selections</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150780" role="listitem" l10n="U" oldref="98">Ctrl+Left Arrow or Ctrl+Right Arrow: move focus to the left or to the right column (does not change selection)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153811" role="listitem" l10n="U" oldref="99">Shift+Left Arrow or Shift+Right Arrow: expand or shrink the selected range</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146962" role="listitem" l10n="U" oldref="100">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: expand or shrink the selected range (does not change other selections)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147512" role="listitem" l10n="U" oldref="101">Home or End: select the first or the last column (use Shift or Ctrl as with cursor keys)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154733" role="listitem" l10n="U" oldref="104">Shift+Space key: select the range from the last selected column to the current column</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154171" role="listitem" l10n="U" oldref="105">Ctrl+Shift+Space key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156368" role="listitem" l10n="U" oldref="106">Ctrl+A: select all columns</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151192" role="listitem" l10n="U" oldref="107">Shift+F10: open a context menu</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150416" role="listitem" l10n="U" oldref="108">Ctrl+1 ... Ctrl+7: set the 1st ... 7th column type for the selected columns</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166442" role="listitem" l10n="U" oldref="109">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146103" role="listitem" l10n="U" oldref="110">Page Up or Page Down: scroll table down or up one page</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145116" role="listitem" l10n="U" oldref="111">Ctrl+Home or Ctrl+End: scroll to the top or bottom of a table</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153298" role="heading" level="2" l10n="U"
+ oldref="142">Controlling the Insert - Special Character Dialog</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153073" role="listitem" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153295" role="listitem" 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 xml-lang="en-US" id="par_id3153958" role="listitem" 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>
+ </listitem>
+ </list>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/04/01010000.xhp#common_keys"/>
+ <embed href="text/shared/guide/accessibility.xhp#accessibility"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/labels.xhp b/helpcontent2/source/text/shared/guide/labels.xhp
index dd355b6918..3e343e0c0f 100755
--- a/helpcontent2/source/text/shared/guide/labels.xhp
+++ b/helpcontent2/source/text/shared/guide/labels.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: labels.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/labels_database.xhp b/helpcontent2/source/text/shared/guide/labels_database.xhp
index ea304c8e66..8f7f9f7e52 100644
--- a/helpcontent2/source/text/shared/guide/labels_database.xhp
+++ b/helpcontent2/source/text/shared/guide/labels_database.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: labels_database.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,67 +29,53 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing Address Labels</title>
-<filename>/text/shared/guide/labels_database.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Printing Address Labels</title>
+ <filename>/text/shared/guide/labels_database.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147399"><bookmark_value>address labels from databases</bookmark_value>
-<bookmark_value>labels; from databases</bookmark_value>
-<bookmark_value>stickers</bookmark_value>
-<bookmark_value>databases;creating labels</bookmark_value>
-</bookmark><comment>mw deleted "creating;"</comment><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
+ <bookmark_value>labels; from databases</bookmark_value>
+ <bookmark_value>stickers</bookmark_value>
+ <bookmark_value>databases;creating labels</bookmark_value>
+</bookmark><comment>mw deleted "creating;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147399" role="heading" level="1" l10n="U"
+ oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
</variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="CHG" oldref="37">Select the format of the label sheets you want to print on. Remember to mark <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10687" xml-lang="en-US" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="38">When you see the label document, open the data source view by choosing <emph>View - Data Sources</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="58">In the data source view, select your address data source table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="39">Drag the data fields needed for the Address individually into the top left label. For example, click on the column header NAME and, keeping the mouse button depressed, drag it into the label. This inserts a field. Put the fields in order to complete the address in the first label at top left.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="40">Place the cursor at the last text position (after the last field) in the first label.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="CHG" oldref="41">Choose <emph>Insert - Fields - Other</emph>, and go to the <emph>Database</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="42">Select the type <emph>Next record</emph>, click on <emph>Insert</emph> and then on <emph>Close</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="43">You can now synchronize the labels. Click on the <emph>Synchronize</emph>
-<emph>Labels</emph> button in the small window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="44">In the data source view, select the records for which you would like address stickers, by clicking on the row headers to the left. Use the <item type="keycode">Shift</item> or <item type="keycode">Ctrl</item> key in the usual way to select several records at the same time.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3146972" xml-lang="en-US" l10n="CHG" oldref="45">On the Table Data bar, click the <emph>Data to Fields</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148484" xml-lang="en-US" l10n="CHG" oldref="25">You can then save and/or print the label document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8476821" xml-lang="en-US" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/labels.xhp#labels"/>
-</section>
-</body>
-</helpdocument>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="37">On the <emph>Labels</emph> tab page, select the format of the label sheets you want to print on. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0130200903370863" role="paragraph" l10n="NEW">Choose the database and table from which to get the data.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id013020090337089" role="paragraph" l10n="NEW">Select a database field of which you want to print the contents. Click the button that shows a left arrow to insert the database field into the Label Text box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0130200903370930" role="paragraph" l10n="NEW">Continue to select and insert database fields if you want more fields on every label. You can press Enter to insert a new line, and you can type any character to insert fixed text.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0130200903370924" role="paragraph" l10n="NEW">Optionally, if you want to type more text, apply formatting, or insert images and line art, you should enable <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. If you enable this, once you leave the Labels dialog box a small window opens with a Synchronize button. Now you only need to work on the first label on the labels document, then click the Synchronize button to copy your work to every label of the document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10687" role="paragraph" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148685" role="paragraph" l10n="CHG" oldref="38">When you see the label document, you might want to temporarily enable <item type="menuitem">View - Field Names</item>. This displays the fields in a more visible manner, so that you can arrange and edit label contents more easily.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148484" role="paragraph" l10n="CHG" oldref="25">You can save and/or print the label document.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id8476821" role="paragraph" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog. In the Mail Merge dialog, you can select the records for which you want to print labels.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/labels.xhp#labels"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index 67297ff33f..bdccb0a0cc 100755
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: language_select.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,163 +29,154 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting the Document Language</title>
-<filename>/text/shared/guide/language_select.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Selecting the Document Language</title>
+ <filename>/text/shared/guide/language_select.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3083278"><bookmark_value>languages; selecting for text</bookmark_value>
-<bookmark_value>documents; languages</bookmark_value>
-<bookmark_value>characters; language selection</bookmark_value>
-<bookmark_value>character styles;language selection</bookmark_value>
-<bookmark_value>text; language selection</bookmark_value>
-<bookmark_value>paragraph styles; languages</bookmark_value>
-<bookmark_value>drawings; languages</bookmark_value>
-<bookmark_value>defaults;languages</bookmark_value>
-<bookmark_value>spellcheck; default languages</bookmark_value>
-<bookmark_value>dictionaries, see also languages</bookmark_value>
-</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment><paragraph role="heading" id="hd_id3083278" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
+ <bookmark_value>documents; languages</bookmark_value>
+ <bookmark_value>characters; language selection</bookmark_value>
+ <bookmark_value>character styles;language selection</bookmark_value>
+ <bookmark_value>text; language selection</bookmark_value>
+ <bookmark_value>paragraph styles; languages</bookmark_value>
+ <bookmark_value>drawings; languages</bookmark_value>
+ <bookmark_value>defaults;languages</bookmark_value>
+ <bookmark_value>spellcheck; default languages</bookmark_value>
+ <bookmark_value>dictionaries, see also languages</bookmark_value>
+</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3083278" role="heading" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153093" xml-lang="en-US" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152886" xml-lang="en-US" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Tools - Options</emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152938" xml-lang="en-US" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166413" xml-lang="en-US" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" l10n="U" oldref="15">Applying a language directly to selected text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159348" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154164" xml-lang="en-US" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
-<paragraph role="heading" id="hd_id3154272" xml-lang="en-US" level="2" l10n="U" oldref="21">Selecting a language for a Character Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145649" xml-lang="en-US" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150753" xml-lang="en-US" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150321" xml-lang="en-US" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154756" xml-lang="en-US" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
-</listitem>
-</list><comment>UFI: see i76182</comment><paragraph role="heading" id="hd_id8703268" xml-lang="en-US" level="2" l10n="NEW">Adding More Text Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7919248" xml-lang="en-US" l10n="CHG">In OpenOffice.org software, you can choose <item type="menuitem">File - Wizards - Install new dictionaries</item> to open a Writer document which helps you to install more languages.<comment>this document is only available with OOo, not SO</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5174108" xml-lang="en-US" l10n="NEW">The document contains pages in many different languages. Click your own language on the first page to see the following instructions in your own language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2897427" xml-lang="en-US" l10n="NEW">Click the big button in the middle of the document page. This starts a macro to display more info and download the dictionary files.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3906979" xml-lang="en-US" l10n="NEW">Select to install the new files for the current user only or for all users (which requires write permission to the shared folder).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3998535" xml-lang="en-US" l10n="NEW">Click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6273995" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> button. After some short delay, you see a list of available Spelling dictionaries.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4401684" xml-lang="en-US" l10n="NEW">Select the languages for Spelling and click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7082430" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> and select languages for Hyphenation and for Thesaurus.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7718741" xml-lang="en-US" l10n="CHG">The macro downloads the files to the appropriate folder. After you click Finish, you must close OpenOffice.org software (including the Quickstarter), and restart.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9100924" xml-lang="en-US" level="2" l10n="NEW">Setting UI Language</paragraph>
-<paragraph role="paragraph" id="par_id2761314" xml-lang="en-US" l10n="NEW">A standard installation of OpenOffice.org software will give you a user interface (UI) of your chosen language.</paragraph>
-<paragraph role="paragraph" id="par_id3912778" xml-lang="en-US" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3163853" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id121158" xml-lang="en-US" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3806878" xml-lang="en-US" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id130619" xml-lang="en-US" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9999694" xml-lang="en-US" level="2" l10n="NEW">Adding More UI Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2216559" xml-lang="en-US" l10n="NEW">Open your Web browser and enter <link href="http://oootranslation.services.openoffice.org/pub/OpenOffice.org/">http://oootranslation.services.openoffice.org/pub/OpenOffice.org/</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7869502" xml-lang="en-US" l10n="CHG">Select and download the correct language pack for your version of OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9852900" xml-lang="en-US" l10n="CHG">Close OpenOffice.org software (also close the Quickstarter, if you enabled it).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3791924" xml-lang="en-US" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150043" xml-lang="en-US" l10n="U" oldref="28"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3152483" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153093" role="listitem" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152578" role="listitem" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152886" role="listitem" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3146121" role="heading" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3152938" role="heading" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150872" role="listitem" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145367" role="listitem" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166413" role="listitem" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156283" role="listitem" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154942" role="listitem" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3145801" role="heading" level="2" l10n="U"
+ oldref="15">Applying a language directly to selected text</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148455" role="listitem" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159348" role="listitem" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155600" role="listitem" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154164" role="paragraph" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154272" role="heading" level="2" l10n="U"
+ oldref="21">Selecting a language for a Character Style</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145649" role="listitem" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146792" role="listitem" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150753" role="listitem" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150321" role="listitem" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154756" role="listitem" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155766" role="listitem" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
+ </listitem>
+ </list><comment>UFI: see i76182</comment>
+<paragraph xml-lang="en-US" id="hd_id8703268" role="heading" level="2" l10n="NEW">Adding More Text Languages</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7919248" role="paragraph" l10n="CHG">Dictionaries are supplied and installed as extensions. Choose <item type="menuitem">Tools - Language - More Dictionaries Online</item> to open the dictionaries page in your default web browser.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5174108" role="paragraph" l10n="NEW">Select a dictionary in the list of descriptions. Click the heading in a dictionary description that you want to get.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2897427" role="paragraph" l10n="NEW">In the next page, click the Get It icon to download the dictionary extension. Note the folder name to which your browser downloads the file. Download additional dictionaries as you like.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3906979" role="paragraph" l10n="NEW">In %PRODUCTNAME, choose <item type="menuitem">Tools - Extension Manager</item> and click Add to install the downloaded extensions.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0220200911174493" role="paragraph" l10n="NEW">After you installed the extensions, you should close %PRODUCTNAME (including the Quickstarter), and restart.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id9100924" role="heading" level="2" l10n="NEW">Setting UI Language</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2761314" role="paragraph" l10n="NEW">A standard installation of %PRODUCTNAME software will give you a user interface (UI) of your chosen language.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id9999694" role="heading" level="2" l10n="NEW">Adding More UI Languages</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9852900" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3791924" role="paragraph" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
+ </listitem>
+ </list>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152483" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp
index 001bd5d320..b8077e2d27 100644
--- a/helpcontent2/source/text/shared/guide/line_intext.xhp
+++ b/helpcontent2/source/text/shared/guide/line_intext.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,10 +54,10 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="E">
-<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
</image></paragraph>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -83,7 +80,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="E">
-<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/guide/lineend_define.xhp b/helpcontent2/source/text/shared/guide/lineend_define.xhp
index e0ead9a6f2..9f700c0f6d 100755
--- a/helpcontent2/source/text/shared/guide/lineend_define.xhp
+++ b/helpcontent2/source/text/shared/guide/lineend_define.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/linestyle_define.xhp b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
index d952faeb16..f1b9ab30ee 100755
--- a/helpcontent2/source/text/shared/guide/linestyle_define.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/linestyles.xhp b/helpcontent2/source/text/shared/guide/linestyles.xhp
index e3e8eb2c6d..5077669185 100644
--- a/helpcontent2/source/text/shared/guide/linestyles.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyles.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: linestyles.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/macro_recording.xhp b/helpcontent2/source/text/shared/guide/macro_recording.xhp
index c5485e5adf..433c1b06ed 100755
--- a/helpcontent2/source/text/shared/guide/macro_recording.xhp
+++ b/helpcontent2/source/text/shared/guide/macro_recording.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: macro_recording.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/main.xhp b/helpcontent2/source/text/shared/guide/main.xhp
index 6a803b8cf6..63189316da 100755
--- a/helpcontent2/source/text/shared/guide/main.xhp
+++ b/helpcontent2/source/text/shared/guide/main.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/makefile.mk b/helpcontent2/source/text/shared/guide/makefile.mk
index 3bfdd7593b..d7c15f231a 100644
--- a/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/helpcontent2/source/text/shared/guide/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -178,4 +174,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/guide/measurement_units.xhp b/helpcontent2/source/text/shared/guide/measurement_units.xhp
index e0abf3e302..3c120e58e1 100755
--- a/helpcontent2/source/text/shared/guide/measurement_units.xhp
+++ b/helpcontent2/source/text/shared/guide/measurement_units.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: measurement_units.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
<paragraph role="listitem" id="par_idN10674" xml-lang="en-US" l10n="NEW">Open a document of the type for which you want to change the measurement units.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="4">In the left pane of the dialog, double-click the application for which you want to select the measurement unit.</paragraph>
@@ -74,6 +71,6 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="CHG" oldref="8"><link href="text/shared/00/00000003.xhp" name="Entering measurement units directly">Entering measurement units directly</link></paragraph>
-<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General">Tools - Options - %PRODUCTNAME Writer - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - General">%PRODUCTNAME Writer - General</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 0c4b9f7ee5..8e96a8fc24 100755
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: microsoft_terms.xhp,v $
- * $Revision: 1.10.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,14 +78,6 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="8">Comments</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/01/04050000.xhp" name="Notes">Notes</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
<paragraph role="tablecontent" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="10">Compare and Merge Documents</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp b/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
index ee361a7516..83a504f41d 100644
--- a/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
+++ b/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mobiledevicefilters.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
index f80cce2b39..8bd6fd0ce7 100755
--- a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_doctypes.xhp,v $
- * $Revision: 1.5.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
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 f230251017..3953867cb0 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_import_export_limitations.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,24 +29,22 @@
*
************************************************************************
-->
-
-
+
<meta>
-<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>
+ <topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
+ <title xml-lang="en-US" id="tit">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_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 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 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 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="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"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - 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">
@@ -193,12 +188,11 @@
</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>
+<paragraph xml-lang="en-US" id="par_idN10B0D" role="paragraph" l10n="NEW">Starting from OpenOffice.org 3.2 or StarOffice 9.2, Microsoft Office files that are encrypted by AES128 can be opened. 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>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 5525bec140..4be6b989a0 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_user.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -103,10 +100,10 @@
<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="2" l10n="CHG" oldref="15">Saving Documents by Default in Microsoft Office Formats</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Standard file format</emph> area, first select a document type, then select the file type for saving.</paragraph>
+<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format and ODF settings</emph> area, first select a document type, then select the file type for saving.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="18">From now on, if you save a document, the <emph>File type </emph>will be set according to your choice. Of course, you still can select another file type in the file save dialog.</paragraph>
@@ -125,14 +122,14 @@
</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">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="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"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - 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="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>
+<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link></emph> to set the VBA macro handling of $[officename].</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
@@ -141,8 +138,7 @@
<embed href="text/shared/guide/import_ms.xhp#import_ms"/>
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<switch select="sys">
-<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-</case>
+<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/></case>
</switch>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/navigator.xhp b/helpcontent2/source/text/shared/guide/navigator.xhp
index f5845582ea..252bc73afd 100755
--- a/helpcontent2/source/text/shared/guide/navigator.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: navigator.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="navigator"><link href="text/shared/guide/navigator.xhp" name="Navigator for Document Overview">Navigator for Document Overview</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or notes.</paragraph>
+<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or comments.</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="5">The Navigator displays all types of objects contained in a document. If a plus sign appears next to a category, this indicates that at least one object of this kind exists. If you rest the mouse pointer on the category name, the number of objects is displayed in an extended tip.</paragraph>
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="6">Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the <emph>Content View</emph> icon. Until you click the icon again, only the objects of this category will be displayed.</paragraph>
<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US" l10n="CHG" oldref="7">You may dock the Navigator to any document border or turn it back into a free window (double click on the gray area). You can change the size of the Navigator when it is a free window.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp b/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
index 7279578f79..21480ff301 100644
--- a/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: navigator_setcursor.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/navpane_on.xhp b/helpcontent2/source/text/shared/guide/navpane_on.xhp
index e32be5521b..48aa7503bc 100644
--- a/helpcontent2/source/text/shared/guide/navpane_on.xhp
+++ b/helpcontent2/source/text/shared/guide/navpane_on.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: navpane_on.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/numbering_stop.xhp b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
index 05d81143f9..28d5719ec6 100644
--- a/helpcontent2/source/text/shared/guide/numbering_stop.xhp
+++ b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: numbering_stop.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,84 +29,86 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Turning off Bullets and Numbering for Individual Paragraphs</title>
-<filename>/text/shared/guide/numbering_stop.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:14:55">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Turning off Bullets and Numbering for Individual Paragraphs</title>
+ <filename>/text/shared/guide/numbering_stop.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154186"><bookmark_value>numbering; turning off</bookmark_value>
-<bookmark_value>bullets; turning off</bookmark_value>
-<bookmark_value>removing, see also deleting</bookmark_value>
-<bookmark_value>removing;bullets and numbering</bookmark_value>
-<bookmark_value>keyboard;removing numbering</bookmark_value>
+ <bookmark_value>bullets; turning off</bookmark_value>
+ <bookmark_value>removing, see also deleting</bookmark_value>
+ <bookmark_value>removing;bullets and numbering</bookmark_value>
+ <bookmark_value>keyboard;removing numbering</bookmark_value>
</bookmark><comment>MW added "removing, see also deleting"</comment>
-<paragraph role="heading" id="hd_id3154186" xml-lang="en-US" level="1" l10n="U" oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
+<paragraph xml-lang="en-US" id="hd_id3154186" role="heading" level="1" l10n="U"
+ oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
</variable></paragraph>
<switch select="appl">
+<case select="CALC"><comment>no bullets for Calc</comment>
+<paragraph xml-lang="en-US" id="par_id0202200910470118" role="note" l10n="NEW">Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw.</paragraph>
+</case>
+<case select="MATH"><comment>no bullets for Math</comment><comment>don't care for Math by now. Issue 98726</comment>
+</case>
<case select="WRITER">
<table id="tbl_id3155338">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="E">
-<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153527" xml-lang="en-US">Icon</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
+<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153527">Icon</alt>
</image></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="E">
-<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3163802" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="E">
+<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3163802">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147618" role="paragraph" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</case>
-<default>
+<default><comment>Impress, Draw</comment>
<table id="tbl_id3159157">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3158432" xml-lang="en-US">Icon</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph" l10n="E">
+<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3144511" xml-lang="en-US" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144511" role="paragraph" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</default>
</switch>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard:
+<paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard:
</caseinline></switchinline></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key.
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148663" role="listitem" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key.
</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph.
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150543" role="listitem" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph.
</caseinline></switchinline></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops.
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops.
</caseinline></switchinline></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3151043" role="paragraph" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
+ <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+ <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+ <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+ <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+ <embed href="text/swriter/guide/captions.xhp#captions"/>
+ <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/pageformat_max.xhp b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
index 7e1a5c3b71..bca3d7b1d9 100755
--- a/helpcontent2/source/text/shared/guide/pageformat_max.xhp
+++ b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pageformat_max.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index bbd77b9aba..7acfd8101a 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.10.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,127 +29,129 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<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>
-</meta>
-<body>
-<section id="paintbrush">
+ <topic id="textsharedguidepaintbrushxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Copying Attributes With the Format Paintbrush</title>
+ <filename>/text/shared/guide/paintbrush.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="paintbrush">
<bookmark xml-lang="en-US" branch="index" id="bm_id380260"><bookmark_value>Format Paintbrush</bookmark_value>
-<bookmark_value>formatting;copying</bookmark_value>
-<bookmark_value>copying;formatting</bookmark_value>
-</bookmark>
-<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>
+ <bookmark_value>formatting;copying</bookmark_value>
+ <bookmark_value>copying;formatting</bookmark_value>
+ <bookmark_value>Paintbrush</bookmark_value>
+</bookmark><comment>MW added "Paintbrush"</comment>
+<paragraph xml-lang="en-US" id="par_idN1053A" role="heading" 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 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>
-</listitem>
-</list>
-<list type="ordered" startwith="2">
-<listitem>
-<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.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">You can use the Format Paintbrush tool to copy formatting from a text selection or from an object and apply the formatting to another text selection or object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id101920091122570" role="note" l10n="NEW">In Calc, the Format Paintbrush only applies to cell formatting.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106DD" role="paragraph" l10n="NEW">Select the text or object whose formatting you want to copy.</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered" startwith="2">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10663" role="tip" 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.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</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 <switchinline select="sys"><caseinline select="MAC">Command
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1066E" role="paragraph" l10n="NEW">Select or click the text or object that you want to apply the formatting to.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10716" role="tip" 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>
-<paragraph role="tablehead" id="par_idN10691" xml-lang="en-US" l10n="NEW">Type of Selection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10697" xml-lang="en-US" l10n="NEW">Comment</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<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>
-<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>
-<paragraph role="tablecontent" id="par_idN106AB" xml-lang="en-US" l10n="NEW">Text is selected</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Frame is selected</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
-</tablecell>
-<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 - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D2" xml-lang="en-US" l10n="NEW">Form control is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D8" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106DF" xml-lang="en-US" l10n="NEW">Drawing object is selected</paragraph>
-</tablecell>
-<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>
-<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>
-<paragraph role="tablecontent" id="par_idN106F2" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F9" xml-lang="en-US" l10n="NEW">Writer table or cells are selected</paragraph>
-</tablecell>
-<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>
-<paragraph role="tablecontent" id="par_idN10706" xml-lang="en-US" l10n="NEW">Calc table or cells are selected</paragraph>
-</tablecell>
-<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>
+ <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
+ <table id="tbl_id599688">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10691" role="tablehead" l10n="NEW">Type of Selection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10697" role="tablehead" l10n="NEW">Comment</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1069E" role="tablecontent" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106A4" role="tablecontent" 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>
+ <paragraph xml-lang="en-US" id="par_idN106AB" role="tablecontent" l10n="NEW">Text is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B1" role="tablecontent" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B8" role="tablecontent" l10n="NEW">Frame is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106BE" role="tablecontent" l10n="NEW">Copies the frame attributes that are defined in <item type="menuitem">Format - Frame</item> dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="tablecontent" l10n="NEW">Object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106CB" role="tablecontent" l10n="NEW">Copies the object formatting that is defined in the <item type="menuitem">Format - Graphics</item> or <item type="menuitem">Format - Drawing Object</item> dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D2" role="tablecontent" l10n="NEW">Form control is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D8" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Drawing object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106EC" role="tablecontent" l10n="CHG">Text within Calc cells is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F2" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F9" role="tablecontent" l10n="NEW">Writer table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106FF" role="tablecontent" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the <item type="menuitem">Format - Table</item> dialog. The paragraph and character formatting are also copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10706" role="tablecontent" l10n="NEW">Calc table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1070C" role="tablecontent" l10n="NEW">Copies the formatting that is specified in the <item type="menuitem">Format - Cells</item> dialog as well as the formatting of the cell contents</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp
index e1da77a404..10f7c8df53 100755
--- a/helpcontent2/source/text/shared/guide/pasting.xhp
+++ b/helpcontent2/source/text/shared/guide/pasting.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pasting.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
index 6a430cb51f..dc3b8e2eab 100755
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: print_blackwhite.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,110 +27,88 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideprint_blackwhitexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing in Black and White</title>
-<filename>/text/shared/guide/print_blackwhite.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-08T12:15:36">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideprint_blackwhitexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Printing in Black and White</title>
+ <filename>/text/shared/guide/print_blackwhite.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150125"><bookmark_value>printing; black and white</bookmark_value>
-<bookmark_value>black and white printing</bookmark_value>
-<bookmark_value>colors; not printing</bookmark_value>
-<bookmark_value>text; printing in black</bookmark_value>
+ <bookmark_value>black and white printing</bookmark_value>
+ <bookmark_value>colors; not printing</bookmark_value>
+ <bookmark_value>text; printing in black</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150125" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="print_blackwhite"><link href="text/shared/guide/print_blackwhite.xhp" name="Printing in Black and White">Printing in Black and White</link>
+<paragraph xml-lang="en-US" id="hd_id3150125" role="heading" level="1" l10n="U" oldref="1"><variable id="print_blackwhite"><link href="text/shared/guide/print_blackwhite.xhp" name="Printing in Black and White">Printing in Black and White</link>
</variable></paragraph>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="2" l10n="U" oldref="3">Printing text and graphics in black and white</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>File - Print</emph>. The <emph>Print</emph> dialog opens.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Click on <emph>Properties</emph>. This opens the Properties dialog for your printer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="6">Select the option to print in black and white. For further information, refer to the user's manual of your printer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="7">Confirm the <emph>Properties</emph> dialog and click <emph>OK</emph> in the <emph>Print</emph> dialog.</paragraph>
-<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="8">The current document will be printed in black and white.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="9">Printing in black and white in <item type="productname">%PRODUCTNAME</item> Impress and <item type="productname">%PRODUCTNAME</item> Draw</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Impress </emph>or <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Draw</emph>, as appropriate.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="11">Then choose <emph>Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="12">Under <emph>Quality,</emph> select either <emph>Grayscale</emph> or <emph>Black &amp; white</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154307" xml-lang="en-US" l10n="U" oldref="13">When either of these options is selected, all presentations or drawings will be printed without color. If you only want to print in black for the <emph>current</emph> print job, select the option in <emph>File - Print - Options</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="15">
-<emph>Grayscale</emph> converts all colors to a maximum of 256 gradations from black to white. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
-<paragraph role="listitem" id="par_id3145610" xml-lang="en-US" l10n="U" oldref="16">
-<emph>Black &amp; white</emph> converts all colors into the two values black and white. All borders around objects are printed black. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="2" l10n="U" oldref="17">Printing only text in black and white</paragraph>
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="18">In <item type="productname">%PRODUCTNAME</item> Writer you can choose to print color-formatted text in black and white. You can specify this either for all subsequent text documents to be printed, or only for the current printing process.</paragraph>
-<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="19">Printing all text documents with black and white text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Writer </emph>or <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Writer/Web</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147084" xml-lang="en-US" l10n="U" oldref="21">Then choose <emph>Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="22">Under <emph>Contents,</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="23">All text documents or HTML documents will be printed with black text.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="24">Printing the current text document with black and white text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="25">Choose <emph>File - Print</emph>. This opens the <emph>Print</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="26">Click the <emph>Options</emph> button. This opens the <emph>Printer Options</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="27">Under <emph>Contents</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="listitem" id="par_id3155308" xml-lang="en-US" l10n="U" oldref="28">The text document or HTML document now being printed will be printed in black text.</paragraph>
-</listitem>
+ <paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="3">Printing text and graphics in black and white</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="listitem" l10n="U" oldref="4">Choose <emph>File - Print</emph>. The <emph>General</emph> tab page of the dialog opens.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155892" role="listitem" l10n="U" oldref="5">Click on <emph>Properties</emph>. This opens the Properties dialog for your printer.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145313" role="listitem" l10n="U" oldref="6">Select the option to print in black and white. For further information, refer to the user's manual of your printer.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153345" role="listitem" l10n="U" oldref="7">Confirm the <emph>Properties</emph> dialog and click <emph>Print</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="8">The current document will be printed in black and white.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="1" l10n="U" oldref="9">Printing in black and white in <item type="productname">%PRODUCTNAME</item> Impress and <item type="productname">%PRODUCTNAME</item> Draw</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149233" role="listitem" l10n="CHG" oldref="10">Choose Tools - Options - %PRODUCTNAME Impress or Tools - Options - %PRODUCTNAME Draw, as appropriate.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150275" role="listitem" l10n="U" oldref="11">Then choose <emph>Print</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147573" role="listitem" l10n="U" oldref="12">Under <emph>Quality,</emph> select either <emph>Grayscale</emph> or <emph>Black &amp; white</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154307" role="listitem" l10n="U" oldref="13">When either of these options is selected, all presentations or drawings will be printed without color. If you only want to print in black for the <emph>current</emph> print job, select the option in <emph>File - Print - %PRODUCTNAME Draw/Impress</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149786" role="listitem" l10n="U" oldref="15">
+ <emph>Grayscale</emph> converts all colors to a maximum of 256 gradations from black to white. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145610" role="listitem" l10n="U" oldref="16">
+ <emph>Black &amp; white</emph> converts all colors into the two values black and white. All borders around objects are printed black. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153896" role="heading" level="1" l10n="U"
+ oldref="17">Printing only text in black and white</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="U" oldref="18">In <item type="productname">%PRODUCTNAME</item> Writer you can choose to print color-formatted text in black and white. You can specify this either for all subsequent text documents to be printed, or only for the current printing process.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="1" l10n="U"
+ oldref="19">Printing all text documents with black and white text</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150541" role="listitem" l10n="U" oldref="20">Choose Tools - Options - %PRODUCTNAME Writer or Tools - Options - %PRODUCTNAME Writer/Web.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147084" role="listitem" l10n="U" oldref="21">Then choose <emph>Print</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154910" role="listitem" l10n="U" oldref="22">Under <emph>Contents,</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144762" role="listitem" l10n="U" oldref="23">All text documents or HTML documents will be printed with black text.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3148920" role="heading" level="1" l10n="U"
+ oldref="24">Printing the current text document with black and white text</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152933" role="listitem" l10n="U" oldref="25">Choose <emph>File - Print</emph>. Then click the <emph>%PRODUCTNAME Writer</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149667" role="listitem" l10n="U" oldref="27">Choose <emph>Print text in black</emph> and click <emph>Print</emph>.</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered">
</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
-</body>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <paragraph xml-lang="en-US" id="par_id3153726" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154146" role="paragraph" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/print_faster.xhp b/helpcontent2/source/text/shared/guide/print_faster.xhp
index 6ae84df1a2..7701f5976c 100755
--- a/helpcontent2/source/text/shared/guide/print_faster.xhp
+++ b/helpcontent2/source/text/shared/guide/print_faster.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: print_faster.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@
<paragraph role="paragraph" id="par_idN106C8" xml-lang="en-US" l10n="NEW">You can decide to reduce the data necessary to print your document. The settings can be defined differently for printing directly to the printer or for printing to a file.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - $[officename] - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN106D6" xml-lang="en-US" l10n="NEW">Click one of the following settings options: </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp
index b42a207520..d211c9ca54 100644
--- a/helpcontent2/source/text/shared/guide/protection.xhp
+++ b/helpcontent2/source/text/shared/guide/protection.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,121 +29,124 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedguideprotectionxml" indexer="include">
-<title id="tit" xml-lang="en-US">Protecting Content in %PRODUCTNAME</title>
-<filename>/text/shared/guide/protection.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguideprotectionxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
+ <filename>/text/shared/guide/protection.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
-<bookmark_value>protected contents</bookmark_value>
-<bookmark_value>contents protection</bookmark_value>
-<bookmark_value>encryption of contents</bookmark_value>
-<bookmark_value>passwords for protecting contents</bookmark_value>
-<bookmark_value>security;protecting contents</bookmark_value>
-<bookmark_value>form controls; protecting</bookmark_value>
-<bookmark_value>draw objects;protecting</bookmark_value>
-<bookmark_value>OLE objects;protecting</bookmark_value>
-<bookmark_value>graphics;protecting</bookmark_value>
-<bookmark_value>frames;protecting</bookmark_value>
+ <bookmark_value>protected contents</bookmark_value>
+ <bookmark_value>contents protection</bookmark_value>
+ <bookmark_value>encryption of contents</bookmark_value>
+ <bookmark_value>passwords for protecting contents</bookmark_value>
+ <bookmark_value>security;protecting contents</bookmark_value>
+ <bookmark_value>form controls; protecting</bookmark_value>
+ <bookmark_value>draw objects;protecting</bookmark_value>
+ <bookmark_value>OLE objects;protecting</bookmark_value>
+ <bookmark_value>graphics;protecting</bookmark_value>
+ <bookmark_value>frames;protecting</bookmark_value>
</bookmark><comment>mw moved 4 index entries to swriter/guide/protection.xhp</comment>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
-<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
-<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
-<table id="tbl_id3145071">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="6">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3146957" role="heading" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150775" role="paragraph" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
+ <table id="tbl_id3145071">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="6">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145121" role="paragraph" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="warning" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
-<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="10">Protecting Revision Marking</paragraph>
-<paragraph role="paragraph" id="par_id3161646" xml-lang="en-US" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
-<table id="tbl_id3148797">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="12">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="14">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
-<paragraph role="heading" id="hd_id3155113" xml-lang="en-US" level="2" l10n="U" oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
-<paragraph role="paragraph" id="par_id3153703" xml-lang="en-US" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
-<table id="tbl_id3158447">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147131" xml-lang="en-US" l10n="U" oldref="54">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150088" xml-lang="en-US" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="56">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153657" xml-lang="en-US" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id3145068" role="warning" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U"
+ oldref="10">Protecting Revision Marking</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
+ <table id="tbl_id3148797">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="12">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="14">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+<comment>MW moved contents of "Protecting Cell Ranges in Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id3155113" role="heading" level="2" l10n="U"
+ oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
+ <table id="tbl_id3158447">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147131" role="paragraph" l10n="U" oldref="54">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150088" role="paragraph" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Picture - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147510" role="paragraph" l10n="U" oldref="56">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153657" role="paragraph" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Picture - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3152992" xml-lang="en-US" level="2" l10n="U" oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
-<paragraph role="paragraph" id="par_id3166429" xml-lang="en-US" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
-<table id="tbl_id3151062">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153226" xml-lang="en-US" l10n="U" oldref="60">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148815" xml-lang="en-US" l10n="CHG" oldref="61">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156289" xml-lang="en-US" l10n="U" oldref="62">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="63">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3152992" role="heading" level="2" l10n="U"
+ oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166429" role="paragraph" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
+ <table id="tbl_id3151062">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153226" role="paragraph" l10n="U" oldref="60">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148815" role="paragraph" l10n="CHG" oldref="61">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156289" role="paragraph" l10n="U" oldref="62">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154991" role="paragraph" l10n="CHG" oldref="63">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
<comment>removed webdav text, see i71792</comment><comment>MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp </comment><embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
-<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-<paragraph role="paragraph" id="par_idN10B8C" xml-lang="en-US" l10n="NEW">
+ <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
+ <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+ <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW">
<embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
</paragraph>
-<paragraph role="paragraph" id="par_id4680928" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
-<paragraph role="paragraph" id="par_id9014252" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/redlining.xhp b/helpcontent2/source/text/shared/guide/redlining.xhp
index 0b50937dcf..eef290f303 100755
--- a/helpcontent2/source/text/shared/guide/redlining.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining.xhp
@@ -1,16 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: redlining.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -29,39 +27,37 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording and Displaying Changes</title>
-<filename>/text/shared/guide/redlining.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-13T15:41:19">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Recording and Displaying Changes</title>
+ <filename>/text/shared/guide/redlining.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150499"><bookmark_value>marking changes</bookmark_value>
-<bookmark_value>changes; review function</bookmark_value>
-<bookmark_value>review function; recording changes example</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
+ <bookmark_value>highlighting changes</bookmark_value>
+ <bookmark_value>changes; review function</bookmark_value>
+ <bookmark_value>review function; recording changes example</bookmark_value>
+ <bookmark_value>Track Changes, see review function</bookmark_value>
+</bookmark><comment>MW addes a cross-reference</comment><comment>MW added "highlighting changes"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id4013794" 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_id3153681" xml-lang="en-US" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
-<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
-<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
-<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
-<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
-<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id4013794" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
+ <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
+ <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
+ <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
+ <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+ <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/redlining_accept.xhp b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
index 310e844612..64129ac46e 100755
--- a/helpcontent2/source/text/shared/guide/redlining_accept.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_accept.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
index b6bb0aa8eb..665e2d72da 100755
--- a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_doccompare.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
index 54e47cad02..d275d18a14 100755
--- a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_docmerge.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
index ba20ac7a54..112094d568 100755
--- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: redlining_enter.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,60 +29,56 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording Changes</title>
-<filename>/text/shared/guide/redlining_enter.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T12:53:47">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Recording Changes</title>
+ <filename>/text/shared/guide/redlining_enter.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155364"><bookmark_value>changes; recording</bookmark_value>
-<bookmark_value>recording; changes</bookmark_value>
-<bookmark_value>comments; on changes</bookmark_value>
-<bookmark_value>settings;tracking changes</bookmark_value>
-</bookmark><comment>UFI: deleted index review function;recording changes</comment>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
+ <bookmark_value>recording; changes</bookmark_value>
+ <bookmark_value>comments; on changes</bookmark_value>
+ <bookmark_value>review function;tracking changes</bookmark_value>
+</bookmark><comment>UFI: deleted index review function;recording changes</comment><comment>MW changed "settings;tracking changes" </comment>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id7271645" 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_id3145669" xml-lang="en-US" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
-<table id="tbl_id3147399">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="17">1.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="18">2.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="19">3.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id7271645" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
+ <table id="tbl_id3147399">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="17">1.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="18">2.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3163802" role="paragraph" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="19">3.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
<paragraph role="paragraph" id="par_id3156119" xml-lang="en-US" l10n="U" oldref="12">Changes in a spreadsheet document are highlighted by a border around the cells; when you point to the cell you can see more detailed information on this change in the Help Tip.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph>
<paragraph role="paragraph" id="par_id3153542" xml-lang="en-US" l10n="U" oldref="14">To stop recording changes, choose <emph>Edit - Changes - Record</emph> again. The check mark is removed and you can now save the document.</paragraph>
<paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="15">In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example.</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
diff --git a/helpcontent2/source/text/shared/guide/redlining_protect.xhp b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
index d7d7a7133d..b38bc5ea64 100755
--- a/helpcontent2/source/text/shared/guide/redlining_protect.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_protect.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_versions.xhp b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
index 43ef11c539..fe8fdaff61 100755
--- a/helpcontent2/source/text/shared/guide/redlining_versions.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_versions.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/round_corner.xhp b/helpcontent2/source/text/shared/guide/round_corner.xhp
index 6abf932189..cd5f1977f0 100644
--- a/helpcontent2/source/text/shared/guide/round_corner.xhp
+++ b/helpcontent2/source/text/shared/guide/round_corner.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: round_corner.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 0b02734ac4..2f4c52037d 100755
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: scripting.xhp,v $
- * $Revision: 1.17.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,200 +32,198 @@
<meta>
-<topic id="textsharedguidescriptingxml" indexer="include">
-<title id="tit" xml-lang="en-US">Scripting %PRODUCTNAME</title>
-<filename>/text/shared/guide/scripting.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidescriptingxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Scripting %PRODUCTNAME</title>
+ <filename>/text/shared/guide/scripting.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id5277565"><bookmark_value>assigning scripts</bookmark_value>
-<bookmark_value>programming;scripting</bookmark_value>
-<bookmark_value>form controls;assigning macros</bookmark_value>
-<bookmark_value>pictures;assigning macros</bookmark_value>
-<bookmark_value>hyperlinks;assigning macros</bookmark_value>
-<bookmark_value>shortcut keys;assigning macros</bookmark_value>
-<bookmark_value>controls;assigning macros (Basic)</bookmark_value>
-<bookmark_value>menus;assigning macros</bookmark_value>
-<bookmark_value>events;assigning scripts</bookmark_value>
+ <bookmark_value>programming;scripting</bookmark_value>
+ <bookmark_value>form controls;assigning macros</bookmark_value>
+ <bookmark_value>pictures;assigning macros</bookmark_value>
+ <bookmark_value>hyperlinks;assigning macros</bookmark_value>
+ <bookmark_value>shortcut keys;assigning macros</bookmark_value>
+ <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>
+<paragraph xml-lang="en-US" id="par_idN1070A" role="heading" 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="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US" l10n="NEW">JavaScript</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1073D" xml-lang="en-US" l10n="CHG">BeanShell</paragraph>
-</listitem>
-</list>
-<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>
-</list>
-<paragraph role="paragraph" id="par_idN1091F" xml-lang="en-US" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
-<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10758" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1093D" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10760" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10768" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1076C" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10770" xml-lang="en-US" l10n="NEW">A list of the script functions appears in the <emph>Functions</emph> list box. Select a function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10778" xml-lang="en-US" l10n="NEW">Click <emph>New</emph> to create a new menu assignment. The new menu entry appears in the <emph>Menu entries</emph> list box. Click the menu entry and enter text to rename the entry.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10783" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10787" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A59" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A61" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A65" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A69" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Functions</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A71" xml-lang="en-US" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
-<paragraph role="paragraph" id="par_idN10A74" xml-lang="en-US" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A78" xml-lang="en-US" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1078A" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1078E" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A16" xml-lang="en-US" l10n="NEW">Click <emph>Assign Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A9E" xml-lang="en-US" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAA" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAE" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Macros</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
-<paragraph role="paragraph" id="par_idN10AB9" xml-lang="en-US" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ABD" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>Assign</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
-<list type="ordered">
-<listitem>
-<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 - 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>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AE7" xml-lang="en-US" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEB" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEF" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>Assign</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10798" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1079C" xml-lang="en-US" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B15" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B19" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B21" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1079F" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107A3" xml-lang="en-US" l10n="NEW">Select the graphic in your document. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3B" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3F" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107A6" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a form control</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107AA" xml-lang="en-US" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B59" xml-lang="en-US" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B5D" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B61" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107AD" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107B1" xml-lang="en-US" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B7F" xml-lang="en-US" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B87" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B8B" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10728" role="paragraph" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1072B" role="paragraph" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">%PRODUCTNAME Basic</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10739" role="paragraph" l10n="NEW">JavaScript</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1073D" role="paragraph" l10n="CHG">BeanShell</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG">Python</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10758" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1093D" role="paragraph" l10n="NEW">Click <emph>Add</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10760" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10768" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1076C" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10770" role="paragraph" l10n="NEW">A list of the script functions appears in the <emph>Commands</emph> list box. Select a function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10778" role="paragraph" l10n="NEW">Click <emph>Add</emph> to create a new menu assignment. The new menu entry appears in the <emph>Entries</emph> list box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10783" role="heading" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10787" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A59" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A61" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A65" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A69" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Commands</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A71" role="paragraph" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10A74" role="paragraph" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A78" role="paragraph" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1078A" role="heading" level="2" l10n="NEW">To assign a script to an event</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A16" role="paragraph" l10n="NEW">Click <emph>Macro</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A9E" role="paragraph" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AA6" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAA" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAE" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Action</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AB6" role="paragraph" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10AB9" role="paragraph" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ABD" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10791" role="heading" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADB" role="paragraph" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADF" role="paragraph" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AE7" role="paragraph" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEB" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEF" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AF7" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10798" role="heading" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1079C" role="paragraph" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B15" role="paragraph" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B19" role="paragraph" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B21" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1079F" role="heading" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107A3" role="paragraph" l10n="NEW">Select the graphic in your document. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3B" role="paragraph" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3F" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107A6" role="heading" level="2" l10n="NEW">To assign a script to a form control</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107AA" role="paragraph" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B59" role="paragraph" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B5D" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B61" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107AD" role="heading" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B1" role="paragraph" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B7F" role="paragraph" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B87" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B8B" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index a67d920de0..943ae48bf2 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index bfcb8a69a3..23d61bb1e6 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: spadmin.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +29,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidespadminxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</title>
+<title id="tit" xml-lang="en-US">Setting up Printer and Fax Under UNIX Based Platforms</title>
<filename>/text/shared/guide/spadmin.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:04:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="chapter_all">
@@ -55,14 +48,14 @@
<bookmark_value>PostScript; PDF converter, UNIX</bookmark_value>
<bookmark_value>converters; PostScript, UNIX</bookmark_value>
<bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value>
-<bookmark_value>fonts; adding under UNIX</bookmark_value>
-<bookmark_value>typefaces; adding under UNIX</bookmark_value>
</bookmark><comment>mw deleted "printer programs under UNIX", "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment>
<paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/>
-<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link>
+<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer and Fax Under UNIX Based Platforms">Setting up Printer and Fax Under UNIX Based Platforms</link>
</variable></paragraph>
<section id="chapter_body">
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers, faxes and fonts for use with the $[officename] software.</paragraph>
+<paragraph role="paragraph" id="par_id3159876" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses the installed fonts of your system. In a text document you can select from all printable fonts. In an HTML document or in Web layout, only fonts that are visible on screen are offered. In spreadsheets and drawings you can select from all installed fonts.</paragraph>
+
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers and faxes for use with the $[officename] software.</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="117">Call the printer administration program <emph>spadmin</emph> as follows:</paragraph>
<list type="unordered">
<listitem>
@@ -74,7 +67,7 @@
</list>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="14">After it starts, the window of the printer administration program <emph>spadmin</emph> appears.</paragraph>
<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="10">Following a server installation, the system administrator first logs on as with root privileges, and starts the printer administration program <emph>spadmin</emph>. The administrator then creates a general printer configuration file called {install_path}/share/psprint/psprint.conf for all users. All changes are immediately available to all users.</paragraph>
-<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="285">The system administrator can also add fonts for all users in the server installation. However, these fonts are available only after restarting the $[officename] software.</paragraph>
+
<paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="121">Setting up Printers</paragraph>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="122">Under UNIX based platforms, the $[officename] software only offers direct support for printers using the PostScript technology. Other printers must be set up as described in the section <emph>Printer Drivers in the $[officename] Software</emph>. The $[officename] software automatically provides a printer with the default driver for each system queue. You can add additional printers as needed.</paragraph>
<paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="286">Adding a Printer</paragraph>
@@ -171,8 +164,7 @@
<paragraph role="listitem" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="137">To delete the selected printer, click <emph>Remove</emph>. The default printer or a printer that has been created by the system administrator in a server installation cannot be removed using this dialog.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer </caseinline></switchinline></paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="31">To make the printer selected from the <emph>Installed printers</emph> list box the default printer, double-click its name or click the <emph>Default</emph> button.</paragraph>
@@ -207,7 +199,7 @@
<paragraph role="paragraph" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="303">You can now send faxes by printing to the printer that has just been created.</paragraph>
<paragraph role="paragraph" id="par_id3148419" xml-lang="en-US" l10n="U" oldref="83">Enter the fax number as text in the document. You can also enter a field that takes the fax number from your active database. In any case, the fax number must start with the characters @@# and end with @@. A valid entry would have the form @@#1234567@@.</paragraph>
<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="304">If these characters including the telephone number are not printed, activate the <emph>Fax number is removed from the printout</emph> option under <emph>Properties</emph> on the <emph>Command</emph> tab page. If no telephone number is entered in the document, a dialog prompting you for it will appear after the printout.</paragraph>
-<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph>Tools - Options - %PRODUCTNAME Writer - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3150517" xml-lang="en-US" l10n="CHG" oldref="84">Remember to create one separate print job for each fax, otherwise, the first recipient will receive all the faxes. In the <emph>Tools - Mail Merge</emph> dialog select the <emph>Printer</emph> option and then select the <emph>Single print jobs</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="E" oldref="344" localize="false"/>
<paragraph role="heading" id="hd_id3146929" xml-lang="en-US" level="2" l10n="U" oldref="306">Connecting a PostScript to PDF Converter</paragraph>
@@ -230,89 +222,7 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph>
-<paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/>
-<paragraph role="heading" id="hd_id3156195" xml-lang="en-US" level="2" l10n="U" oldref="143">Installing Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="144">When you are working with the $[officename] software you might notice that a different number of fonts is provided depending on the document type being used. This is because not all of the fonts can be used in every case.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="145">Therefore, only those fonts will be shown in the font selection box when working with a text document which can also be printed, as it is assumed that you will only want to use those fonts that you can actually have printed on paper.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3157982" xml-lang="en-US" l10n="CHG" oldref="146">In an HTML document or in Web layout, only fonts that are available on screen are offered.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149590" xml-lang="en-US" l10n="U" oldref="147">On the other hand, when working with spreadsheets and drawings you will be able to use all of the fonts that can be either printed or shown on the screen.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3159093" xml-lang="en-US" l10n="U" oldref="148">The $[officename] software tries to match the display on screen to the printout (WYSIWYG = what you see is what you get). Possible problems are shown in the bottom of the dialog <emph>Format - Character</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3156353" xml-lang="en-US" level="3" l10n="U" oldref="314">Adding Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3144503" xml-lang="en-US" l10n="U" oldref="315">You can integrate additional fonts in the $[officename] software. Fonts which you integrate are available exclusively to the $[officename] software and can be used with various Xservers without your having to install them there. To make the fonts available to other programs as well, proceed as usual by adding the fonts to your Xserver. The $[officename] software can display and print out PostScript Type1 fonts as well as TrueType fonts (including TrueType Collections).</paragraph>
-<paragraph role="paragraph" id="par_id3156174" xml-lang="en-US" l10n="U" oldref="316">To integrate additional fonts in the $[officename] software, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154825" xml-lang="en-US" l10n="U" oldref="357">Go to the {install_path}/program directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151127" xml-lang="en-US" l10n="U" oldref="317">Enter: ./spadmin</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149072" xml-lang="en-US" l10n="U" oldref="318">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156341" xml-lang="en-US" l10n="U" oldref="319">The dialog lists all fonts added for the $[officename] software. You can select and remove fonts using the <emph>Remove</emph> button or add new fonts with the <emph>Add</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155118" xml-lang="en-US" l10n="U" oldref="320">Click <emph>Add</emph>. The <emph>Add Fonts</emph> dialog appears.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="321">Enter the directory from which you want to add the fonts. Press the <emph>...</emph> button and select the directory from the path selection dialog or enter the directory directly.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154266" xml-lang="en-US" l10n="U" oldref="322">A list of the fonts from this directory appears. Select the fonts you want to add. To add all the fonts, click <emph>Select All</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154060" xml-lang="en-US" l10n="U" oldref="323">With the <emph>Create soft links only</emph> check box you can determine whether the fonts are to be copied into the $[officename] directory or only symbolic links are to be created there. If the fonts to be added are on a data medium that is not always available (such as a CD-ROM), you must copy the fonts.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155539" xml-lang="en-US" l10n="U" oldref="324">Click OK. The fonts will now be added.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="325">In the case of a server installation, the fonts are installed in that installation if possible. If the user has no write access rights, the fonts will be installed in the corresponding user installation so that only the user who installed them can access them.</paragraph>
-<paragraph role="heading" id="hd_id3152869" xml-lang="en-US" level="3" l10n="U" oldref="326">Deleting Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3151302" xml-lang="en-US" l10n="U" oldref="327">To delete fonts, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150213" xml-lang="en-US" l10n="U" oldref="328">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154608" xml-lang="en-US" l10n="U" oldref="329">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="330">All fonts added to the $[officename] software are listed in the dialog that now appears. Select the fonts you want to delete and click <emph>Delete</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153242" xml-lang="en-US" l10n="U" oldref="331">You can delete only the fonts that have been added for the $[officename] software.</paragraph>
-<paragraph role="heading" id="hd_id3147487" xml-lang="en-US" level="3" l10n="U" oldref="332">Renaming Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="U" oldref="333">You can also rename fonts added for the $[officename] software. This is especially useful for fonts that contain several localized names.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="334">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151009" xml-lang="en-US" l10n="U" oldref="335">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="336">Select the fonts you want to rename and click <emph>Rename</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153008" xml-lang="en-US" l10n="U" oldref="337">Enter a new name in the dialog that appears. If the font contains several names, these names will serve as suggestions in the combo box where you enter the new name.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155521" xml-lang="en-US" l10n="U" oldref="338">Click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="339">If you select several fonts to rename, one dialog appears for each selected font.</paragraph>
-<paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="340">If you have selected a TrueType Collection (TTC), one dialog appears for each of the fonts contained in it.</paragraph>
+
</section>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/guide/standard_template.xhp b/helpcontent2/source/text/shared/guide/standard_template.xhp
index fc267590f9..0111208f5a 100755
--- a/helpcontent2/source/text/shared/guide/standard_template.xhp
+++ b/helpcontent2/source/text/shared/guide/standard_template.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: standard_template.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,7 +69,7 @@
<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - Templates - Organize</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3146901" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Set As Default Template</emph>. The next time you open a new text document, the new document will be based on the new default template.</paragraph>
@@ -91,7 +88,7 @@
<paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="13">Using Custom Templates</paragraph>
<paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="CHG" oldref="14">There are several ways to make your work easier by using your own custom templates. </paragraph>
<paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="15">Templates in the Template Folder</paragraph>
-<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
<paragraph role="tip" id="par_id3155960" xml-lang="en-US" l10n="U" oldref="33">You may need to update the view of the templates in the dialog before you can see a newly created template. In this case, choose <emph>File - Templates - Organize</emph> and in the submenu of the <emph>Commands</emph> button, choose <emph>Update</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="17">To open the template for editing, choose <emph>File - Templates - Edit</emph>.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/guide/start_parameters.xhp b/helpcontent2/source/text/shared/guide/start_parameters.xhp
index ec91bcb068..f419787800 100644
--- a/helpcontent2/source/text/shared/guide/start_parameters.xhp
+++ b/helpcontent2/source/text/shared/guide/start_parameters.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: start_parameters.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,10 +36,6 @@
<title id="tit" xml-lang="en-US">Starting the $[officename] Software With Parameters</title>
<filename>/text/shared/guide/start_parameters.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-25T12:22:48">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="start_parameters">
@@ -54,7 +47,6 @@
<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="1" l10n="U" oldref="52">Starting the $[officename] Software With Parameters</paragraph>
<paragraph role="paragraph" id="par_id3147009" xml-lang="en-US" l10n="U" oldref="1">By starting the $[officename] software from the command line you can assign various parameters, with which you can influence the performance. The use of command line parameters is only recommended for experienced users.</paragraph>
<paragraph role="note" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="2">For normal handling, the use of command line parameters is not necessary. A few of the parameters require a deeper knowledge of the technical background of the $[officename] software technology.</paragraph>
-<paragraph role="note" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="3">More information on this topic can be found at <link href="http://www.openoffice.org" name="www.openoffice.org">www.openoffice.org</link>.</paragraph>
<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the $[officename] Software From the Command Line</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
index cf4cc16071..ebecbb15c6 100644
--- a/helpcontent2/source/text/shared/guide/startcenter.xhp
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: startcenter.xhp,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,52 +29,62 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedguidestartcenterxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Start Center</title>
-<filename/>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidestartcenterxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">Start Center</title>
+ <filename>/text/shared/guide/startcenter.xhp</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_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>
+<paragraph xml-lang="en-US" id="hd_id0820200802524447" role="heading" 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>
+ <paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" 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 xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document or a file dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:WriterButton" id="bm_id1022200910564632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:CalcButton" id="bm_id1022200910570124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DrawButton" id="bm_id1022200910571273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:ImpressButton" id="bm_id102220091057270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DBButton" id="bm_id102220091057437" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:MathButton" id="bm_id1022200910575575" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0820200803104810" role="paragraph" l10n="NEW"><ahelp hid=".">The document icons each open a new document of the specified type.</ahelp></paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104978" role="paragraph" l10n="NEW">
+ <emph>Text Document</emph> opens %PRODUCTNAME <link href="text/swriter/main0000.xhp">Writer</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104998" role="paragraph" l10n="NEW">
+ <emph>Spreadsheet</emph> opens %PRODUCTNAME <link href="text/scalc/main0000.xhp">Calc</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104927" role="paragraph" l10n="NEW">
+ <emph>Presentation</emph> opens %PRODUCTNAME <link href="text/simpress/main0000.xhp">Impress</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104948" role="paragraph" l10n="NEW">
+ <emph>Drawing</emph> opens %PRODUCTNAME <link href="text/sdraw/main0000.xhp">Draw</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803105089" role="paragraph" l10n="NEW">
+ <emph>Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803105015" role="paragraph" l10n="NEW">
+ <emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:TemplateButton" id="bm_id1022200910584084" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011855" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Templates icon opens the Templates and Documents dialog.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0820200803105045" role="paragraph" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:OpenButton" id="bm_id1022200910595546" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011975" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Open a Document icon presents a file open dialog.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph><comment>the four icons show a short explanation already</comment>
+
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/tabs.xhp b/helpcontent2/source/text/shared/guide/tabs.xhp
index 942c37de11..c1c0781ab5 100644
--- a/helpcontent2/source/text/shared/guide/tabs.xhp
+++ b/helpcontent2/source/text/shared/guide/tabs.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tabs.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,7 +65,7 @@ FPE: Deleted screenshot.</lastedited>
<paragraph role="paragraph" id="par_id1376079" xml-lang="en-US" l10n="NEW">On the horizontal ruler you can see the tab stops for the current paragraph. If you want to change the tab stops, you should first consider the scope to which you want to change tab stops as follows:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id274971" xml-lang="en-US" l10n="NEW">Change the tab stops for all paragraphs using the current Paragraph Style: Right-click the paragraph to open the context menu, choose <emph>Edit Paragraph Style</emph>, click <emph>Tabs</emph>.</paragraph>
@@ -154,11 +151,11 @@ FPE: Deleted screenshot.</lastedited>
</default>
</switch>
<paragraph role="heading" id="hd_id3151074" xml-lang="en-US" level="3" l10n="U" oldref="26">Changing the Defaults</paragraph>
-<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Text Document - General">Tools - Options - %PRODUCTNAME Writer - General</link>
-</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - General">Tools - Options - %PRODUCTNAME Calc - General</link>
-</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Drawing - General">Tools - Options - %PRODUCTNAME Draw - General</link>
-</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General">Tools - Options - %PRODUCTNAME Impress - General</link>
-</caseinline><defaultinline>Tools - Options - (module name) - General</defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Text Document - General">%PRODUCTNAME Writer - General</link>
+</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - General">%PRODUCTNAME Calc - General</link>
+</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Drawing - General">%PRODUCTNAME Draw - General</link>
+</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link>
+</caseinline><defaultinline>(module name) - General</defaultinline></switchinline> in the Options dialog box.</paragraph>
<switch select="appl">
<case select="CALC">
</case>
diff --git a/helpcontent2/source/text/shared/guide/text_color.xhp b/helpcontent2/source/text/shared/guide/text_color.xhp
index f00227b2f4..4ed5b1354f 100644
--- a/helpcontent2/source/text/shared/guide/text_color.xhp
+++ b/helpcontent2/source/text/shared/guide/text_color.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: text_color.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,50 +31,53 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Color of Text</title>
-<filename>/text/shared/guide/text_color.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>colors; fill format</bookmark_value>
-<bookmark_value>text; coloring</bookmark_value>
-<bookmark_value>characters; coloring</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3156014" xml-lang="en-US" level="1" l10n="U" oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
+ <topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Changing the Color of Text</title>
+ <filename>/text/shared/guide/text_color.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>text; coloring</bookmark_value>
+ <bookmark_value>characters; coloring</bookmark_value>
+ <bookmark_value>colors; fonts</bookmark_value>
+ <bookmark_value>fonts;colors</bookmark_value>
+</bookmark><comment>MW added two entries from text/shared/01/05020200.xhp and deleted "colors;fill format"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156014" role="heading" level="1" l10n="U"
+ oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
-<table id="tbl_id3152801">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="E">
-<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159233" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
+ <table id="tbl_id3152801">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="E">
+<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152781" xml-lang="en-US" l10n="U" oldref="45">Font Color</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<table id="tbl_id3146797">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="E">
-<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150503" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152781" role="paragraph" l10n="U" oldref="45">Font Color</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <table id="tbl_id3146797">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
+<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150503">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
+ </tablecell>
+ <tablecell>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149795"><bookmark_value>paint can symbol</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="par_id3145120" role="paragraph" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+ <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/textmode_change.xhp b/helpcontent2/source/text/shared/guide/textmode_change.xhp
index b21d6c7067..a342635a7f 100755
--- a/helpcontent2/source/text/shared/guide/textmode_change.xhp
+++ b/helpcontent2/source/text/shared/guide/textmode_change.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: textmode_change.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/undo_formatting.xhp b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
index 9ac124c600..fb9a2761e1 100644
--- a/helpcontent2/source/text/shared/guide/undo_formatting.xhp
+++ b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: undo_formatting.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/version_number.xhp b/helpcontent2/source/text/shared/guide/version_number.xhp
index 1f1c7b3d29..1b7e0b5447 100755
--- a/helpcontent2/source/text/shared/guide/version_number.xhp
+++ b/helpcontent2/source/text/shared/guide/version_number.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: version_number.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
index 5018530876..731bb37e68 100755
--- a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
+++ b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: viewing_file_properties.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/workfolder.xhp b/helpcontent2/source/text/shared/guide/workfolder.xhp
index f09f61d31e..a556b5bbc8 100755
--- a/helpcontent2/source/text/shared/guide/workfolder.xhp
+++ b/helpcontent2/source/text/shared/guide/workfolder.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: workfolder.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,39 +29,40 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideworkfolderxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing Your Working Directory </title>
-<filename>/text/shared/guide/workfolder.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="chapter_all">
+ <topic id="textsharedguideworkfolderxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Changing Your Working Directory </title>
+ <filename>/text/shared/guide/workfolder.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="chapter_all">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150789"><bookmark_value>working directory change</bookmark_value>
-<bookmark_value>My Documents folder;changing work directory</bookmark_value>
-<bookmark_value>paths; changing work directory</bookmark_value>
-<bookmark_value>pictures; changing paths</bookmark_value>
-<bookmark_value>changing;work directory</bookmark_value>
-</bookmark><comment>work --&gt; working, i85615</comment><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="CHG" oldref="2"><variable id="workfolder"><link href="text/shared/guide/workfolder.xhp" name="Changing Your Working Directory">Changing Your Working Directory</link>
+ <bookmark_value>My Documents folder;changing work directory</bookmark_value>
+ <bookmark_value>paths; changing work directory</bookmark_value>
+ <bookmark_value>pictures; changing paths</bookmark_value>
+ <bookmark_value>changing;work directory</bookmark_value>
+</bookmark><comment>work --&gt; working, i85615</comment>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="CHG"
+ oldref="2"><variable id="workfolder"><link href="text/shared/guide/workfolder.xhp" name="Changing Your Working Directory">Changing Your Working Directory</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Tools - Options - $[officename] - Paths</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153880" xml-lang="en-US" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>OK</emph>. </paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph>Tools - Options - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
-</section>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="listitem" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163802" role="listitem" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153880" role="listitem" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>Select</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
+ </section>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/xforms.xhp b/helpcontent2/source/text/shared/guide/xforms.xhp
index 3c904a74f8..515cf7001d 100755
--- a/helpcontent2/source/text/shared/guide/xforms.xhp
+++ b/helpcontent2/source/text/shared/guide/xforms.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xforms.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter.xhp b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
index f2c4138410..7cf2fe6fb4 100755
--- a/helpcontent2/source/text/shared/guide/xsltfilter.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xsltfilter.xhp,v $
- * $Revision: 1.20 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp b/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
index 879c21a835..de469f24b8 100644
--- a/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xsltfilter_create.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp b/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
index 447f0d7956..7cc03fbd75 100644
--- a/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xsltfilter_distribute.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp
index 4a25d2414e..eed954370d 100644
--- a/helpcontent2/source/text/shared/main0108.xhp
+++ b/helpcontent2/source/text/shared/main0108.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0108.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedmain0108xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Help</title>
@@ -58,8 +54,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_idN1064A" xml-lang="en-US" l10n="NEW">
-<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt>
- </image></paragraph>
+<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Help</paragraph>
@@ -73,7 +68,7 @@
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph>
<embed href="text/shared/01/08060100.xhp#registrierung"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph>
-<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in Tools - Options - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_ABOUT" id="bm_id3757052" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph>
diff --git a/helpcontent2/source/text/shared/main0201.xhp b/helpcontent2/source/text/shared/main0201.xhp
index cf17365e62..99ac7d7fad 100755
--- a/helpcontent2/source/text/shared/main0201.xhp
+++ b/helpcontent2/source/text/shared/main0201.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0201.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0208.xhp b/helpcontent2/source/text/shared/main0208.xhp
index da582925b0..fbf19bfe64 100755
--- a/helpcontent2/source/text/shared/main0208.xhp
+++ b/helpcontent2/source/text/shared/main0208.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0208.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0209.xhp b/helpcontent2/source/text/shared/main0209.xhp
index 40f7906945..fd0983f2bf 100755
--- a/helpcontent2/source/text/shared/main0209.xhp
+++ b/helpcontent2/source/text/shared/main0209.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0209.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0212.xhp b/helpcontent2/source/text/shared/main0212.xhp
index 5e87e71c59..9449b97ce8 100644
--- a/helpcontent2/source/text/shared/main0212.xhp
+++ b/helpcontent2/source/text/shared/main0212.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0212.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,83 +27,82 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Data Bar</title>
-<filename>/text/shared/main0212.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-11T14:46:11">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="datenbank">
-<paragraph role="heading" id="hd_id3147102" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
-<embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147303" xml-lang="en-US" l10n="E">
-<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153896" xml-lang="en-US">Icon</alt>
+ <topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Table Data Bar</title>
+ <filename>/text/shared/main0212.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="datenbank">
+ <paragraph xml-lang="en-US" id="hd_id3147102" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
+ <embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147303" role="paragraph" l10n="E">
+<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153896">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="CHG" oldref="13">Save Record</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
-<embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
-<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154123" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="CHG" oldref="13">Save Record</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
+ <embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
+ <embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="E">
+<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3154123">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="14">Undo: Data Input</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/12100200.xhp#findrecord"/>
-<embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
-<embed href="text/shared/02/12050000.xhp#aktualisieren"/>
-<embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
-<embed href="text/shared/02/12100100.xhp#sortorder"/>
-<embed href="text/shared/00/00000450.xhp#sysortieren"/>
-<embed href="text/shared/02/12010000.xhp#aufsteigend"/>
-<embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
-<embed href="text/shared/02/12020000.xhp#absteigend"/>
-<embed href="text/shared/02/12020000.xhp#syabsteigend"/>
-<embed href="text/shared/02/12030000.xhp#autofilter"/>
-<embed href="text/shared/02/12030000.xhp#syautofilter"/>
-<embed href="text/shared/02/12120000.xhp#filteranwenden"/>
-<embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
-<embed href="text/shared/02/12090000.xhp#standardfilter1"/>
-<embed href="text/shared/02/12090000.xhp#systandardfilter"/>
-<embed href="text/shared/02/12040000.xhp#filterentfernen"/>
-<embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151382" role="paragraph" l10n="U" oldref="14">Undo: Data Input</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/02/12100200.xhp#findrecord"/>
+ <embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
+ <embed href="text/shared/02/12050000.xhp#aktualisieren"/>
+ <embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
+ <embed href="text/shared/02/12100100.xhp#sortorder"/>
+ <embed href="text/shared/00/00000450.xhp#sysortieren"/>
+ <embed href="text/shared/02/12010000.xhp#aufsteigend"/>
+ <embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
+ <embed href="text/shared/02/12020000.xhp#absteigend"/>
+ <embed href="text/shared/02/12020000.xhp#syabsteigend"/>
+ <embed href="text/shared/02/12030000.xhp#autofilter"/>
+ <embed href="text/shared/02/12030000.xhp#syautofilter"/>
+ <embed href="text/shared/02/12120000.xhp#filteranwenden"/>
+ <embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
+ <embed href="text/shared/02/12090000.xhp#standardfilter1"/>
+ <embed href="text/shared/02/12090000.xhp#systandardfilter"/>
+ <embed href="text/shared/02/12040000.xhp#filterentfernen"/>
+ <embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBInsertColumns" id="bm_id5734733" localize="false"/>
-<paragraph role="head2" id="par_idN10744" xml-lang="en-US" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
-<paragraph role="paragraph" id="par_idN10753" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
-<embed href="text/shared/02/12070000.xhp#sydatenintext"/>
-<embed href="text/shared/02/12080000.xhp#dateninfelder"/>
-<embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
-<paragraph role="head2" id="par_idN10780" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
-<paragraph role="paragraph" id="par_idN1078F" xml-lang="en-US" l10n="NEW">Starts the Mail Merge Wizard to create form letters.</paragraph>
-<embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
-<embed href="text/shared/02/12140000.xhp#aktdokdat"/>
-<embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
-<embed href="text/shared/02/12000000.xhp#explorer"/>
-<embed href="text/shared/02/12000000.xhp#syexplorer"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10744" role="head2" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10753" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
+ <embed href="text/shared/02/12070000.xhp#sydatenintext"/>
+ <embed href="text/shared/02/12080000.xhp#dateninfelder"/>
+ <embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id0928200901513623" localize="false"/><comment>Help ID is here because we need it in shared since the F4 browser has another context "sdatabase" so I had to move the Help ID from the swriter folder</comment>
+<paragraph xml-lang="en-US" id="par_idN10780" role="head2" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1078F" role="paragraph" l10n="NEW"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters.</ahelp></paragraph>
+ <embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
+ <embed href="text/shared/02/12140000.xhp#aktdokdat"/>
+ <embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
+ <embed href="text/shared/02/12000000.xhp#explorer"/>
+ <embed href="text/shared/02/12000000.xhp#syexplorer"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/main0213.xhp b/helpcontent2/source/text/shared/main0213.xhp
index 8118be4b76..3f2eba4aca 100644
--- a/helpcontent2/source/text/shared/main0213.xhp
+++ b/helpcontent2/source/text/shared/main0213.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0213.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0214.xhp b/helpcontent2/source/text/shared/main0214.xhp
index 0648ea65c8..c807b9b04e 100755
--- a/helpcontent2/source/text/shared/main0214.xhp
+++ b/helpcontent2/source/text/shared/main0214.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0214.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0226.xhp b/helpcontent2/source/text/shared/main0226.xhp
index ed8e51a9df..cf3361dccf 100644
--- a/helpcontent2/source/text/shared/main0226.xhp
+++ b/helpcontent2/source/text/shared/main0226.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0226.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0227.xhp b/helpcontent2/source/text/shared/main0227.xhp
index c700965d17..7eba17dc0c 100644
--- a/helpcontent2/source/text/shared/main0227.xhp
+++ b/helpcontent2/source/text/shared/main0227.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0227.xhp,v $
- * $Revision: 1.15 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -213,9 +210,7 @@
</table>
<bookmark xml-lang="en-US" branch="hid/SID_BEZIER_ELIMINATE_POINTS" id="bm_id3240924" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:BezierEliminatePoints" id="bm_id3154958" localize="false"/><paragraph role="heading" id="hd_id3156351" xml-lang="en-US" level="2" l10n="U" oldref="36">Eliminate Points</paragraph>
-<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link>
-</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link> in the Options dialog box</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link> in the Options dialog box</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
<table id="tbl_id3150892">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/main0400.xhp b/helpcontent2/source/text/shared/main0400.xhp
index b186cf9743..bfdb24711c 100755
--- a/helpcontent2/source/text/shared/main0400.xhp
+++ b/helpcontent2/source/text/shared/main0400.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0400.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0500.xhp b/helpcontent2/source/text/shared/main0500.xhp
index a9740c8180..09f4b86a92 100755..100644
--- a/helpcontent2/source/text/shared/main0500.xhp
+++ b/helpcontent2/source/text/shared/main0500.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: main0500.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,14 +32,10 @@
<title xml-lang="en-US" id="tit">Glossaries</title>
<filename>/text/shared/main0500.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="allghinweise">
<paragraph id="hd_id3156183" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/main0500.xhp" name="Glossaries">Glossaries</link></paragraph>
<paragraph role="paragraph" id="par_id3157898" l10n="U" xml-lang="en-US" oldref="2">This section provides a general glossary of technical terms used in $[officename], along with a list of Internet terms.</paragraph>
diff --git a/helpcontent2/source/text/shared/main0600.xhp b/helpcontent2/source/text/shared/main0600.xhp
index e584edb4af..eda40c2ba2 100644
--- a/helpcontent2/source/text/shared/main0600.xhp
+++ b/helpcontent2/source/text/shared/main0600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0600.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/main0650.xhp b/helpcontent2/source/text/shared/main0650.xhp
index b6c66f3997..fff1a69dbb 100644
--- a/helpcontent2/source/text/shared/main0650.xhp
+++ b/helpcontent2/source/text/shared/main0650.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: main0650.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -47,14 +44,14 @@
<paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/main0650.xhp" name="Java Platform Support">Java Platform Support</link></paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="CHG" oldref="2">$[officename] supports the Java platform for running applications and components based on the JavaBeans architecture.</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="3">For $[officename] to support the Java platform, you must install the Java 2 Runtime Environment software from Sun Microsystems. When you installed $[officename], you automatically received the option to install these files if they were not yet installed. You can also install these files now if required. The executable setup file is located in the $[officename]/program folder and on the $[officename] CD.</paragraph>
+<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="3">For $[officename] to support the Java platform, you must install the Java 2 Runtime Environment software. When you installed $[officename], you automatically received the option to install these files if they were not yet installed. You can also install these files now if required.</paragraph>
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">The Java platform support needs to be activated under $[officename] to run Java applications.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <link href="text/shared/optionen/java.xhp" name="Tools - Options - $[officename] - Java"><emph>Tools - Options - $[officename] - Java</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/java.xhp" name="$[officename] - Java">$[officename] - Java</link></emph>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose Tools - Options - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
-<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph>Tools - Options - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph>Tools - Options - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
+<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
+<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/main0800.xhp b/helpcontent2/source/text/shared/main0800.xhp
index 341df85396..88ea220e5c 100755
--- a/helpcontent2/source/text/shared/main0800.xhp
+++ b/helpcontent2/source/text/shared/main0800.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0800.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk
index 8f5dba7586..9996559021 100644
--- a/helpcontent2/source/text/shared/makefile.mk
+++ b/helpcontent2/source/text/shared/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,4 +65,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/optionen/01000000.xhp b/helpcontent2/source/text/shared/optionen/01000000.xhp
index bf1eb94c7f..4ccc1298ca 100644
--- a/helpcontent2/source/text/shared/optionen/01000000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01000000.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,59 +29,66 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/optionen/01000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-06T16:27:32">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="optionen">
+ <topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Options</title>
+ <filename>/text/shared/optionen/01000000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="optionen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153665"><bookmark_value>options; tools</bookmark_value>
-<bookmark_value>defaults; program configuration</bookmark_value>
-<bookmark_value>settings; program configuration</bookmark_value>
+ <bookmark_value>defaults; program configuration</bookmark_value>
+ <bookmark_value>settings; program configuration</bookmark_value>
</bookmark><comment>mw changed "settings;options" and "defaults;..."</comment>
<bookmark xml-lang="en-US" branch="hid/SID_OPTIONS_TREEDIALOG" id="bm_id8304653" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OptionsTreeDialog" id="bm_id3147335" localize="false"/>
-<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
-<paragraph role="note" id="par_idN10607" xml-lang="en-US" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153665" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156344" role="paragraph" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10607" role="note" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#optionen"/>
-</section>
-<paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
-<embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
-<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
-<embed href="text/shared/optionen/01020000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
-<embed href="text/shared/optionen/01150000.xhp#typotext"/>
-<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="2" l10n="U" oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
-<embed href="text/shared/optionen/01030000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
-<embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
-<paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
-<embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
-<paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
-<embed href="text/shared/optionen/01060000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="2" l10n="CHG" oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
-<embed href="text/shared/optionen/01070000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="2" l10n="CHG" oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
-<embed href="text/shared/optionen/01080000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3154732" xml-lang="en-US" level="2" l10n="CHG" oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
-<embed href="text/shared/optionen/01090000.xhp#druckentext"/>
-<paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="2" l10n="CHG" oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
-<embed href="text/shared/optionen/01110000.xhp#farbe"/>
-<paragraph role="heading" id="hd_id3149420" xml-lang="en-US" level="2" l10n="CHG" oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
-<embed href="text/shared/optionen/01160000.xhp#daten"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3125863" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#optionen"/>
+ <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note" l10n="NEW">Note for Mac OS X users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your Mac OS X main menu. Both menu entries open the Options dialog box.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3159149" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
+ <embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
+ <embed href="text/shared/optionen/01020000.xhp#laden"/>
+ <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="2" l10n="U"
+ oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
+ <embed href="text/shared/optionen/01150000.xhp#typotext"/>
+ <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="2" l10n="U"
+ oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
+ <embed href="text/shared/optionen/01030000.xhp#laden"/>
+ <paragraph xml-lang="en-US" id="hd_id3153188" role="heading" level="2" l10n="CHG"
+ oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
+ <embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
+ <paragraph xml-lang="en-US" id="hd_id3150104" role="heading" level="2" l10n="CHG"
+ oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
+ <embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
+ <paragraph xml-lang="en-US" id="hd_id3154918" role="heading" level="2" l10n="CHG"
+ oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
+ <embed href="text/shared/optionen/01060000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3153142" role="heading" level="2" l10n="CHG"
+ oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
+ <embed href="text/shared/optionen/01070000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="2" l10n="CHG"
+ oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
+ <embed href="text/shared/optionen/01080000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3154732" role="heading" level="2" l10n="CHG"
+ oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
+ <embed href="text/shared/optionen/01090000.xhp#druckentext"/>
+ <paragraph xml-lang="en-US" id="hd_id3155418" role="heading" level="2" l10n="CHG"
+ oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
+ <embed href="text/shared/optionen/01110000.xhp#farbe"/>
+ <paragraph xml-lang="en-US" id="hd_id3149420" role="heading" level="2" l10n="CHG"
+ oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
+ <embed href="text/shared/optionen/01160000.xhp#daten"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010000.xhp b/helpcontent2/source/text/shared/optionen/01010000.xhp
index 3e30f0d373..0d56186843 100755
--- a/helpcontent2/source/text/shared/optionen/01010000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010000.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,39 +29,36 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">$[officename]</title>
-<filename>/text/shared/optionen/01010000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-07T10:53:15">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/SID_GENERAL_OPTIONS" id="bm_id3147577" localize="false"/>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="1" l10n="U" oldref="1">$[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="2"><variable id="optionenallgemein"><ahelp hid="SID_GENERAL_OPTIONS">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults.</ahelp>
+ <topic id="textsharedoptionen01010000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">$[officename]</title>
+ <filename>/text/shared/optionen/01010000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<!-- removed HID SID_GENERAL_OPTIONS -->
+<paragraph xml-lang="en-US" id="hd_id3153750" role="heading" level="1" l10n="U" oldref="1">$[officename]</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="2"><variable id="optionenallgemein"><ahelp hid="SID_GENERAL_OPTIONS">Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults.</ahelp>
</variable> These settings are saved automatically.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#optionenallgemein"/>
-</section>
-<embed href="text/shared/optionen/01010100.xhp#allgemeines"/>
-<embed href="text/shared/optionen/01010600.xhp#allg"/>
-<embed href="text/shared/optionen/01011000.xhp#arbeit"/>
-<embed href="text/shared/optionen/01010800.xhp#ansicht"/>
-<embed href="text/shared/optionen/01010900.xhp#drucken"/>
-<embed href="text/shared/optionen/01010300.xhp#pfade"/>
-<embed href="text/shared/optionen/01010500.xhp#farben"/>
-<embed href="text/shared/optionen/01010700.xhp#schrifters"/>
-<embed href="text/shared/optionen/01030300.xhp#security"/>
-<embed href="text/shared/optionen/01012000.xhp#appearance"/>
-<embed href="text/shared/optionen/01013000.xhp#accessibility"/>
-<embed href="text/shared/optionen/java.xhp#java"/>
-<embed href="text/shared/optionen/online_update.xhp#online_update"/>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
-</body>
-</helpdocument>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#optionenallgemein"/>
+ </section>
+ <embed href="text/shared/optionen/01010100.xhp#allgemeines"/>
+ <embed href="text/shared/optionen/01010600.xhp#allg"/>
+ <embed href="text/shared/optionen/01011000.xhp#arbeit"/>
+ <embed href="text/shared/optionen/01010800.xhp#ansicht"/>
+ <embed href="text/shared/optionen/01010900.xhp#drucken"/>
+ <embed href="text/shared/optionen/01010300.xhp#pfade"/>
+ <embed href="text/shared/optionen/01010500.xhp#farben"/>
+ <embed href="text/shared/optionen/01010700.xhp#schrifters"/>
+ <embed href="text/shared/optionen/01030300.xhp#security"/>
+ <embed href="text/shared/optionen/01012000.xhp#appearance"/>
+ <embed href="text/shared/optionen/01013000.xhp#accessibility"/>
+ <embed href="text/shared/optionen/java.xhp#java"/>
+ <embed href="text/shared/optionen/online_update.xhp#online_update"/>
+ <embed href="text/shared/optionen/improvement.xhp#improvement"/>
+ <embed href="text/shared/00/00000001.xhp#zurueck"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010100.xhp b/helpcontent2/source/text/shared/optionen/01010100.xhp
index a21a562073..0502e05ea8 100755
--- a/helpcontent2/source/text/shared/optionen/01010100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010100.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,79 +59,79 @@
<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="3">Address</paragraph>
<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">Use the <emph>Address</emph> field to enter and edit your personal user data.</paragraph>
<section id="datenf">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_COMP" id="bm_id3149164" localize="false"/><comment>UFI removed a double ID</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_COMPANY" id="bm_id3154306" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_COMP" id="bm_id3149164" localize="false"/><comment>UFI removed a double ID</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY" id="bm_id3154306" localize="false"/>
<paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="3" l10n="U" oldref="5">Company</paragraph>
<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_COMPANY">Type the name of your company in this field.</ahelp></paragraph>
</section>
<section id="datena">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME" id="bm_id3153825" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FIRSTNAME" id="bm_id3149237" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME" id="bm_id3153825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME" id="bm_id3149237" localize="false"/>
<paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="3" l10n="U" oldref="7">First name</paragraph>
<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FIRSTNAME">Type your first name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_NAME" id="bm_id3151245" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_NAME" id="bm_id3156024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_NAME" id="bm_id3151245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME" id="bm_id3156024" localize="false"/>
<paragraph role="heading" id="hd_id3159158" xml-lang="en-US" level="3" l10n="U" oldref="32">Last name</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_NAME">Type your last name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_SHORTCUT" id="bm_id3149295" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_SHORTNAME" id="bm_id3154347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT" id="bm_id3149295" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME" id="bm_id3154347" localize="false"/>
<paragraph role="heading" id="hd_id3156344" xml-lang="en-US" level="3" l10n="U" oldref="34">Initials</paragraph>
<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_SHORTNAME">Type your initials.</ahelp></paragraph>
</section>
<section id="strplzort">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_STREET" id="bm_id3153361" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_STREET" id="bm_id3154071" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_STREET" id="bm_id3154938" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_STREET" id="bm_id3153361" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_STREET" id="bm_id3154071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET" id="bm_id3154938" localize="false"/>
<paragraph role="heading" id="hd_id3153526" xml-lang="en-US" level="3" l10n="U" oldref="9">Street</paragraph>
<paragraph role="paragraph" id="par_id3151212" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_STREET">Type the name of your street in this field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_ZIP" id="bm_id3153970" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_ZIP" id="bm_id3152935" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_PLZ" id="bm_id3151044" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SFXPAGE_GENERAL_ED_US_ZIPCODE" id="bm_id2420728" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_ZIP" id="bm_id3153970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_ZIP" id="bm_id3152935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ" id="bm_id3151044" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE" id="bm_id2420728" localize="false"/>
<paragraph role="heading" id="hd_id3154909" xml-lang="en-US" level="3" l10n="U" oldref="11">ZIP</paragraph>
<paragraph role="paragraph" id="par_id3145607" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_PLZ">Type your ZIP in this field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_CITY" id="bm_id3148453" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_CITY" id="bm_id3151178" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_CITY" id="bm_id3148920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_CITY" id="bm_id3158409" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_CITY" id="bm_id3148453" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_CITY" id="bm_id3151178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY" id="bm_id3148920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY" id="bm_id3158409" localize="false"/>
<paragraph role="heading" id="hd_id3154685" xml-lang="en-US" level="3" l10n="U" oldref="35">City</paragraph>
<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_CITY">Type the city where you live.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_COUNTRY" id="bm_id3151383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_COUNTRY" id="bm_id3149562" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_COUNTRY" id="bm_id3153768" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE" id="bm_id3155132" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY" id="bm_id3151383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY" id="bm_id3149562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY" id="bm_id3153768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE" id="bm_id3155132" localize="false"/>
<paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="3" l10n="U" oldref="37">State</paragraph>
<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE">Type your state.</ahelp></paragraph>
</section>
<section id="datenb">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_TITLE" id="bm_id3146986" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TITLE" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_TITLE" id="bm_id3146986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE" id="bm_id3152596" localize="false"/>
<paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="3" l10n="U" oldref="13">Title</paragraph>
<paragraph role="paragraph" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TITLE">Type your title in this field.</ahelp></paragraph>
</section>
<section id="dateng">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_POSITION" id="bm_id3153188" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_POSITION" id="bm_id3163712" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_POSITION" id="bm_id3153188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION" id="bm_id3163712" localize="false"/>
<paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
<paragraph role="paragraph" id="par_id3147428" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_POSITION">Type your position in the company in this field.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELPRIVAT" id="bm_id3149481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT" id="bm_id3149481" localize="false"/>
<paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="17">Tel. (Home)</paragraph>
<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELPRIVAT">Type your private telephone number in this field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELCOMPANY" id="bm_id3146974" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY" id="bm_id3146974" localize="false"/>
<paragraph role="heading" id="hd_id3151118" xml-lang="en-US" level="3" l10n="U" oldref="42">Tel. (Work)</paragraph>
<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_TELCOMPANY">Type your work number in this field.</ahelp></paragraph>
<section id="datend">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FAX" id="bm_id3154792" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_FAX" id="bm_id3154731" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FAX" id="bm_id3154098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_FAX" id="bm_id3154792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_FAX" id="bm_id3154731" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX" id="bm_id3154098" localize="false"/>
<paragraph role="heading" id="hd_id3146921" xml-lang="en-US" level="3" l10n="U" oldref="21">Fax</paragraph>
<paragraph role="paragraph" id="par_id3153159" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_FAX">Type your fax number in this field.</ahelp></paragraph>
</section>
<section id="datene">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_MAIL" id="bm_id3149379" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_BUSINESS_DATA:ED_MAIL" id="bm_id3145647" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXPAGE_GENERAL:ED_EMAIL" id="bm_id3149410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_PRIVATE_DATA:ED_MAIL" id="bm_id3149379" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_BUSINESS_DATA:ED_MAIL" id="bm_id3145647" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL" id="bm_id3149410" localize="false"/>
<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3" l10n="U" oldref="44">E-mail</paragraph>
<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:EDIT:RID_SFXPAGE_GENERAL:ED_EMAIL">Type your e-mail address.</ahelp> For example, my.name@my.provider.com</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index da5ba92584..7c8ca591d0 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -1,19 +1,14 @@
<?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: 01010200.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.20.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -34,141 +29,150 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/optionen/01010200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="speichern">
+ <topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">General</title>
+ <filename>/text/shared/optionen/01010200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="speichern">
<bookmark xml-lang="en-US" branch="index" id="bm_id3143284"><bookmark_value>saving; options</bookmark_value>
-<bookmark_value>defaults;of saving</bookmark_value>
-<bookmark_value>URL; saving absolute/relative paths</bookmark_value>
-<bookmark_value>relative saving of URLs</bookmark_value>
-<bookmark_value>absolute saving of URLs</bookmark_value>
+ <bookmark_value>defaults;of saving</bookmark_value>
+ <bookmark_value>URL; saving absolute/relative paths</bookmark_value>
+ <bookmark_value>relative saving of URLs</bookmark_value>
+ <bookmark_value>absolute saving of URLs</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_SAVE" id="bm_id3109850" localize="false"/>
-<paragraph role="head1" id="hd_id3143284" xml-lang="en-US" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#rsave"/>
-</section>
-<paragraph role="heading" id="hd_id3154824" xml-lang="en-US" level="2" l10n="U" oldref="65">Load</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS" id="bm_id3150444" localize="false"/>
-<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="66">Load user-specific settings with the document</paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS">Loads the user-specific settings saved in a document with the document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="68">If <emph>Load user-specific settings with the document </emph>is not selected, the following user-specific settings still apply:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="69">Settings available in <emph>File - Print - Options</emph>,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="70">Name of Fax,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150276" xml-lang="en-US" l10n="U" oldref="71">Spacing options for paragraphs before text tables,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148686" xml-lang="en-US" l10n="U" oldref="72">Information about automatic updating for links, field functions and charts,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="73">Information about working with Asian character formats.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="74">The following settings are <emph>always</emph> loaded with a document, whether or not this option is marked:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="76">Data source linked to the document and its view.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_CB_LOAD_DOCPRINTER" id="bm_id813156" localize="false"/>
-<paragraph role="heading" id="hd_id927152" xml-lang="en-US" level="3" l10n="NEW">Load printer settings with the document</paragraph>
-<paragraph role="paragraph" id="par_id5684987" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, the printer settings will be loaded with the document. This can cause a document to be printed on a distant printer, if you do not change the printer manually in the Print dialog. If disabled, your standard printer will be used to print this document. The current printer settings will be stored with the document whether or not this option is checked.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="2" l10n="U" oldref="3">Save</paragraph>
-<embed href="text/shared/guide/doc_autosave.xhp#doc_autosave"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO" id="bm_id3154939" localize="false"/>
-<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="5">Edit document properties before saving</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO">Specifies that the <emph>Properties</emph> dialog will appear every time you select the <emph>Save As</emph> command.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP" id="bm_id3151380" localize="false"/>
-<paragraph role="heading" id="hd_id3145606" xml-lang="en-US" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="37">To change the location of the backup copy, choose <emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph>, and then enter a new path for the backup file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
-<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Save AutoRecovery information every<comment>UFI: see http://specs.openoffice.org/appwide/recovery/Autorecovery.sxw</comment><comment>UFI: write guide "Auto backup and recovery"</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE">Specifies that <item type="productname">%PRODUCTNAME</item> saves the information needed to restore all open documents in case of a crash. You can specify the saving time interval.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE" id="bm_id3155855" localize="false"/>
-<paragraph role="heading" id="hd_id3146147" xml-lang="en-US" level="3" l10n="U" oldref="11">Minutes</paragraph>
-<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE">Specifies the time interval in minutes for the automatic recovery option.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153575" xml-lang="en-US" level="3" l10n="CHG" oldref="17">Save URLs relative to file system</paragraph>
-<paragraph role="paragraph" id="par_id3149484" xml-lang="en-US" l10n="U" oldref="18">This option allows you to select the default for <link href="text/shared/00/00000005.xhp#speichern" name="relative">relative</link> addressing of URLs in the file system and on the Internet. Relative addressing is only possible if the source document and the referenced document are both on the same drive.</paragraph>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="U" oldref="52">A relative address always starts from the directory in which the current document is located. In contrast, absolute addressing always starts from a root directory. The following table demonstrates the difference in syntax between relative and absolute referencing:</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="53">Examples</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="54">File system</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="55">Internet</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="56">relative</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="57">../images/img.jpg</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145652" xml-lang="en-US" l10n="U" oldref="58">../images/img.jpg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="59">absolute</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154361" xml-lang="en-US" l10n="U" oldref="60">file:///c|/work/images/img.jpg</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="61">http://myserver.com/work/images/img.jpg</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3143284" role="head1" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#rsave"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154824" role="heading" level="2" l10n="U"
+ oldref="65">Load</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS" id="bm_id3150444" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153311" role="heading" level="3" l10n="U"
+ oldref="66">Load user-specific settings with the document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="67"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS">Loads the user-specific settings saved in a document with the document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="68">If <emph>Load user-specific settings with the document </emph>is not selected, the following user-specific settings still apply:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155388" role="listitem" l10n="U" oldref="69">Settings available in <emph>File - Print - Options</emph>,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153348" role="listitem" l10n="U" oldref="70">Name of Fax,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150276" role="listitem" l10n="U" oldref="71">Spacing options for paragraphs before text tables,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148686" role="listitem" l10n="U" oldref="72">Information about automatic updating for links, field functions and charts,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153254" role="listitem" l10n="U" oldref="73">Information about working with Asian character formats.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3153666" role="paragraph" l10n="U" oldref="74">The following settings are <emph>always</emph> loaded with a document, whether or not this option is marked:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148946" role="listitem" l10n="U" oldref="76">Data source linked to the document and its view.</paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER" id="bm_id813156" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id927152" role="heading" level="3" l10n="NEW">Load printer settings with the document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5684987" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the printer settings will be loaded with the document. This can cause a document to be printed on a distant printer, if you do not change the printer manually in the Print dialog. If disabled, your standard printer will be used to print this document. The current printer settings will be stored with the document whether or not this option is checked.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3146794" role="heading" level="2" l10n="U" oldref="3">Save</paragraph>
+ <embed href="text/shared/guide/doc_autosave.xhp#doc_autosave"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO" id="bm_id3154939" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="3" l10n="U" oldref="5">Edit document properties before saving</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO">Specifies that the <emph>Properties</emph> dialog will appear every time you select the <emph>Save As</emph> command.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP" id="bm_id3151380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145606" role="heading" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>, and then enter a new path for the backup file.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154908" role="heading" level="3" l10n="CHG"
+ oldref="9">Save AutoRecovery information every</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149560" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE">Specifies that <item type="productname">%PRODUCTNAME</item> saves the information needed to restore all open documents in case of a crash. You can specify the saving time interval.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE" id="bm_id3155855" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146147" role="heading" level="3" l10n="U"
+ oldref="11">Minutes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE">Specifies the time interval in minutes for the automatic recovery option.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153575" role="heading" level="3" l10n="CHG"
+ oldref="17">Save URLs relative to file system</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149484" role="paragraph" l10n="U" oldref="18">This option allows you to select the default for <link href="text/shared/00/00000005.xhp#speichern" name="relative">relative</link> addressing of URLs in the file system and on the Internet. Relative addressing is only possible if the source document and the referenced document are both on the same drive.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145799" role="paragraph" l10n="U" oldref="52">A relative address always starts from the directory in which the current document is located. In contrast, absolute addressing always starts from a root directory. The following table demonstrates the difference in syntax between relative and absolute referencing:</paragraph>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149413" role="tablehead" l10n="U" oldref="53">Examples</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148455" role="tablehead" l10n="U" oldref="54">File system</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150715" role="tablehead" l10n="U" oldref="55">Internet</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155602" role="tablecontent" l10n="U" oldref="56">relative</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147176" role="tablecontent" l10n="U" oldref="57">../images/img.jpg</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145652" role="tablecontent" l10n="U" oldref="58">../images/img.jpg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155064" role="tablecontent" l10n="U" oldref="59">absolute</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154361" role="tablecontent" l10n="U" oldref="60">file:///c|/work/images/img.jpg</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148408" role="tablecontent" l10n="U" oldref="61">http://myserver.com/work/images/img.jpg</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="warning" id="par_id3145148" xml-lang="en-US" l10n="U" oldref="36">The Help tip always displays an absolute path. However, if a document is saved in HTML format, <item type="productname">%PRODUCTNAME</item> will enter a relative path if the appropriate check box is selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS" id="bm_id3151187" localize="false"/>
-<paragraph role="paragraph" id="par_id3155176" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs in the file system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET" id="bm_id3154664" localize="false"/>
-<paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Save URLs relative to internet</paragraph>
-<paragraph role="paragraph" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs to the Internet.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id2016968" xml-lang="en-US" level="2" l10n="NEW">Default file format and ODF settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SFXPAGE_SAVE_LB_ODF_VERSION" id="bm_id810266" localize="false"/>
-<paragraph role="heading" id="hd_id2659077" xml-lang="en-US" level="3" l10n="NEW">ODF format version</paragraph>
-<paragraph role="paragraph" id="par_id6944181" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 and StarOffice 9 introduce new features which have to be saved using the <link href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph>
-<paragraph role="paragraph" id="par_id886257" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 and StarOffice 9 can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
-<paragraph role="paragraph" id="par_id8892483" xml-lang="en-US" l10n="NEW">When you save a document in OpenOffice.org 3 or StarOffice 9, you can select whether to save the document in the new format ODF 1.2 or in the prior format ODF 1.0/1.1.</paragraph>
-<paragraph role="paragraph" id="par_id7198400" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 is recommended where possible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING" id="bm_id3155414" localize="false"/>
-<paragraph role="heading" id="hd_id3154920" xml-lang="en-US" level="3" l10n="CHG" oldref="77">Size optimization for ODF format</paragraph>
-<paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING">When saving the document, <item type="productname">%PRODUCTNAME</item> writes the XML data without indents and extra line breaks.</ahelp> This allows documents to be saved and opened more quickly, and the file size is smaller.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_BTN_WARNALIENFORMAT" id="bm_id6262092" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_RID_DLG_ALIEN_WARNING_CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
-<paragraph role="heading" id="par_idN1091E" xml-lang="en-US" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
-<paragraph role="paragraph" id="par_idN10922" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Tools - Options - Load/Save - General</emph>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP" id="bm_id3149207" localize="false"/>
-<paragraph role="heading" id="hd_id3153270" xml-lang="en-US" level="3" l10n="U" oldref="50">Document type</paragraph>
-<paragraph role="paragraph" id="par_id3150828" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP">Specifies the document type for which you want to define the default file format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER" id="bm_id3152775" localize="false"/>
-<paragraph role="heading" id="hd_id3149527" xml-lang="en-US" level="3" l10n="CHG" oldref="51">Always save as<comment>UFI: changed in #i46895</comment><comment>again many changes in specs.openoffice.org/appwide/odf/odf_1-2_migration.odt</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149035" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER">Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the <emph>Save as</emph> dialog.</ahelp></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3145148" role="warning" l10n="U" oldref="36">The Help tip always displays an absolute path. However, if a document is saved in HTML format, <item type="productname">%PRODUCTNAME</item> will enter a relative path if the appropriate check box is selected.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS" id="bm_id3151187" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3155176" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs in the file system.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET" id="bm_id3154664" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3" l10n="CHG"
+ oldref="21">Save URLs relative to internet</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155608" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs to the Internet.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2016968" role="heading" level="2" l10n="NEW">Default file format and ODF settings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION" id="bm_id810266" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2659077" role="heading" level="3" l10n="NEW">ODF format version</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6944181" role="paragraph" l10n="NEW">OpenOffice.org 3 and StarOffice 9 introduce new features which have to be saved using the <link href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id886257" role="paragraph" l10n="NEW">Current versions can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8892483" role="paragraph" l10n="NEW">When you save a document, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0915200911205367" role="note" l10n="NEW">Currently, the ODF 1.2 (Extended) format enables files of Draw and Impress to contain comments. Those comments can be inserted by <item type="menuitem">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7198400" role="paragraph" l10n="CHG"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING" id="bm_id3155414" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154920" role="heading" level="3" l10n="CHG"
+ oldref="77">Size optimization for ODF format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150488" role="paragraph" l10n="U" oldref="78"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING">When saving the document, <item type="productname">%PRODUCTNAME</item> writes the XML data without indents and extra line breaks.</ahelp> This allows documents to be saved and opened more quickly, and the file size is smaller.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT" id="bm_id6262092" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN1091E" role="heading" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Load/Save - General</emph> in the Options dialog box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158444" role="paragraph" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXPAGE_SAVE:LB_APP" id="bm_id3149207" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
+ oldref="50">Document type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150828" role="paragraph" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP">Specifies the document type for which you want to define the default file format.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER" id="bm_id3152775" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149527" role="heading" level="3" l10n="CHG"
+ oldref="51">Always save as</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149035" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER">Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the <emph>Save as</emph> dialog.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010300.xhp b/helpcontent2/source/text/shared/optionen/01010300.xhp
index e502a6d45b..bb29952bc0 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010300.xhp
@@ -6,14 +6,10 @@
***********************************************************************
*
* 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: 01010300.xhp,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -58,13 +54,13 @@
</section>
<bookmark xml-lang="en-US" branch="hid/HID_OPTPATH_CTL_PATH" id="bm_id3146795" localize="false"/><paragraph role="heading" id="hd_id3149810" xml-lang="en-US" level="2" l10n="CHG" oldref="13">Paths used by %PRODUCTNAME</paragraph>
<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid="HID_OPTPATH_CTL_PATH">To modify an entry in this list, click the entry and click <emph>Edit</emph>. You can also double click the entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_STANDARD" id="bm_id3154216" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="2" l10n="U" oldref="160">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD" id="bm_id3154216" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="2" l10n="U" oldref="160">Default</paragraph>
<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="161"><ahelp hid="SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_STANDARD">The<emph> Default </emph>button resets the predefined paths for all selected entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH" id="bm_id3150448" localize="false"/><paragraph role="heading" id="hd_id3147229" xml-lang="en-US" level="2" l10n="U" oldref="6">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH" id="bm_id3150448" localize="false"/><paragraph role="heading" id="hd_id3147229" xml-lang="en-US" level="2" l10n="U" oldref="6">Edit</paragraph>
<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH">Click to display the <emph>Select Path</emph> or <emph>Edit Paths</emph> dialog.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U" oldref="162">You can change the sequence of entries by clicking the bar in the <emph>Type</emph> column. The column width can be changed by moving the separator between the columns with the mouse.</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="190">In the following list of paths, the paths for the shared folders in the directory where %PRODUCTNAME is installed, are not shown. The user data for each user is stored in the {user} directory, which is located in the user's <switchinline select="sys"><caseinline select="UNIX">home
-</caseinline><defaultinline>Documents and Settings</defaultinline></switchinline> directory.</paragraph><comment>removed "mehrpfad" section. See http://specs.openoffice.org/appwide/options_settings/OOoPaths.odt</comment><comment>removed two rows from table that crept in by a resync.</comment><table id="tbl_id3145364">
+<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="190">In the following list of paths, the paths for the shared folders in the directory where %PRODUCTNAME is installed, are not shown. The user data for each user is stored in the {user} directory, which is located in the user's <switchinline select="sys"><caseinline select="UNIX">home
+</caseinline><defaultinline>Documents and Settings</defaultinline></switchinline> directory.</paragraph><table id="tbl_id3145364">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id3149260" xml-lang="en-US" l10n="CHG" oldref="14">Type</paragraph>
@@ -92,7 +88,7 @@
<paragraph role="tablecontent" id="par_id8316599" xml-lang="en-US" l10n="NEW">AutoCorrect</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3753776" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autocorr
+<paragraph role="tablecontent" id="par_id3753776" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autocorr
</caseinline><defaultinline>{user}\user\autocorr</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -104,7 +100,7 @@
<paragraph role="tablecontent" id="par_id4494766" xml-lang="en-US" l10n="NEW">AutoText</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7858516" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autotext
+<paragraph role="tablecontent" id="par_id7858516" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autotext
</caseinline><defaultinline>{user}\user\autotext</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -116,7 +112,7 @@
<paragraph role="tablecontent" id="par_id3154493" xml-lang="en-US" l10n="U" oldref="68">Gallery</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154484" xml-lang="en-US" l10n="CHG" oldref="69"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
+<paragraph role="tablecontent" id="par_id3154484" xml-lang="en-US" l10n="CHG" oldref="69"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
</caseinline><defaultinline>{user}\user\gallery</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -128,7 +124,7 @@
<paragraph role="tablecontent" id="par_id3151333" xml-lang="en-US" l10n="U" oldref="26">Graphics</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152890" xml-lang="en-US" l10n="CHG" oldref="27"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
+<paragraph role="tablecontent" id="par_id3152890" xml-lang="en-US" l10n="CHG" oldref="27"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
</caseinline><defaultinline>{user}\user\gallery</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -140,7 +136,7 @@
<paragraph role="tablecontent" id="par_id3146891" xml-lang="en-US" l10n="U" oldref="41">Backups</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154915" xml-lang="en-US" l10n="CHG" oldref="42"><switchinline select="sys"><caseinline select="UNIX">{user}/user/backup
+<paragraph role="tablecontent" id="par_id3154915" xml-lang="en-US" l10n="CHG" oldref="42"><switchinline select="sys"><caseinline select="UNIX">{user}/user/backup
</caseinline><defaultinline>{user}\user\backup</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -152,7 +148,7 @@
<paragraph role="tablecontent" id="par_id4680928" xml-lang="en-US" l10n="NEW">Templates</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9014252" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/template
+<paragraph role="tablecontent" id="par_id9014252" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/template
</caseinline><defaultinline>{user}\user\template</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -164,7 +160,7 @@
<paragraph role="tablecontent" id="par_id3154606" xml-lang="en-US" l10n="U" oldref="195">Temporary files</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149343" xml-lang="en-US" l10n="CHG" oldref="196"><switchinline select="sys"><caseinline select="UNIX">{user}/user/temp
+<paragraph role="tablecontent" id="par_id3149343" xml-lang="en-US" l10n="CHG" oldref="196"><switchinline select="sys"><caseinline select="UNIX">{user}/user/temp
</caseinline><defaultinline>{user}\user\temp</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/optionen/01010301.xhp b/helpcontent2/source/text/shared/optionen/01010301.xhp
index fbd4b27e3f..8a1cb510e0 100755
--- a/helpcontent2/source/text/shared/optionen/01010301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010301.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010301.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,10 +43,10 @@
<section id="howtoget">
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_MULTIPATH:LB_MULTIPATH">Contains a list of the paths that have already been added. Mark the default path for new files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH" id="bm_id3150768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<embed href="text/shared/00/00000001.xhp#loeschen1"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010400.xhp b/helpcontent2/source/text/shared/optionen/01010400.xhp
index e7070bb50d..fb3da1d4fd 100644
--- a/helpcontent2/source/text/shared/optionen/01010400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010400.xhp,v $
- * $Revision: 1.17.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,7 +62,7 @@
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
@@ -74,54 +71,54 @@
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
@@ -141,7 +138,7 @@
<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>
-<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/cui: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>
<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>
diff --git a/helpcontent2/source/text/shared/optionen/01010401.xhp b/helpcontent2/source/text/shared/optionen/01010401.xhp
index 9d20af7b0d..2172cf19dc 100755
--- a/helpcontent2/source/text/shared/optionen/01010401.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010401.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010401.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -74,19 +71,19 @@
<paragraph role="listitem" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="8">Only one sub-module can be activated under Hyphenation.</paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE" id="bm_id3148798" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE" id="bm_id3148798" localize="false"/>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="9">Language</paragraph>
<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE">Specifies the language of the module.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="19">For all language selection fields in <item type="productname">%PRODUCTNAME</item>, the following applies:</paragraph>
<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="20"><variable id="sprachenfeld">A language entry has a check mark in front of it if the spellcheck is activated for this language.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP" id="bm_id3154686" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP" id="bm_id3154686" localize="false"/>
<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="3" l10n="U" oldref="11">Move up</paragraph>
<paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP">Increases the priority of the module selected in the list box by one level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN" id="bm_id3159255" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN" id="bm_id3159255" localize="false"/>
<paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="13">Move down</paragraph>
<paragraph role="paragraph" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN">Decreases the priority of the module selected in the list box by one level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK" id="bm_id3153574" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK" id="bm_id3153574" localize="false"/>
<paragraph role="heading" id="hd_id3161832" xml-lang="en-US" level="3" l10n="U" oldref="15">Back</paragraph>
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK">Click here to undo the current changes in the list box.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01010500.xhp b/helpcontent2/source/text/shared/optionen/01010500.xhp
index 2370140d9a..5006d4cb30 100644
--- a/helpcontent2/source/text/shared/optionen/01010500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010500.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,14 +49,14 @@
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME" id="bm_id3156215" localize="false"/>
<paragraph role="heading" id="hd_id3150869" xml-lang="en-US" level="2" l10n="U" oldref="5">Name</paragraph>
<paragraph role="paragraph" id="par_id3149809" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:EDIT:RID_SVXPAGE_COLOR:EDT_NAME">Specifies the name of a selected color. You can also type a name in this field when defining a new color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLOR" id="bm_id3149202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR" id="bm_id3149202" localize="false"/>
<paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="2" l10n="U" oldref="7">Color</paragraph>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLOR">Contains a list of available colors. To select a color, choose one from the list.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="2" l10n="U" oldref="9">Color table</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLORMODEL" id="bm_id3153091" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL" id="bm_id3153091" localize="false"/>
<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_COLOR:LB_COLORMODEL">To modify, select the color model: Red-Green-Blue (RGB) or Cyan-Magenta-Yellow-BlacK (CMYK).</ahelp></paragraph>
<paragraph role="note" id="par_id1527756" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="40">If you select RGB, the initials of the three colors will appear and you can set the color from 0 to 255 with the spin button.</paragraph>
@@ -73,7 +70,7 @@
<paragraph role="heading" id="hd_id3153573" xml-lang="en-US" level="3" l10n="U" oldref="17">B</paragraph>
<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_TPCOLOR_RGB_3">Blue</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="41">If you select CMYK, the initials of the four colors will appear and you can set the color from 0 to 255 with the spin button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dummyid" id="bm_id2285836" localize="false"/>
+<!-- removed HID dummyid -->
<paragraph role="heading" id="hd_id3154942" xml-lang="en-US" level="3" l10n="U" oldref="42">C</paragraph>
<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_TPCOLOR_RGB_3">Cyan</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155417" xml-lang="en-US" level="3" l10n="U" oldref="44">M</paragraph>
@@ -83,21 +80,21 @@
<paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="3" l10n="U" oldref="48">K</paragraph>
<paragraph role="paragraph" id="par_id3156180" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_TPCOLOR_RGB_3">Black</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_ADD" id="bm_id3156278" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD" id="bm_id3156278" localize="false"/>
<paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="2" l10n="U" oldref="27">Add</paragraph>
<paragraph role="paragraph" id="par_id3154481" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_ADD">Adds a new color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY" id="bm_id3150324" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY" id="bm_id3150324" localize="false"/>
<paragraph role="heading" id="hd_id3153708" xml-lang="en-US" level="2" l10n="U" oldref="29">Modify</paragraph>
<paragraph role="paragraph" id="par_id3148916" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY">Changes the current color.</ahelp> Note that the color is overwritten without a confirmation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_WORK_ON" id="bm_id3153767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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"/>
<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"/>
+<bookmark xml-lang="en-US" branch="hid/cui: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>
<embed href="text/shared/00/00000004.xhp#syladen"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_SAVE" id="bm_id3166448" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE" id="bm_id3166448" localize="false"/>
<paragraph role="heading" id="hd_id3147344" xml-lang="en-US" level="2" l10n="U" oldref="36">Save Color List</paragraph>
<paragraph role="paragraph" id="par_id3163808" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_SAVE">Opens the <emph>Save As</emph> dialog, which enables you to save the current color table under a specified name.</ahelp> If you do not choose this command, the current color table will be automatically saved as default and re-loaded the next time you start $[officename].</paragraph>
<embed href="text/shared/00/00000004.xhp#sysichern"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010501.xhp b/helpcontent2/source/text/shared/optionen/01010501.xhp
index 365360a283..52d43bf041 100755
--- a/helpcontent2/source/text/shared/optionen/01010501.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010501.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010501.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,44 +69,44 @@
</list>
<paragraph role="paragraph" id="par_id3151383" xml-lang="en-US" l10n="U" oldref="10">The gradient in the left color window is immediately adjusted with respect to hue, saturation, and brightness.</paragraph>
<paragraph role="note" id="par_id9701528" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_1" id="bm_id3154126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_COLOR:BTN_1" id="bm_id3154126" localize="false"/>
<paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="2" l10n="U" oldref="11">&lt;--</paragraph>
<paragraph role="paragraph" id="par_id3154909" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_1">Click the <emph>&lt;--</emph> button to replace the selected color in the color palette with the color selected at the right. The button is enabled when you select a color in one of the four corners.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_2" id="bm_id3145608" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_COLOR:BTN_2" id="bm_id3145608" localize="false"/>
<paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="2" l10n="U" oldref="13">--&gt;</paragraph>
<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_2">Sets the small selection cursor in the right window on the color, which corresponds to the selected color in the left window and updates the respective values in the numerical fields.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_1" id="bm_id3159152" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_CYAN" id="bm_id3153367" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_CYAN" id="bm_id3153367" localize="false"/>
<paragraph role="heading" id="hd_id3149203" xml-lang="en-US" level="2" l10n="U" oldref="15">Cyan</paragraph>
<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_CYAN">Sets the Cyan color value in the CMYK color model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_2" id="bm_id3159155" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_MAGENTA" id="bm_id3150486" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_MAGENTA" id="bm_id3150486" localize="false"/>
<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="2" l10n="U" oldref="17">Magenta</paragraph>
<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_MAGENTA">Sets the Magenta color value in the CMYK color model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_TPCOLOR_CMYK_3" id="bm_id3147443" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_YELLOW" id="bm_id3152576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_YELLOW" id="bm_id3152576" localize="false"/>
<paragraph role="heading" id="hd_id3154147" xml-lang="en-US" level="2" l10n="U" oldref="19">Yellow</paragraph>
<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_YELLOW">Sets the Yellow color value in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_COLOR_MTR_FLD_4" id="bm_id3155854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_METRICFIELD_DLG_COLOR_NUM_KEY" id="bm_id3154012" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4" id="bm_id3155854" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_KEY" id="bm_id3154012" localize="false"/>
<paragraph role="heading" id="hd_id3150105" xml-lang="en-US" level="2" l10n="U" oldref="21">Key</paragraph>
<paragraph role="paragraph" id="par_id3146148" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_KEY">Sets the Black color value or key (black) in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_RED" id="bm_id3153573" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_RED" id="bm_id3153573" localize="false"/>
<paragraph role="heading" id="hd_id3151114" xml-lang="en-US" level="2" l10n="U" oldref="23">Red</paragraph>
<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_RED">Sets the Red color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_GREEN" id="bm_id3149481" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_GREEN" id="bm_id3149481" localize="false"/>
<paragraph role="heading" id="hd_id3148618" xml-lang="en-US" level="2" l10n="U" oldref="25">Green</paragraph>
<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_GREEN">Sets the Green color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_BLUE" id="bm_id3145799" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_BLUE" id="bm_id3145799" localize="false"/>
<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="2" l10n="U" oldref="27">Blue</paragraph>
<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_BLUE">Sets the Blue color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_HUE" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_HUE" id="bm_id3149581" localize="false"/>
<paragraph role="heading" id="hd_id3145647" xml-lang="en-US" level="2" l10n="U" oldref="29">Color</paragraph>
<paragraph role="paragraph" id="par_id3154729" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_HUE">Sets the Hue in the HSB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_SATURATION" id="bm_id3153415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_SATURATION" id="bm_id3153415" localize="false"/>
<paragraph role="heading" id="hd_id3144766" xml-lang="en-US" level="2" l10n="U" oldref="31">Saturation</paragraph>
<paragraph role="paragraph" id="par_id3153512" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_SATURATION">Sets the Saturation in the HSB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_LUMINANCE" id="bm_id3146990" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_LUMINANCE" id="bm_id3146990" localize="false"/>
<paragraph role="heading" id="hd_id3156180" xml-lang="en-US" level="2" l10n="U" oldref="33">Luminance</paragraph>
<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_LUMINANCE">Sets the Brightness in the HSB color model.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
diff --git a/helpcontent2/source/text/shared/optionen/01010600.xhp b/helpcontent2/source/text/shared/optionen/01010600.xhp
index c6c194c0bc..c3c4d0f364 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010600.xhp
@@ -1,17 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
+<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01010600.xhp,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,78 +29,83 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/optionen/01010600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:49:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">General</title>
+ <filename>/text/shared/optionen/01010600.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155450"><bookmark_value>opening; dialog settings</bookmark_value>
-<bookmark_value>saving; dialog settings</bookmark_value>
-<bookmark_value>Open/Save dialogs</bookmark_value>
-<bookmark_value>years; 2-digit options</bookmark_value>
-<bookmark_value>Help Agent;options</bookmark_value>
-<bookmark_value>Help;style sheets</bookmark_value>
-</bookmark><comment>mw changed "StarOffice Open/Save dialogs" to "Open/Save dialogs"</comment>
-<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E" oldref="42" localize="false"/>
-<section id="allg">
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#allg"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE" id="bm_id3151385" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MISC_NF_YEARVALUE" id="bm_id6075624" localize="false"/>
-<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
-<section id="jahreszahlen">
-<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="2" l10n="CHG" oldref="25">Help</paragraph>
-<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP" id="bm_id3539841" localize="false"/>
-<paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="3" l10n="NEW">Tips</paragraph>
-<paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, notes and chapter names, when you scroll through a document with chapters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_EXTHELP" id="bm_id1425519" localize="false"/>
-<paragraph role="heading" id="par_idN106F6" xml-lang="en-US" level="3" l10n="NEW">Extended tips</paragraph>
-<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_HELPAGENT" id="bm_id1998657" localize="false"/>
-<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="CHG" oldref="26">Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id3154684" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id7073885" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="30">Reset Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="2" l10n="U" oldref="43">$[officename] Help formatting</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET" id="bm_id3150488" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_MISC_LB_HELPFORMAT" id="bm_id6819971" localize="false"/>
-<paragraph role="heading" id="hd_id3150011" xml-lang="en-US" level="3" l10n="U" oldref="44">Style sheet</paragraph>
-<paragraph role="paragraph" id="par_id3153366" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152577" xml-lang="en-US" level="2" l10n="CHG" oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG" id="bm_id3147348" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_FILEDLG" id="bm_id7715994" localize="false"/>
-<paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Use $[officename] dialogs</paragraph>
-<paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
+ <bookmark_value>saving; dialog settings</bookmark_value>
+ <bookmark_value>years; 2-digit options</bookmark_value>
+ <bookmark_value>Help Agent;options</bookmark_value>
+ <bookmark_value>Help;style sheets</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E" oldref="42"
+ localize="false"/>
+ <section id="allg">
+ <paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150085" role="paragraph" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#allg"/>
+ </section>
+<!-- removed HID OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MISC:NF_YEARVALUE" id="bm_id6075624" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153561" role="heading" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
+ <section id="jahreszahlen">
+ <paragraph xml-lang="en-US" id="par_id3156343" role="paragraph" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3148664" role="heading" level="2" l10n="CHG"
+ oldref="25">Help</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153525" role="paragraph" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP" id="bm_id3539841" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN106DB" role="heading" level="3" l10n="NEW">Tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="paragraph" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_EXTHELP" id="bm_id1425519" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3" l10n="NEW">Extended tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT" id="bm_id1998657" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154138" role="heading" level="3" l10n="CHG"
+ oldref="26">Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145174" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
+<!-- removed HID OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET" id="bm_id7073885" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="CHG"
+ oldref="30">Reset Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159252" role="heading" level="2" l10n="U"
+ oldref="43">$[officename] Help formatting</paragraph>
+<!-- removed HID OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT" id="bm_id6819971" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150011" role="heading" level="3" l10n="U"
+ oldref="44">Style sheet</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153366" role="paragraph" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2" l10n="CHG"
+ oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_FILEDLG" id="bm_id7715994" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145366" role="heading" level="3" l10n="CHG"
+ oldref="35">Use $[officename] dialogs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
<switch select="sys">
<case select="WIN">
-<paragraph role="warning" id="par_idN10856" 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>
+<paragraph xml-lang="en-US" id="par_idN10856" role="warning" 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="paragraph" id="par_id3153138" xml-lang="en-US" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
-<paragraph role="heading" id="hd_id3148617" xml-lang="en-US" level="2" l10n="U" oldref="39">Document status</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3147126" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3986632" localize="false"/>
-<paragraph role="heading" id="hd_id3149299" xml-lang="en-US" level="3" l10n="U" oldref="40">Printing sets "document modified" status</paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3153138" role="paragraph" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148617" role="heading" level="2" l10n="U"
+ oldref="39">Document status</paragraph>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS" id="bm_id3986632" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3" l10n="U"
+ oldref="40">Printing sets "document modified" status</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010700.xhp b/helpcontent2/source/text/shared/optionen/01010700.xhp
index 21d1716ef6..e972a9aa23 100644
--- a/helpcontent2/source/text/shared/optionen/01010700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010700.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010700.xhp,v $
- *
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,8 +53,8 @@
<embed href="text/shared/00/00000406.xhp#schriers"/>
</section>
<paragraph role="note" id="par_id3145610" xml-lang="en-US" l10n="U" oldref="25">Font replacement also affects the display of fonts on the $[officename] user interface.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE" id="bm_id3154346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_USETABLE" id="bm_id1615039" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE" id="bm_id1615039" localize="false"/>
<paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="2" l10n="U" oldref="3">Apply replacement table</paragraph>
<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE">Enables the font replacement settings that you define.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OFA_FONT_SUBST_CLB" id="bm_id3150360" localize="false"/>
@@ -122,12 +118,12 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1" id="bm_id3154684" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT1" id="bm_id8428907" localize="false"/>
+<!-- removed HID OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1 -->
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1" id="bm_id8428907" localize="false"/>
<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="2" l10n="U" oldref="9">Font</paragraph>
<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1">Enter or select the name of the font that you want to replace.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2" id="bm_id3155133" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVX_FONT_SUBSTITUTION_CB_FONT2" id="bm_id1337321" localize="false"/>
+<!-- removed HID OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2 -->
+<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2" id="bm_id1337321" localize="false"/>
<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="2" l10n="U" oldref="10">Replace with</paragraph>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2">Enter or select the name of the replacement font.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OFA_SUBST_APPLY" id="bm_id3150010" localize="false"/>
@@ -164,16 +160,16 @@
<paragraph role="heading" id="hd_id3150715" xml-lang="en-US" level="2" l10n="U" oldref="52">Font settings for HTML and Basic sources</paragraph>
<paragraph role="paragraph" id="par_id3153950" xml-lang="en-US" l10n="U" oldref="53">Select the font and font size for the display of HTML and Basic source code.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME" id="bm_id3154270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME" id="bm_id4237800" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME" id="bm_id4237800" localize="false"/>
<paragraph role="heading" id="hd_id3153838" xml-lang="en-US" level="3" l10n="U" oldref="54">Fonts</paragraph>
<paragraph role="paragraph" id="par_id3146990" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME">Select the font for the display of HTML and Basic source code.</ahelp> Select <emph>Automatic</emph> to detect a suitable font automatically.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP" id="bm_id3150749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP" id="bm_id1382183" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP" id="bm_id1382183" localize="false"/>
<paragraph role="heading" id="hd_id3146791" xml-lang="en-US" level="3" l10n="U" oldref="56">Non-proportional fonts only</paragraph>
<paragraph role="paragraph" id="par_id3154362" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP">Check to display only non-proportional fonts in the <emph>Fonts</emph> list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT" id="bm_id3149018" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT" id="bm_id6423841" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT" id="bm_id6423841" localize="false"/>
<paragraph role="heading" id="hd_id3153765" xml-lang="en-US" level="3" l10n="U" oldref="58">Size</paragraph>
<paragraph role="paragraph" id="par_id3150323" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT">Select a font size for the display of HTML and Basic source code.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index 7b18072d5d..6728fcb870 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -1,44 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
- ***********************************************************************
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: soffice2xmlhelp.xsl,v $fileonly,v $
+***********************************************************************
*
- * $Revision: 1.5 $
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * last change: $Author: fpe $ $Date: 2008/04/29 13:17:18 $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * The Contents of this file are made available subject to
- * the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org - a multi-platform office productivity suite
*
+ * This file is part of OpenOffice.org.
*
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2005 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ * 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.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, 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).
*
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * 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="textsharedoptionen01010800xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">View</title>
@@ -67,67 +59,78 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#ansicht"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:METRICFIELD:OFA_TP_VIEW:MF_SCALING" id="bm_id3154908" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE" id="bm_id7275002" localize="false"/>
+<!-- removed HID OFFMGR:METRICFIELD:OFA_TP_VIEW:MF_SCALING -->
+<bookmark xml-lang="en-US" branch="hid/cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE" id="bm_id7275002" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145171" role="heading" level="3" l10n="CHG"
oldref="45">Scaling</paragraph>
<paragraph xml-lang="en-US" id="par_id3158407" role="paragraph" l10n="U" oldref="46"><ahelp hid="OFFMGR:METRICFIELD:OFA_TP_VIEW:MF_SCALING">Uses percentile scaling for font size in user interface elements, such as dialogs and icon labels.</ahelp></paragraph><comment>UFI: see OOo only feature "Icon theme switching"</comment>
<paragraph xml-lang="en-US" id="par_id3159154" role="note" l10n="CHG" oldref="67">The <emph>Scaling</emph> setting does not affect the font size of text in a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG" id="bm_id3154272" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_ICONSIZE" id="bm_id6505935" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE" id="bm_id6505935" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_OFA_TP_VIEW_LB_ICONSIZE" id="bm_id0525200903212046" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149123" role="heading" level="3" l10n="CHG"
oldref="112">Icon size and style</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="113"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG">Specifies the display size of toolbar icons.</ahelp><switchinline select="sys"><caseinline select="WIN">The <emph>Automatic</emph> option uses the font size settings of your operating system for menus.
+ <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="113"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG">Specifies the display size of toolbar icons.</ahelp><switchinline select="sys"><caseinline select="WIN">The <emph>Automatic</emph> option uses the font size settings of your operating system for menus.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE" id="bm_id5482039" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE" id="bm_id5482039" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_OFA_TP_VIEW_LB_ICONSTYLE" id="bm_id0525200903230259" localize="false"/>
<paragraph xml-lang="en-US" id="par_id4664754" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the icon style for icons in toolbars and dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT" id="bm_id8840601" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT" id="bm_id8840601" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_OFA_TP_VIEW_CB_SYSTEM_FONT" id="bm_id0525200903233636" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10738" role="heading" level="3" l10n="NEW">Use system font for user interface</paragraph>
<paragraph xml-lang="en-US" id="par_idN1073C" role="paragraph" l10n="CHG"><ahelp hid="svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT">Specifies to use the system font to display all menus and dialogs. Else another installed font is used.</ahelp></paragraph>
<switch select="sys">
<case select="UNIX">
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_FONTANTIALIASING" id="bm_id1062654" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING" id="bm_id1062654" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3400982" role="heading" level="3" l10n="NEW">Screen font antialiasing</paragraph>
<paragraph xml-lang="en-US" id="par_id6649372" role="paragraph" l10n="NEW"><ahelp hid=".">Select to smooth the screen appearance of text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT" id="bm_id9525742" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT" id="bm_id9525742" localize="false"/>
<paragraph xml-lang="en-US" id="par_id4743797" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the smallest font size to apply antialiasing.</ahelp></paragraph>
</case>
</switch>
<paragraph xml-lang="en-US" id="par_idN107A3" role="heading" level="2" l10n="NEW">Menu</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS" id="bm_id3150324" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_MENU_ICONS" id="bm_id3152562" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3156056" role="heading" level="3" l10n="U"
- oldref="91">Show icons in menus</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="U" oldref="92"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS">Displays icons next to the corresponding menu items.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_SHOW" id="bm_id3154942" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_FONT_SHOW" id="bm_id7441328" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS -->
+<!-- removed HID svx_CheckBox_OFA_TP_VIEW_CB_MENU_ICONS -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS" id="bm_id052520090333263" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156056" role="heading" level="3" l10n="CHG"
+ oldref="91">Icons in menus</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="CHG" oldref="92"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_VIEW_CB_MENU_ICONS">Displays icons next to the corresponding menu items. Select from "Automatic", "Hide" and "Show". "Automatic" displays icons according to system settings and themes.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_SHOW -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW" id="bm_id7441328" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149262" role="heading" level="3" l10n="CHG"
oldref="63">Show preview of fonts</paragraph>
<paragraph xml-lang="en-US" id="par_id3155415" role="paragraph" l10n="CHG" oldref="64"><ahelp hid="OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_SHOW">Displays the names of selectable fonts in the corresponding font, for example, fonts in the Font box on the <emph>Formatting</emph> bar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_HISTORY" id="bm_id3154511" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_FONT_HISTORY" id="bm_id9274880" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_HISTORY -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY" id="bm_id9274880" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151319" role="heading" level="3" l10n="CHG"
oldref="68">Show font history</paragraph>
<paragraph xml-lang="en-US" id="par_id3153513" role="paragraph" l10n="CHG" oldref="69"><ahelp hid="OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_HISTORY">Lists the last five fonts that you used in the current document at the top of the list in the <emph>Font Name</emph> box on the <emph>Formatting</emph> bar.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:RestoreEditingView" id="bm_id555742" localize="false"/><comment>UFI: i53104. This is still in Customize dialog</comment>
-<paragraph xml-lang="en-US" id="par_idN10962" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to restore the last used document view. Many view properties valid when the document was last saved will be restored.</ahelp></paragraph><comment>removed "Open windows" control, see http://specs.openoffice.org/appwide/options_settings/HardwareAcceleration.odt</comment>
+<paragraph xml-lang="en-US" id="par_idN10962" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to restore the last used document view. Many view properties valid when the document was last saved will be restored.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN10AC8" role="heading" level="2" l10n="NEW">Graphics output</paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_REFRESH_VIEW" id="bm_id6835216" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:RefreshView" id="bm_id9305703" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10A1D" role="tip" l10n="NEW"><ahelp hid="20201">Press Shift+Ctrl+R to restore or refresh the view of the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL" id="bm_id4084902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL" id="bm_id4084902" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10AD4" role="heading" level="3" l10n="NEW">Use hardware acceleration</paragraph>
<paragraph xml-lang="en-US" id="par_idN10AD8" role="paragraph" l10n="NEW"><ahelp hid=".">Directly accesses hardware features of the graphical display adapter to improve the screen display.</ahelp> The support for hardware acceleration is not available for all operating systems and platform distributions of %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/810517573" id="bm_id1208200812001940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE" id="bm_id1019200910503048" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1208200812004470" role="heading" level="3" l10n="NEW">Use Anti-Aliasing</paragraph>
<paragraph xml-lang="en-US" id="par_id1208200812004444" role="paragraph" l10n="NEW"><ahelp hid=".">When supported, you can enable and disable anti-aliasing of graphics. With anti-aliasing enabled, the display of most graphical objects looks smoother and with less artifacts.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS" id="bm_id3147167" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS" id="bm_id6703085" localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id101920091058114" role="heading" level="2" l10n="NEW">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_SELECTION" id="bm_id1019200910494637" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581166" role="heading" level="3" l10n="NEW">Transparency</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200910581186" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the text selection in Writer and the cell selection in Calc will be shown using a transparent color. If not enabled, the selection will be shown by inverted colors.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:OFA_TP_VIEW:MF_SELECTION" id="bm_id101920091057065" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581266" role="heading" level="3" l10n="NEW">Transparency level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200910581220" role="paragraph" l10n="NEW"><ahelp hid=".">Select the transparency level for transparent selections. The default value is 75%. You can select values from 10% to 90%.</ahelp></paragraph>
+<!-- removed HID OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS" id="bm_id6703085" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3166432" role="heading" level="2" l10n="U"
oldref="47">Mouse positioning</paragraph>
<paragraph xml-lang="en-US" id="par_id3155530" role="paragraph" l10n="U" oldref="48"><ahelp hid="OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS">Specifies if and how the mouse pointer will be positioned in newly opened dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_VIEW_LB_MOUSEMIDDLE" id="bm_id3146111" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE" id="bm_id5366069" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_OFA_TP_VIEW_LB_MOUSEMIDDLE -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE" id="bm_id5366069" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146982" role="heading" level="2" l10n="U"
oldref="93">Middle mouse button</paragraph>
<paragraph xml-lang="en-US" id="par_id3150521" role="paragraph" l10n="U" oldref="94"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_MOUSEMIDDLE">Defines the function of the middle mouse button.</ahelp></paragraph>
@@ -186,8 +189,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3159206" role="tablecontent" l10n="U" oldref="108">
- <emph>Pasting into another </emph>
- <emph>document</emph>
+ <emph>Pasting into another document</emph>
</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/optionen/01010900.xhp b/helpcontent2/source/text/shared/optionen/01010900.xhp
index d1ce83d279..7c6458c877 100644
--- a/helpcontent2/source/text/shared/optionen/01010900.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010900.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010900.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,44 +56,44 @@
<embed href="text/shared/guide/print_faster.xhp#print_faster"/>
<paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="2" l10n="U" oldref="56">Reduce print data</paragraph>
<paragraph role="paragraph" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="68">You can reduce the amount of data to be sent to the printer. Reducing the print data increases the print speed because the print files are smaller. This makes it easier for printers with a smaller memory to print. Reducing print data can result in slightly lower print quality.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_PRINTEROUTPUT" id="bm_id3149807" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_PRINTFILEOUTPUT" id="bm_id3150868" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="57">Settings for</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT" id="bm_id3149807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT" id="bm_id3150868" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="57">Settings for</paragraph>
<paragraph role="paragraph" id="par_id3158407" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_PRINTFILEOUTPUT">Specifies whether the print settings apply to direct printing or to printing to a file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCETRANSPARENCY" id="bm_id3150441" localize="false"/><paragraph role="heading" id="hd_id3145786" xml-lang="en-US" level="3" l10n="U" oldref="58">Reduce transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY" id="bm_id3150441" localize="false"/><paragraph role="heading" id="hd_id3145786" xml-lang="en-US" level="3" l10n="U" oldref="58">Reduce transparency</paragraph>
<paragraph role="paragraph" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCETRANSPARENCY">If you mark this field the transparent objects will be printed like normal, non-transparent objects, depending on your selection in the following two option buttons.</ahelp></paragraph>
<section id="transhint">
<paragraph role="note" id="par_id3156444" xml-lang="en-US" l10n="U" oldref="71">Transparency cannot be output directly to a printer. The areas of the document in which transparency is to be visible must therefore always be calculated as bitmaps and sent to the printer. Depending on the size of the bitmaps and the print resolution a large amount of data may result.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_AUTO" id="bm_id3148577" localize="false"/><paragraph role="heading" id="hd_id3147441" xml-lang="en-US" level="4" l10n="U" oldref="59">Automatically</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO" id="bm_id3148577" localize="false"/><paragraph role="heading" id="hd_id3147441" xml-lang="en-US" level="4" l10n="U" oldref="59">Automatically</paragraph>
<paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_AUTO">Specifies that the transparency is only printed if the transparent area covers less than a quarter of the entire page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_NONE" id="bm_id3145251" localize="false"/><paragraph role="heading" id="hd_id3149417" xml-lang="en-US" level="4" l10n="U" oldref="73">No transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE" id="bm_id3145251" localize="false"/><paragraph role="heading" id="hd_id3149417" xml-lang="en-US" level="4" l10n="U" oldref="73">No transparency</paragraph>
<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_NONE">With this option transparency is never printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS" id="bm_id3150113" localize="false"/><paragraph role="heading" id="hd_id3149960" xml-lang="en-US" level="3" l10n="U" oldref="60">Reduce bitmaps</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS" id="bm_id3150113" localize="false"/><paragraph role="heading" id="hd_id3149960" xml-lang="en-US" level="3" l10n="U" oldref="60">Reduce bitmaps</paragraph>
<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS">Specifies that bitmaps are printed with reduced quality. The resolution can only be reduced and not increased.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_OPTIMAL" id="bm_id3156181" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_NORMAL" id="bm_id3155600" localize="false"/><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="61">High/normal print quality</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL" id="bm_id3156181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL" id="bm_id3155600" localize="false"/><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="61">High/normal print quality</paragraph>
<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="76"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_NORMAL">High print quality corresponds to a resolution of 300dpi. Normal print quality corresponds to a resolution of 200dpi. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_RESOLUTION" id="bm_id3146900" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_LISTBOX_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION" id="bm_id3156332" localize="false"/><paragraph role="heading" id="hd_id3146969" xml-lang="en-US" level="4" l10n="U" oldref="62">Resolution</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION" id="bm_id3146900" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION" id="bm_id3156332" localize="false"/><paragraph role="heading" id="hd_id3146969" xml-lang="en-US" level="4" l10n="U" oldref="62">Resolution</paragraph>
<paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="SFX2_LISTBOX_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION">Specifies the maximum print quality in dpi. The resolution can only be reduced and not increased.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS_TRANSPARENCY" id="bm_id3146913" localize="false"/><paragraph role="heading" id="hd_id3146789" xml-lang="en-US" level="4" l10n="U" oldref="63">Include transparent objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY" id="bm_id3146913" localize="false"/><paragraph role="heading" id="hd_id3146789" xml-lang="en-US" level="4" l10n="U" oldref="63">Include transparent objects</paragraph>
<paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS_TRANSPARENCY">If this field is marked, the reduction in print quality for bitmaps also applies to the transparent areas of objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEGRADIENTS" id="bm_id3155444" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="3" l10n="U" oldref="64">Reduce gradients</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS" id="bm_id3155444" localize="false"/><paragraph role="heading" id="hd_id3154362" xml-lang="en-US" level="3" l10n="U" oldref="64">Reduce gradients</paragraph>
<paragraph role="paragraph" id="par_id3148914" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_REDUCEGRADIENTS">If this field is marked, gradients are printed with reduced quality.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_STRIPES" id="bm_id3147338" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_NUMERICFIELD_TP_COMMONPRINTOPTIONS_NF_REDUCEGRADIENTS_STEPCOUNT" id="bm_id3150387" localize="false"/><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="4" l10n="U" oldref="65">Gradient stripes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES" id="bm_id3147338" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT" id="bm_id3150387" localize="false"/><paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="4" l10n="U" oldref="65">Gradient stripes</paragraph>
<paragraph role="paragraph" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="80"><ahelp hid="SFX2_NUMERICFIELD_TP_COMMONPRINTOPTIONS_NF_REDUCEGRADIENTS_STEPCOUNT">Specifies the maximum number of gradient stripes for printing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_COLOR" id="bm_id3149259" localize="false"/><paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="4" l10n="U" oldref="66">Intermediate color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR" id="bm_id3149259" localize="false"/><paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="4" l10n="U" oldref="66">Intermediate color</paragraph>
<paragraph role="paragraph" id="par_id3145230" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid="SFX2_RADIOBUTTON_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_COLOR">Specifies that gradients are only printed in a single intermediate color.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES" id="bm_id3149565" localize="false"/><paragraph role="heading" id="hd_id3147323" xml-lang="en-US" level="3" l10n="U" oldref="67">Convert colors to grayscale</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES" id="bm_id3149565" localize="false"/><paragraph role="heading" id="hd_id3147323" xml-lang="en-US" level="3" l10n="U" oldref="67">Convert colors to grayscale</paragraph>
<paragraph role="paragraph" id="par_id3145150" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES">Specifies that all colors are printed only as grayscale.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150646" xml-lang="en-US" level="2" l10n="U" oldref="50">Printer warnings</paragraph>
<paragraph role="paragraph" id="par_id3154022" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES">Defines which warnings appear before printing begins.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERSIZE" id="bm_id3154665" localize="false"/><paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="3" l10n="U" oldref="52">Paper size</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE" id="bm_id3154665" localize="false"/><paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="3" l10n="U" oldref="52">Paper size</paragraph>
<paragraph role="paragraph" id="par_id3150206" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERSIZE">Mark this check box if a certain paper size is needed for printing the current document.</ahelp> If the paper size used in the document is not provided by the current printer, you will receive an error message.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERORIENTATION" id="bm_id3158213" localize="false"/><paragraph role="heading" id="hd_id3155581" xml-lang="en-US" level="3" l10n="U" oldref="54">Paper orientation</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION" id="bm_id3158213" localize="false"/><paragraph role="heading" id="hd_id3155581" xml-lang="en-US" level="3" l10n="U" oldref="54">Paper orientation</paragraph>
<paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_PAPERORIENTATION">Mark this check box if you need a certain paper orientation for printing the current document.</ahelp> If the format used by the current document is not available from the printer, an error message will appear.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_TRANSPARENCY" id="bm_id3153784" localize="false"/><paragraph role="heading" id="hd_id3149531" xml-lang="en-US" level="3" l10n="U" oldref="83">Transparency</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY" id="bm_id3153784" localize="false"/><paragraph role="heading" id="hd_id3149531" xml-lang="en-US" level="3" l10n="U" oldref="83">Transparency</paragraph>
<paragraph role="paragraph" id="par_id3152778" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SFX2_CHECKBOX_TP_COMMONPRINTOPTIONS_CB_TRANSPARENCY">Mark this check box if you always want to be warned if transparent objects are contained in the document.</ahelp> If you print such a document, a dialog appears in which you can select if the transparency is to be printed in this print instruction.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01011000.xhp b/helpcontent2/source/text/shared/optionen/01011000.xhp
index a0d18d6e4e..f9d0665c4c 100755
--- a/helpcontent2/source/text/shared/optionen/01011000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01011000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01011000.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,27 +53,27 @@
</section>
<paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="2" l10n="U" oldref="1">Undo</paragraph>
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="2">Defines the maximum number of reverse steps allowed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO" id="bm_id3149234" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_ED_UNDO" id="bm_id2490005" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="3" l10n="U" oldref="3">Number of steps</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:ED_UNDO" id="bm_id2490005" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="3" l10n="U" oldref="3">Number of steps</paragraph>
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO">You can specify the number of steps which can be undone by selecting a number from the list.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2" l10n="U" oldref="10">Graphics cache</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="11">The graphics cache saves the graphics contained in a document in your computer's main memory. This means that the attributes of a graphic stored in the cache do not have to be re-calculated if you return to the page containing the graphic after scrolling through a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE" id="bm_id3148663" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICCACHE" id="bm_id8346201" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="12">Use for $[officename] (MB)</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE" id="bm_id8346201" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="12">Use for $[officename] (MB)</paragraph>
<paragraph role="paragraph" id="par_id3152813" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE">Specifies the total cache size for all graphics.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE" id="bm_id3151211" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE" id="bm_id3981749" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="U" oldref="14">Memory per object (MB)</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE" id="bm_id3981749" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="U" oldref="14">Memory per object (MB)</paragraph>
<paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE">Specifies that objects which are larger than the selected megabytes will not be placed in the cache.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_TimeField_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME" id="bm_id1587878" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="16">Remove from memory after (hh:mm)</paragraph>
+<!-- removed HID OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME -->
+<bookmark xml-lang="en-US" branch="hid/cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME" id="bm_id1587878" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="16">Remove from memory after (hh:mm)</paragraph>
<paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME">Specifies the time that each graphic remains in the cache in hours and minutes.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156212" xml-lang="en-US" level="2" l10n="U" oldref="18">Cache for inserted objects</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE" id="bm_id3158407" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_NF_OLECACHE" id="bm_id5088045" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="19">Number of objects</paragraph>
+<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE" id="bm_id5088045" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="19">Number of objects</paragraph>
<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE">Choose the maximum number of OLE objects that are pooled in the cache.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="CHG" oldref="21">$[officename] Quickstarter</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH" id="bm_id3153370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MEMORY_CB_QUICKLAUNCH" id="bm_id4756004" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="CHG" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH" id="bm_id4756004" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="CHG" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up
</caseinline><defaultinline>Enable systray Quickstarter</defaultinline></switchinline><comment>UFI: new text seen in m187, see CWS gtkquickstart</comment></paragraph>
<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH">Mark this check box if you want $[officename] to enable quickstart. This option is available if the Quickstart module has been installed.</ahelp><comment>UFI: had to remove explanation because on Windows it is at start-up, while on Unix it is a user-systray feature only. Cannot have switches inside AHID text.</comment></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01012000.xhp b/helpcontent2/source/text/shared/optionen/01012000.xhp
index 428c3069d9..96df387895 100644
--- a/helpcontent2/source/text/shared/optionen/01012000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01012000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01012000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="3">Color scheme</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="4">Save and delete color schemes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEME" id="bm_id3154898" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME" id="bm_id3154898" localize="false"/>
<paragraph role="heading" id="hd_id3153252" xml-lang="en-US" level="3" l10n="U" oldref="5">Scheme</paragraph>
<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEME">Selects the color scheme you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_SAVESCHEME" id="bm_id3153088" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME" id="bm_id3153088" localize="false"/>
<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="3" l10n="U" oldref="7">Save</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_SAVESCHEME">Saves the current settings as a color scheme that you can reload later.</ahelp> The name is added to the <emph>Scheme</emph> box.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_COLORCONFIG_NAME_SCHEME" id="bm_id3148552" localize="false"/>
<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="9">Name of color scheme</paragraph>
<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_OPTIONS_COLORCONFIG_NAME_SCHEME">Enter a name for the color scheme.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_DELETESCHEME" id="bm_id3154071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME" id="bm_id3154071" localize="false"/>
<paragraph role="heading" id="hd_id3152811" xml-lang="en-US" level="3" l10n="U" oldref="11">Delete</paragraph>
<paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_DELETESCHEME">Deletes the color scheme shown in the <emph>Scheme</emph> box. You cannot delete the Default scheme.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_COLORCONFIG_COLORLIST_WIN" id="bm_id3151380" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01013000.xhp b/helpcontent2/source/text/shared/optionen/01013000.xhp
index 6fc08e90e9..56a2539d91 100755
--- a/helpcontent2/source/text/shared/optionen/01013000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01013000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01013000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,30 +58,30 @@
<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
<paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="2" l10n="U" oldref="9">Miscellaneous options</paragraph>
<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="10">Sets accessibility options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL" id="bm_id3153881" localize="false"/><paragraph role="heading" id="hd_id3154750" xml-lang="en-US" level="3" l10n="U" oldref="23"><switchinline select="sys"><caseinline select="UNIX">
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL" id="bm_id3153881" localize="false"/><paragraph role="heading" id="hd_id3154750" xml-lang="en-US" level="3" l10n="U" oldref="23"><switchinline select="sys"><caseinline select="UNIX">
</caseinline><defaultinline>Support assistive technology tools (program restart required)</defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="UNIX">
</caseinline><defaultinline><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL">Allows you to use assistive tools, such as external screen readers, Braille devices or speech recognition input devices. The Java Runtime Environment must be installed on your computer before you can enable assistive support.</ahelp></defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TEXTSELECTION" id="bm_id3155342" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="27">Use text selection cursor in read-only text document</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION" id="bm_id3155342" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="27">Use text selection cursor in read-only text document</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TEXTSELECTION">Displays cursor in read-only documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT" id="bm_id3149416" localize="false"/><paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="21">Use system font for user interface</paragraph>
+<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT --><paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="21">Use system font for user interface</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT">Displays fonts in menus, dialogs, and other user interface elements using the system font settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS" id="bm_id3153627" localize="false"/><paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="3" l10n="U" oldref="15">Allow animated graphics</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS" id="bm_id3153627" localize="false"/><paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="3" l10n="U" oldref="15">Allow animated graphics</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS">Previews animated graphics, such as GIF images, in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_TEXTS" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="17">Allow animated text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="17">Allow animated text</paragraph>
<paragraph role="paragraph" id="par_id3149656" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_TEXTS">Previews animated text, such as blinking and scrolling, in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TIPHELP" id="bm_id3151211" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="11">Help tips disappear after</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP" id="bm_id3151211" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="11">Help tips disappear after</paragraph>
<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TIPHELP">Hides the <link href="text/shared/main0108.xhp" name="Help tips">Help tips</link> after the number of seconds that you enter.</ahelp> Otherwise, Help tips are displayed until you press Escape or move the cursor.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_ACCESSIBILITYCONFIG_NF_TIPHELP" id="bm_id3147230" localize="false"/><paragraph role="heading" id="hd_id3151043" xml-lang="en-US" level="3" l10n="U" oldref="13">Seconds</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP" id="bm_id3147230" localize="false"/><paragraph role="heading" id="hd_id3151043" xml-lang="en-US" level="3" l10n="U" oldref="13">Seconds</paragraph>
<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ACCESSIBILITYCONFIG_NF_TIPHELP">Enter the number of seconds to display the Help tips.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="2" l10n="U" oldref="3">Options for high contrast appearance</paragraph>
<paragraph role="paragraph" id="par_id3153106" xml-lang="en-US" l10n="U" oldref="4">High contrast is an operating system setting that changes the system color scheme to improve readability. You can decide how <item type="productname">%PRODUCTNAME</item> uses the high contrast settings of the operating system.</paragraph>
<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="31">Cell borders and shadows are always shown in text color when high contrast mode is active. The cell background color is ignored then.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTO_DETECT_HC" id="bm_id3159254" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="29">Automatically detect high contrast mode of operating system</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC" id="bm_id3159254" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="29">Automatically detect high contrast mode of operating system</paragraph>
<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTO_DETECT_HC">Switches <item type="productname">%PRODUCTNAME</item> into high contrast mode when the system background color is very dark.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTOMATIC_FONT_COLOR" id="bm_id3153365" localize="false"/><paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="3" l10n="CHG" oldref="19">Use automatic font color for screen display</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR" id="bm_id3153365" localize="false"/><paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="3" l10n="CHG" oldref="19">Use automatic font color for screen display</paragraph>
<paragraph role="paragraph" id="par_id3146984" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_AUTOMATIC_FONT_COLOR">Displays fonts in <item type="productname">%PRODUCTNAME</item> using the system color settings. This option only affects the screen display.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_PAGE_PREVIEWS" id="bm_id3152941" localize="false"/><paragraph role="heading" id="hd_id3153091" xml-lang="en-US" level="3" l10n="U" oldref="7">Use system colors for page previews</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS" id="bm_id3152941" localize="false"/><paragraph role="heading" id="hd_id3153091" xml-lang="en-US" level="3" l10n="U" oldref="7">Use system colors for page previews</paragraph>
<paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_PAGE_PREVIEWS">Applies the high contrast settings of the operating system to page previews.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01014000.xhp b/helpcontent2/source/text/shared/optionen/01014000.xhp
index 9813c22cf3..2a13f84b48 100755
--- a/helpcontent2/source/text/shared/optionen/01014000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01014000.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01014000.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,16 +54,16 @@
<paragraph role="paragraph" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Sets the options for a remote configuration access to your personal $[officename] settings stored on an LDAP server.</ahelp> To see this tab page and to use this feature, remote configuration must be active: You need an account on an LDAP server that is running and configured to store $[officename] user settings.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="U" oldref="7">Using remote configuration, you can start a copy of $[officename] on any computer in the network with your own user data and personal configuration.</paragraph><comment>link to how-to ldap config, single signon how-to, etc</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_SSO_LB_MECHANISM" id="bm_id3154515" localize="false"/>
+<!-- removed HID SVX_LISTBOX_RID_SVXPAGE_SSO_LB_MECHANISM -->
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="3">Authentication Method</paragraph>
<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_SSO_LB_MECHANISM">Choose your security mechanism for access to the LDAP server.</ahelp> Choices are Simple or Kerberos.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_SSO_ED_USERNAME" id="bm_id3155629" localize="false"/>
+<!-- removed HID SVX_EDIT_RID_SVXPAGE_SSO_ED_USERNAME -->
<paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="4">User name</paragraph>
<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX_EDIT_RID_SVXPAGE_SSO_ED_USERNAME">Using "simple" authentication method, you enter your user name on the LDAP server here.</ahelp> Using "Kerberos", you just see your user name, but cannot edit it.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_SSO_ED_PASSWORD" id="bm_id3149294" localize="false"/>
+<!-- removed HID SVX_EDIT_RID_SVXPAGE_SSO_ED_PASSWORD -->
<paragraph role="heading" id="hd_id3153061" xml-lang="en-US" level="2" l10n="U" oldref="5">Password</paragraph>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_EDIT_RID_SVXPAGE_SSO_ED_PASSWORD">Using "simple" authentication method, enter your password for access to the LDAP server here.</ahelp> Using "Kerberos", this box is not active.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_SSO_CB_PASSWORD" id="bm_id3148664" localize="false"/>
+<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_SSO_CB_PASSWORD -->
<paragraph role="heading" id="hd_id3146795" xml-lang="en-US" level="2" l10n="U" oldref="6">Save password</paragraph>
<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_SSO_CB_PASSWORD">Using "simple" authentication method, check this box to make your password persistent.</ahelp> If the password is persistent and the same user starts $[officename] later on, the user name and password will not be requested again. Using "Kerberos", this box is not active.</paragraph>
<paragraph role="paragraph" id="par_id3154939" xml-lang="en-US" l10n="U" oldref="12">The password will be stored encrypted in a file called .ssop in your <switchinline select="sys"><caseinline select="UNIX">home directory
diff --git a/helpcontent2/source/text/shared/optionen/01020000.xhp b/helpcontent2/source/text/shared/optionen/01020000.xhp
index 5e96f60869..5bb4e7a25e 100755
--- a/helpcontent2/source/text/shared/optionen/01020000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01020100.xhp b/helpcontent2/source/text/shared/optionen/01020100.xhp
index 1e07a71462..331d2aa45c 100644
--- a/helpcontent2/source/text/shared/optionen/01020100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020100.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,28 +52,28 @@
</section>
<paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for the <link href="text/shared/00/00000002.xhp#proxy" name="proxy server">proxy server</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE">Specifies the type of proxy definition.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="4" l10n="U" oldref="10">None</paragraph>
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="11">Accesses the Internet without a proxy server. Allows you to set up a connection directly on your computer to an Internet provider that does not use a proxy.</paragraph>
<paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="4" l10n="U" oldref="14">Manual</paragraph>
<paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="15">Lets you enter the proxy server manually. Specify the proxy servers in accordance with your Internet service. Ask your system administrator for the proxies and ports to enter.</paragraph>
-<paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.sun.com, not http://www.sun.com.</paragraph>
+<paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.example.com, not http://www.example.com.</paragraph>
<paragraph role="heading" id="par_idN10684" xml-lang="en-US" level="4" l10n="NEW">System</paragraph>
<paragraph role="paragraph" id="par_idN10688" xml-lang="en-US" l10n="NEW">On Windows or UNIX systems using GNOME or KDE, this option tells %PRODUCTNAME to use the system settings. You must restart %PRODUCTNAME to initiate this setting.<comment>UFI: see spec "System-Settings"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#http" name="HTTP">HTTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_PROXY_ED_HTTPS_PROXY" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
<paragraph role="paragraph" id="par_id5319071" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Type the name of the proxy server for HTTPS. Type the port in the right-hand field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_INET_PROXY_ED_FTP_PROXY" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX_EDIT_RID_SVXPAGE_INET_PROXY_ED_FTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#ftp" name="FTP">FTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
<paragraph role="paragraph" id="par_id3151178" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR">Specifies the names of the servers that do not require any proxy servers, separated by semicolons.</ahelp> These are servers addressed in your local network, and servers used for video and audio streaming, for example.</paragraph>
<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="26">You can also use placeholders for the names of hosts and domains. For example, type *.sun.com to address all the hosts in the sun.com domain without proxy.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT" id="bm_id3152920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_PROXY_ED_HTTPS_PORT" id="bm_id3139439" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT" id="bm_id3147229" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="27">Port</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT" id="bm_id3152920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT" id="bm_id3139439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT" id="bm_id3147229" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="27">Port</paragraph>
<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT">Type the port for the corresponding proxy server.</ahelp> The maximum value of a port number is fixed at 65535.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01020200.xhp b/helpcontent2/source/text/shared/optionen/01020200.xhp
index 5e42cea524..7629fa533d 100755
--- a/helpcontent2/source/text/shared/optionen/01020200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020200.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,25 +53,25 @@
<embed href="text/shared/guide/hyperlink_search.xhp#hyperlink_search"/>
<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="7">Search in</paragraph>
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="8">Specifies the search engine and its corresponding configuration.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:LB_SEARCH" id="bm_id3150986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH" id="bm_id3150986" localize="false"/>
<paragraph role="heading" id="hd_id3154515" xml-lang="en-US" level="3" l10n="U" oldref="9">Search engines</paragraph>
<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:LB_SEARCH">Displays the available search engines.</ahelp> Select a search engine to display its configuration in the adjacent text and option boxes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME" id="bm_id3153562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME" id="bm_id3153562" localize="false"/>
<paragraph role="heading" id="hd_id3150276" xml-lang="en-US" level="3" l10n="U" oldref="11">Name</paragraph>
<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME">Displays the name of the selected search engine.</ahelp> This is the name that will be shown in the sub-menu of the <emph>Search</emph> icon on the Hyperlink bar. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_AND" id="bm_id3148943" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_OR" id="bm_id3148946" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_EXACT" id="bm_id3147264" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR" id="bm_id3148946" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT" id="bm_id3147264" localize="false"/>
<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph>
<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_EXACT">Sets the advanced search preferences (and, or, exact) as well as the way the results are defined and displayed.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="15">The links <emph>And, Or</emph> and <emph>Exactly</emph> are available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_URL" id="bm_id3154365" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL" id="bm_id3154365" localize="false"/>
<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="17">Prefix</paragraph>
<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_URL">This text box displays the URL and the first part of the query command for a search machine. A URL can also be typed directly.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX" id="bm_id3151041" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX" id="bm_id3151041" localize="false"/>
<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3" l10n="U" oldref="22">Suffix</paragraph>
<paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="23">The search terms are passed between the prefix and the suffix.<ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX">The suffix provides the command sequence, sent at the end of a search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR" id="bm_id3145171" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR" id="bm_id3145171" localize="false"/>
<paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="24">Separator</paragraph>
<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR">If you type more than one word while running a search, these words will be separated by the character specified here.</ahelp> Most search engines require the "+" character.</paragraph>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="27">To determine which prefixes, separators and suffixes to use when defining a new search engine:</paragraph>
@@ -95,20 +92,20 @@
<paragraph role="listitem" id="par_id3147213" xml-lang="en-US" l10n="U" oldref="32">Compare the URLs with the sample URLs in the fields of this dialog and make a note of the prefixes, suffixes and separators used.</paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:ED_CASE" id="bm_id3153363" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE" id="bm_id3153363" localize="false"/>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="33">Case match</paragraph>
<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:ED_CASE">Determines the case match for running a search.</ahelp> The list contains the following entries: <emph>None</emph>, <emph>Upper</emph> and <emph>Lower</emph>. The search terms entered are converted according to your selection.</paragraph>
<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="35">Search engines handle queries differently according to the way they are constructed. For example, some are case sensitive and some are not. Because of this, it is best to select <emph>None</emph> as the case match option.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_NEW" id="bm_id3148455" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW" id="bm_id3148455" localize="false"/>
<paragraph role="heading" id="hd_id3156283" xml-lang="en-US" level="3" l10n="U" oldref="44">New</paragraph>
<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_NEW">Use this button to include a new search engine.</ahelp><emph>New</emph> deletes all important entries of the entry mask such as "Name" and "Suffix". Enter the new search engine together with all of the necessary details. As soon as you accept your entries with <emph>Add</emph>, the new search engine will appear in the search engine list under <emph>Search in</emph>. Close the dialog with the <emph>OK</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_ADD" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD" id="bm_id3149581" localize="false"/>
<paragraph role="heading" id="hd_id3145254" xml-lang="en-US" level="3" l10n="U" oldref="36">Add</paragraph>
<paragraph role="paragraph" id="par_id3144767" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_ADD">Click this button to add a new configuration to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_CHANGE" id="bm_id3154018" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE" id="bm_id3154018" localize="false"/>
<paragraph role="heading" id="hd_id3155603" xml-lang="en-US" level="3" l10n="U" oldref="38">Modify</paragraph>
<paragraph role="paragraph" id="par_id3151320" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_CHANGE">Click this button to apply the modifications made to an existing configuration.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_DELETE" id="bm_id3154164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE" id="bm_id3154164" localize="false"/>
<paragraph role="heading" id="hd_id3149122" xml-lang="en-US" level="3" l10n="U" oldref="40">Delete</paragraph>
<paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_DELETE">Click this button to delete the selected search engine from the list. There will be no security response.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01020300.xhp b/helpcontent2/source/text/shared/optionen/01020300.xhp
index 693fba4192..d64a62724b 100644
--- a/helpcontent2/source/text/shared/optionen/01020300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020300.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,9 +46,9 @@
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW">On UNIX systems, specifies the e-mail program to use when you send the current document as e-mail.</paragraph>
<switch select="sys">
<case select="UNIX">
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_MAIL_ED_MAILERURL" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">E-mail program</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">E-mail program</paragraph>
<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="NEW"><ahelp hid="703252484">Enter the e-mail program path and name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_MAIL_PB_MAILERURL" id="bm_id3655507" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">...</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL" id="bm_id3655507" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">...</paragraph>
<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid="703255045">Opens a file dialog to select the e-mail program.</ahelp></paragraph>
</case>
</switch></body>
diff --git a/helpcontent2/source/text/shared/optionen/01020400.xhp b/helpcontent2/source/text/shared/optionen/01020400.xhp
index 23d72c8c4d..30fc99d0dc 100644
--- a/helpcontent2/source/text/shared/optionen/01020400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020400.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020400.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,39 +29,39 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01020400xhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Mozilla Plug-in</title>
-<filename>/text/shared/optionen/01020400.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="mozilla">
-<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/optionen/01020400.xhp">Mozilla/Netscape Plug-in</link></paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US" l10n="NEW">Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents.</paragraph>
-<paragraph role="paragraph" id="par_idN105D8" xml-lang="en-US" l10n="CHG">When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="CHG">The browser asks you whether you want to save the document on your disk, or whether you want to use an application to open the document. This request dialog appears by default when you click any %PRODUCTNAME document hyperlink the first time and you did not enable the Mozilla plug-in.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW">The browser downloads the document to a temporary folder, then tells your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is the default when you did not enable the Mozilla plug-in and chose to open the document with %PRODUCTNAME when you were first asked.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN105E6" xml-lang="en-US" l10n="NEW">The browser opens a new browser window that shows some of the %PRODUCTNAME icons, and displays the document in the browser window. This is the default when you enable the Mozilla plug-in. When you click the <emph>Edit File</emph> icon, a copy of the document is downloaded to a temporary folder on your disk, then %PRODUCTNAME starts and loads the copy for editing.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_MOZPLUGIN_CB_MOZPLUGIN_CODE" id="bm_id337229" localize="false"/><paragraph role="heading" id="par_idN105F5" xml-lang="en-US" level="2" l10n="NEW">Viewing of %PRODUCTNAME and MS Office documents in Mozilla/Netscape enabled</paragraph>
-<paragraph role="paragraph" id="par_idN105F9" xml-lang="en-US" l10n="CHG"><ahelp hid="736117762">Enables the Mozilla plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, then restart your browser. Then, in the browser window, click any %PRODUCTNAME document hyperlink.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">The plug-in needs a version of Mozilla 1.x, Netscape 6.x, or Netscape 7.x installed on your system.</paragraph>
+ <topic id="textsharedoptionen01020400xhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Browser Plug-in</title>
+ <filename>/text/shared/optionen/01020400.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <paragraph xml-lang="en-US" id="par_idN105B7" role="heading" level="1" l10n="CHG"><variable id="mozilla"><link href="text/shared/optionen/01020400.xhp" name="Browser Plugin">Browser Plug-in</link></variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105D5" role="paragraph" l10n="NEW">Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105D8" role="paragraph" l10n="CHG">When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN105DE" role="paragraph" l10n="CHG">The browser asks you whether you want to save the document on your disk, or whether you want to use an application to open the document. This request dialog appears by default when you click any %PRODUCTNAME document hyperlink the first time and you did not enable the Browser Plug-in.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN105E2" role="paragraph" l10n="NEW">The browser downloads the document to a temporary folder, then tells your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is the default when you did not enable the Browser Plug-in and chose to open the document with %PRODUCTNAME when you were first asked.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN105E6" role="paragraph" l10n="NEW">The browser opens a new browser window that shows some of the %PRODUCTNAME icons, and displays the document in the browser window. This is the default when you enable the Browser Plug-in. When you click the <emph>Edit File</emph> icon, a copy of the document is downloaded to a temporary folder on your disk, then %PRODUCTNAME starts and loads the copy for editing.</paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE" id="bm_id337229" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN105F5" role="heading" level="2" l10n="CHG">Display documents in browser</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105F9" role="paragraph" l10n="CHG"><ahelp hid="736117762">Enables the Browser Plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, then restart your browser. Then, in the browser window, click any %PRODUCTNAME document hyperlink.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">The plug-in needs a version of Mozilla, Netscape, or Firefox installed on your system.</paragraph>
<switch select="sys">
-<case select="WIN"><section id="relatedtopics">
-<embed href="text/shared/guide/activex.xhp#activex"/>
-</section>
+<case select="WIN">
+<section id="relatedtopics">
+ <embed href="text/shared/guide/activex.xhp#activex"/>
+ </section>
</case>
-</switch></body>
-</helpdocument>
+</switch>
+</body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp
index 672fe43cfe..f57b9f4824 100755
--- a/helpcontent2/source/text/shared/optionen/01030000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030000.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01030000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,33 +27,37 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Internet options</title>
-<filename>/text/shared/optionen/01030000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-01T11:02:49">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="1" l10n="U" oldref="1">Internet options</paragraph>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="2"><variable id="laden"><ahelp hid=".">Specifies Internet settings.</ahelp>
+ <topic id="textsharedoptionen01030000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Internet options</title>
+ <filename>/text/shared/optionen/01030000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <paragraph xml-lang="en-US" id="hd_id3154926" role="heading" level="1" l10n="U" oldref="1">Internet options</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154894" role="paragraph" l10n="U" oldref="2"><variable id="laden"><ahelp hid=".">Specifies Internet settings.</ahelp>
</variable></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#internet"/>
-</section>
-<embed href="text/shared/optionen/01020100.xhp#proxyserver"/>
-<embed href="text/shared/optionen/01020200.xhp#suche"/>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#internet"/>
+ </section>
+ <embed href="text/shared/optionen/01020100.xhp#proxyserver"/>
+ <embed href="text/shared/optionen/01020200.xhp#suche"/>
<switch select="sys">
<case select="UNIX"><embed href="text/shared/optionen/01020300.xhp#email"/>
</case>
+<case select="MAC"><embed href="text/shared/optionen/01020300.xhp#email"/>
+</case>
</switch>
-<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
-</body>
-</helpdocument>
+<switch select="sys">
+<case select="MAC">
+</case>
+<default><embed href="text/shared/optionen/01020300.xhp#email"/>
+</default>
+</switch><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+ <embed href="text/shared/00/00000001.xhp#zurueck"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01030300.xhp b/helpcontent2/source/text/shared/optionen/01030300.xhp
index 105bfe0fb8..a742a2ca7e 100755
--- a/helpcontent2/source/text/shared/optionen/01030300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030300.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01030300.xhp,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -46,73 +43,60 @@
<section id="security">
<bookmark xml-lang="en-US" branch="index" id="bm_id2322153"><bookmark_value>macros;selecting security warnings</bookmark_value>
<bookmark_value>security;options for documents with macros</bookmark_value>
-<bookmark_value>saving;with password by default</bookmark_value>
-<bookmark_value>user data;removing when saving</bookmark_value>
-<bookmark_value>file sharing options for current document</bookmark_value>
+
+
<bookmark_value>macros;security</bookmark_value>
-<bookmark_value>read-only documents;opening documents as</bookmark_value>
-</bookmark><comment>mw corrected a typo in "file ..." and changed "read-only documents;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/SVX_TABPAGE_RID_SVXPAGE_INET_SCRIPTING" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030300.xhp" name="Security">Security</link></paragraph>
-<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="SVX_TABPAGE_RID_SVXPAGE_INET_SCRIPTING">Defines the security options for saving documents and for opening documents that contain macros.</ahelp></paragraph>
+
+</bookmark><comment>ufi moved 4 entries to new file shared/01/01100600.xhp - cws tl79</comment><comment>mw corrected a typo in "file ..." and changed "read-only documents;..."</comment>
+<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030300.xhp" name="Security">Security</link></paragraph>
+<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Defines the security options for saving documents, for web connections, and for opening documents that contain macros.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#scripting"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/703992332" id="bm_id9049653" localize="false"/><comment>UFI: this converts to "MACROSECURITY" help id using the m237 hid.lst - bug?</comment><paragraph role="heading" id="par_idN10640" xml-lang="en-US" level="2" l10n="CHG">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS" id="bm_id9049653" localize="false"/><paragraph role="heading" id="par_idN10640" xml-lang="en-US" level="2" l10n="CHG">Options</paragraph>
<paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the "Security options and warning" dialog.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">The Security options and warnings dialog contains the following controls:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SAVEORSENDDOCS" id="bm_id5852534" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498061" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
-<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_PRINTDOCS" id="bm_id2789696" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498065" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
-<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SIGNDOCS" id="bm_id1294289" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498063" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
-<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_CREATEPDF" id="bm_id1584215" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498067" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_REMOVEPERSINFO" id="bm_id7565233" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498070" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Delete</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECOMMPASSWD" id="bm_id6656086" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/1242498072" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
+<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
+<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
+<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
+<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
+<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Reset</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
<paragraph role="paragraph" id="par_idN10680" xml-lang="en-US" l10n="CHG"><ahelp hid="703988744">Select to always enable the <emph>Save with password</emph> option in the file save dialogs. Deselect the option to save files by default without password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1242498074" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow hyperlinks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow hyperlinks</paragraph>
<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, you must hold down the Ctrl key while clicking a hyperlink to follow that link. If not enabled, a click opens the hyperlink.</ahelp></paragraph>
<paragraph role="heading" id="hd_id4076357" xml-lang="en-US" level="2" l10n="NEW">Passwords for web connections</paragraph>
<paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="NEW">You can enter a master password to enable easy access to sites that require a user name and password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/703988750" id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Persistently save passwords protected by a master password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS" id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Persistently save passwords protected by a master password</paragraph>
<paragraph role="paragraph" id="par_id1909848" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, %PRODUCTNAME will securely store all passwords that you use to access files from web servers. You can retrieve the passwords from the list after you enter the master password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/703992335" id="bm_id9989013" localize="false"/><paragraph role="heading" id="hd_id3901791" xml-lang="en-US" level="3" l10n="NEW">Master Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD" id="bm_id9989013" localize="false"/><paragraph role="heading" id="hd_id3901791" xml-lang="en-US" level="3" l10n="NEW">Master Password</paragraph>
<paragraph role="paragraph" id="par_id4571977" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Enter Master Password dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/uui_Edit_DLG_UUI_MASTERPASSWORD_CRT_ED_MASTERPASSWORD_CRT" id="bm_id8224738" localize="false"/><paragraph role="paragraph" id="par_id5216223" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/uui_Edit_DLG_UUI_MASTERPASSWORD_CRT_ED_MASTERPASSWORD_REPEAT" id="bm_id8702047" localize="false"/><paragraph role="paragraph" id="par_id7067171" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password again.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/uui_Edit_DLG_UUI_MASTERPASSWORD_ED_MASTERPASSWORD" id="bm_id2005981" localize="false"/><paragraph role="paragraph" id="par_id7499313" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password to continue.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/703992337" id="bm_id4279915" localize="false"/><paragraph role="heading" id="hd_id3283486" xml-lang="en-US" level="3" l10n="NEW">Show Passwords</paragraph>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT" id="bm_id8224738" localize="false"/><paragraph role="paragraph" id="par_id5216223" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT" id="bm_id8702047" localize="false"/><paragraph role="paragraph" id="par_id7067171" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password again.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD" id="bm_id2005981" localize="false"/><paragraph role="paragraph" id="par_id7499313" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password to continue.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS" id="bm_id2005777" localize="false"/><paragraph role="heading" id="hd_id3283486" xml-lang="en-US" level="3" l10n="CHG">Connections</paragraph>
<paragraph role="paragraph" id="par_id3472090" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Asks for the master password. If master password is correct, shows the Stored Web Connection Information dialog.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3289590" xml-lang="en-US" l10n="NEW">The Stored Web Connection Information dialog shows a list of web sites and user names that you entered previously. You can select any entry and remove it from the list. You can view the password for the selected entry.</paragraph><comment>Remove</comment>
-<bookmark xml-lang="en-US" branch="hid/1242518028" id="bm_id6843775" localize="false"/><paragraph role="paragraph" id="par_id7499008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected entry from the list.</ahelp></paragraph><comment>Remove All</comment>
-<bookmark xml-lang="en-US" branch="hid/1242518029" id="bm_id7979369" localize="false"/><paragraph role="paragraph" id="par_id7021088" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes all entries from the list.</ahelp></paragraph><comment>Change Password</comment>
-<bookmark xml-lang="en-US" branch="hid/1242518030" id="bm_id48524" localize="false"/><paragraph role="paragraph" id="par_id1981261" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog where you can view and change the password for the selected entry.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE" id="bm_id6843775" localize="false"/><paragraph role="paragraph" id="par_id7499008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected entry from the list.</ahelp></paragraph><comment>Remove All</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL" id="bm_id7979369" localize="false"/><paragraph role="paragraph" id="par_id7021088" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes all entries from the list.</ahelp></paragraph><comment>Change Password</comment>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE" id="bm_id48524" localize="false"/><paragraph role="paragraph" id="par_id1981261" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog where you can view and change the password for the selected entry.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10687" xml-lang="en-US" level="2" l10n="NEW">Macro security</paragraph>
<paragraph role="paragraph" id="par_idN1068B" xml-lang="en-US" l10n="NEW">Adjust the security level for executing macros and specify trusted macro authors.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_MACROSEC" id="bm_id3726920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703992340" id="bm_id4459669" localize="false"/><paragraph role="heading" id="par_idN1068E" xml-lang="en-US" level="3" l10n="NEW">Macro Security</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC" id="bm_id3726920" localize="false"/>
+<paragraph role="heading" id="par_idN1068E" xml-lang="en-US" level="3" l10n="NEW">Macro Security</paragraph>
<paragraph role="paragraph" id="par_idN10692" xml-lang="en-US" l10n="NEW"><ahelp hid="703992332">Opens the <emph>Macro Security</emph> dialog.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options for this document</paragraph>
-<paragraph role="paragraph" id="par_idN106A7" xml-lang="en-US" l10n="NEW">The following options are valid only for the current document:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECOMMREADONLY" id="bm_id8295846" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703988758" id="bm_id1275368" localize="false"/><paragraph role="heading" id="par_idN106AA" xml-lang="en-US" level="3" l10n="NEW">Open this document in read-only mode</paragraph>
-<paragraph role="paragraph" id="par_idN106AE" xml-lang="en-US" l10n="NEW"><ahelp hid="703988750">Select to allow this document to be opened in read-only mode only.</ahelp></paragraph>
-<paragraph role="note" id="par_idN106B1" xml-lang="en-US" l10n="NEW">This file sharing option protects the document against accidental changes. It is still possible to edit a copy of the document and save that copy with the same name as the original.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECORDCHANGES" id="bm_id868861" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703988759" id="bm_id2421033" localize="false"/><paragraph role="heading" id="par_idN106B4" xml-lang="en-US" level="3" l10n="NEW">Record changes</paragraph>
-<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid="703988751">Select to enable recording changes. This is the same as <emph>Edit - Changes - Record</emph>.</ahelp></paragraph>
-<paragraph role="tip" id="par_idN106C9" xml-lang="en-US" l10n="NEW">To protect the recording state with a password, click <emph>Protect</emph> and enter a password. Other users of this document can apply their changes, but they cannot disable change recording without the password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_PROTRECORDS" id="bm_id2517166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/703992344" id="bm_id2506485" localize="false"/><paragraph role="heading" id="par_idN106D0" xml-lang="en-US" level="3" l10n="NEW">Protect / Unprotect</paragraph>
-<paragraph role="paragraph" id="par_idN106D4" xml-lang="en-US" l10n="NEW"><ahelp hid="703992336">Protects the change recording state with a password. If change recording is protected for the current document, the button is named <emph>Unprotect</emph>. Click <emph>Unprotect</emph> and type the correct password to disable the protection.</ahelp></paragraph>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index ba421fb4e6..e734f5ed4b 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01030500.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedoptionen01030500xml" indexer="include" status="PUBLISH">
@@ -47,70 +44,70 @@
<body>
<section id="html">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>$[officename] Basic scripts in HTML documents</bookmark_value>
+<bookmark_value>HTML;compatibility settings</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT" id="bm_id3148491" localize="false"/>
+<!-- removed HID OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT -->
<paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030500.xhp" name="HTML compatibility">HTML compatibility</link></paragraph>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT">Defines settings for HTML pages.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#html"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE1" id="bm_id3154286" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE2" id="bm_id3154143" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE3" id="bm_id3156153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE4" id="bm_id3153666" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE5" id="bm_id3156330" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE6" id="bm_id3150504" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE7" id="bm_id3153562" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE1" id="bm_id6074098" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE2" id="bm_id8064821" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE3" id="bm_id7630542" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE4" id="bm_id5698416" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE5" id="bm_id9110080" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE6" id="bm_id494399" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE7" id="bm_id534684" localize="false"/>
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE1 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE2 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE3 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE4 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE5 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE6 -->
+<!-- removed HID OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE7 -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1" id="bm_id6074098" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2" id="bm_id8064821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3" id="bm_id7630542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4" id="bm_id5698416" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5" id="bm_id9110080" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6" id="bm_id494399" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7" id="bm_id534684" localize="false"/>
<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="2" l10n="U" oldref="3">Font sizes</paragraph>
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="OFFMGR:NUMERICFIELD:RID_OFAPAGE_HTMLOPT:NF_SIZE7">Use the spin buttons <emph>Size 1</emph> to <emph>Size 7</emph> to define the respective font sizes for the HTML &lt;font size=1&gt; to &lt;font size=7&gt; tags.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="2" l10n="U" oldref="5">Import</paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="6">Defines the settings for importing HTML documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US" id="bm_id4514297" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US" id="bm_id4514297" localize="false"/>
<paragraph role="heading" id="hd_id6065248" xml-lang="en-US" level="3" l10n="NEW">Use 'English (USA)' locale for numbers</paragraph>
<paragraph role="paragraph" id="par_id8023926" xml-lang="en-US" l10n="CHG">When importing numbers from an HTML page, the decimal separator and the thousands separator characters differ according to the locale of the HTML page. The clipboard however contains no information about the locale. For example, the characters "1.000" copied from a German Web page most possibly mean "one thousand" because the period is the thousands separator in a German locale. If copied from an English Web page, the same characters stand for the number 1 as in "one dot zero zero zero".</paragraph>
-<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Tools - Options - Language Settings - Language of - Locale setting</emph>. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS" id="bm_id3147559" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_UNKNOWN_TAGS" id="bm_id2516251" localize="false"/>
+<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Language Settings - Language of - Locale setting</emph> in the Options dialog box. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS" id="bm_id2516251" localize="false"/>
<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="3" l10n="U" oldref="7">Import unknown HTML tags as fields</paragraph>
<paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS">Mark this check box if you want <link href="text/shared/00/00000002.xhp#tags" name="tags">tags</link> that are not recognized by $[officename] to be imported as fields.</ahelp> For an opening tag, an HTML_ON field will be created with the value of the tag name. For a closing tag, an HTML_OFF will be created. These fields will be converted to tags in the HTML export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES" id="bm_id3154217" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_IGNORE_FONTNAMES" id="bm_id5614185" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES" id="bm_id5614185" localize="false"/>
<paragraph role="heading" id="hd_id3148797" xml-lang="en-US" level="3" l10n="U" oldref="43">Ignore font settings</paragraph>
<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES">Mark this check box to ignore all font settings when importing. The fonts that were defined in the HTML Page Style will be the fonts that will be used. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT" id="bm_id3154123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_HTMLOPT_LB_EXPORT" id="bm_id1028473" localize="false"/>
+<!-- removed HID OFFMGR:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT" id="bm_id1028473" localize="false"/>
<paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="2" l10n="U" oldref="9">Export</paragraph>
<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="OFFMGR:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT">Defines the settings for exporting HTML documents.</ahelp> To export in HTML format select the <emph>HTML Document</emph> file type in the <link href="text/shared/01/01070000.xhp" name="Save As"><emph>Save As</emph></link> dialog. You can find further instructions in the <link href="text/shared/00/00000020.xhp" name="Import and export filters">Import and export filters</link> description.</paragraph>
<paragraph role="paragraph" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="42">To optimize the HTML export, select a browser or HTML standard from the Export box. If "$[officename] Writer" is selected, specific $[officename] Writer instructions are exported.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC" id="bm_id3150441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC" id="bm_id4532609" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC" id="bm_id4532609" localize="false"/>
<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="16">$[officename] Basic</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC">Mark this check box to include the $[officename] Basic instructions when exporting to HTML format.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="29">You must activate this option before you create the $[officename] Basic Script, since otherwise it will not be inserted. $[officename] Basic Scripts must be located in the header of the HTML document. Once you have created the macro in the $[officename] Basic IDE, it appears in the source text of the HTML document in the header.</paragraph>
-<paragraph role="tip" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="40">If you want the macro to run automatically when the HTML document is opened, choose <emph>Tools - Customize - Events</emph>. Select the "Document" check box and "Open Document" in the Events list. In <emph>Macros</emph> select your document, its standard library, module1 and the macro and click <emph>Assign</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING" id="bm_id3149420" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC_WARNING" id="bm_id1735892" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING" id="bm_id1735892" localize="false"/>
<paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="3" l10n="U" oldref="45">Display warning</paragraph>
<paragraph role="paragraph" id="par_id3150420" xml-lang="en-US" l10n="CHG" oldref="46"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING">If this field is marked, when exporting to HTML a warning is shown that %PRODUCTNAME Basic macros will be lost.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION" id="bm_id3150113" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_PRINT_EXTENSION" id="bm_id2938932" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION" id="bm_id2938932" localize="false"/>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="3" l10n="U" oldref="28">Print layout</paragraph>
<paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION">If you mark this field, the print layout of the current document is exported as well.</ahelp> It can be read by $[officename] as well as Netscape Navigator from 4.0 and above and by MS Internet Explorer from 4.0 and above.</paragraph>
<paragraph role="note" id="par_id3156276" xml-lang="en-US" l10n="U" oldref="41">The HTML filter supports CSS2 (Cascading Style Sheets Level 2) for printing documents. These capabilities are only effective if print layout export is activated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF" id="bm_id3145799" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_LOCAL_GRF" id="bm_id8177434" localize="false"/>
+<!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF" id="bm_id8177434" localize="false"/>
<paragraph role="heading" id="hd_id3144764" xml-lang="en-US" level="3" l10n="U" oldref="24">Copy local graphics to Internet</paragraph>
<paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF">Mark this check box to automatically upload the embedded pictures to the Internet server when uploading using FTP. Use the <emph>Save As</emph> dialog to save the document and enter a complete FTP URL as the file name in the Internet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_RID_OFAPAGE_HTMLOPT_LB_CHARSET" id="bm_id3145644" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OFAPAGE_HTMLOPT_LB_CHARSET" id="bm_id9777520" localize="false"/>
+<!-- removed HID OFFMGR_LISTBOX_RID_OFAPAGE_HTMLOPT_LB_CHARSET -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET" id="bm_id9777520" localize="false"/>
<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="48">Character set</paragraph>
<paragraph role="paragraph" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="OFFMGR_LISTBOX_RID_OFAPAGE_HTMLOPT_LB_CHARSET">Select the appropriate character set for the export</ahelp>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01040000.xhp b/helpcontent2/source/text/shared/optionen/01040000.xhp
index ed4aee9c79..8d889c72a5 100644
--- a/helpcontent2/source/text/shared/optionen/01040000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,10 +55,10 @@
<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Western)">Basic Fonts (Western)</link></paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="3">Specifies the settings for the basic fonts.</paragraph>
<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Asian)">Basic Fonts (Asian)</link></paragraph>
-<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph>Tools - Options - Language Settings - Languages.</emph>
+<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</emph>
</paragraph>
<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (CTL)">Basic Fonts (CTL)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
<embed href="text/shared/optionen/01040400.xhp#drucken"/>
<embed href="text/shared/optionen/01040500.xhp#tabelle"/>
<embed href="text/shared/optionen/01040700.xhp#aenderungen"/>
diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp b/helpcontent2/source/text/shared/optionen/01040200.xhp
index 862109002b..6401124aee 100644
--- a/helpcontent2/source/text/shared/optionen/01040200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040200.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040200.xhp,v $
- * $Revision: 1.17 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@
<bookmark_value>drawings; showing (Writer)</bookmark_value>
<bookmark_value>controls; showing (Writer)</bookmark_value>
<bookmark_value>fields;displaying field codes (Writer)</bookmark_value>
-<bookmark_value>displaying; notes in text documents</bookmark_value>
+<bookmark_value>displaying; comments in text documents</bookmark_value>
</bookmark><comment>mw made "field..." a two level entry</comment><paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040200.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Defines the default settings for displaying objects in your text documents and also the default settings for the window elements.</ahelp></paragraph>
</section>
@@ -73,50 +70,50 @@
</section>
<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" oldref="3">Guides</paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="4">Specifies settings that refer to the representation of boundaries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" oldref="9">Guides while moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" oldref="9">Guides while moving</paragraph>
<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS">Displays guides around the frames when frames are moved. You can select the<emph> Guides while moving </emph>option to show the exact position of the object using lineal values.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_HANDLE" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="23">Simple handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="23">Simple handles</paragraph>
<paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_HANDLE">Displays the handles (the eight points on a delimiting rectangle) as simple squares without 3D effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_BIGHANDLE" id="bm_id3149234" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="32">Large handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE" id="bm_id3149234" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="32">Large handles</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_BIGHANDLE">Displays larger sized handles (the eight points on a delimiting rectangle).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="11">View</paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="12">Specifies whether scrollbars and rulers are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_HSCROLL" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="U" oldref="13">Horizontal scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="U" oldref="13">Horizontal scrollbar</paragraph>
<paragraph role="paragraph" id="par_id3154347" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_HSCROLL">Displays the horizontal scrollbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_VSCROLL" id="bm_id3153361" localize="false"/><paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="3" l10n="U" oldref="15">Vertical scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL" id="bm_id3153361" localize="false"/><paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="3" l10n="U" oldref="15">Vertical scrollbar</paragraph>
<paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_VSCROLL">Displays the vertical scrollbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_ANY_RULER" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="3" l10n="U" oldref="65">Ruler</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="3" l10n="U" oldref="65">Ruler</paragraph>
<paragraph role="paragraph" id="par_id3154126" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_ANY_RULER">Enables the rulers. Use the following two check boxes to select the ruler(s) to be shown.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_HRULER" id="bm_id3156422" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_CONTENT_OPT_LB_HMETRIC" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="17">Horizontal ruler</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HRULER" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="17">Horizontal ruler</paragraph>
<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_CONTENT_OPT_LB_HMETRIC">Displays the horizontal ruler. Select the desired measurement unit from the corresponding list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_VRULER" id="bm_id3125863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_CONTENT_OPT_LB_VMETRIC" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="19">Vertical ruler</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_VRULER" id="bm_id3125863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="19">Vertical ruler</paragraph>
<paragraph role="paragraph" id="par_id3147287" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_LISTBOX_TP_CONTENT_OPT_LB_VMETRIC">Displays the vertical ruler. Select the desired measurement unit from the corresponding list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_VRULER_RIGHT" id="bm_id3147348" localize="false"/><paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="3" l10n="U" oldref="62">Right-aligned</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT" id="bm_id3147348" localize="false"/><paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="3" l10n="U" oldref="62">Right-aligned</paragraph>
<embed href="text/shared/00/00000007.xhp#asiahinweis"/>
<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_VRULER_RIGHT">Aligns the vertical ruler with the right border.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_CONTENT_OPT_CB_SMOOTH_SCROLL" id="bm_id3152938" localize="false"/><paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="27">Smooth scroll</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_SMOOTH_SCROLL" id="bm_id3152938" localize="false"/><paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="27">Smooth scroll</paragraph>
<paragraph role="paragraph" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_SMOOTH_SCROLL">Activates the smooth page scrolling function. </ahelp> The scrolling speed depends of the area and of the color depth display.</paragraph>
<paragraph role="heading" id="hd_id3153091" xml-lang="en-US" level="2" l10n="U" oldref="34">Display</paragraph>
<paragraph role="paragraph" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="35">Defines which document elements are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF" id="bm_id3153728" localize="false"/><paragraph role="heading" id="hd_id3153143" xml-lang="en-US" level="3" l10n="U" oldref="36">Graphics and objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_GRF" id="bm_id3153728" localize="false"/><paragraph role="heading" id="hd_id3153143" xml-lang="en-US" level="3" l10n="U" oldref="36">Graphics and objects</paragraph>
<paragraph role="paragraph" id="par_id3149261" xml-lang="en-US" l10n="U" oldref="37"><variable id="grafikenaus"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF">Specifies whether to display graphics and objects on the screen.</ahelp>
</variable> If these elements are hidden, you will see empty frames as placeholders.</paragraph>
<paragraph role="paragraph" id="par_id3154944" xml-lang="en-US" l10n="CHG" oldref="38">You can also control the display of graphics through the <link href="text/swriter/02/18120000.xhp" name="Graphics"><emph>Graphics On/Off</emph></link> icon. If a text document is open, this icon is displayed on the <emph>Tools</emph> bar.</paragraph>
<paragraph role="note" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="39">If the <emph>Graphics and objects </emph>option is not selected, no graphics will be loaded from the Internet. Graphics within a table and without an indication of their size can cause display problems when using an older HTML standard on the browsed page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL" id="bm_id3154164" localize="false"/><paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="40">Tables</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_TBL" id="bm_id3154164" localize="false"/><paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="40">Tables</paragraph>
<paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL">Displays the tables contained in your document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_VIEW_TABLEGRID" id="bm_id3119506" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TableBoundaries" id="bm_id3155443" localize="false"/><paragraph role="paragraph" id="par_id3153713" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid=".uno:TableBoundaries">To display the table boundaries, right-click any table and choose <emph>Table Boundaries</emph>, or choose <emph>Table - Table Boundaries</emph> in a Writer document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST" id="bm_id3154255" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="42">Drawings and controls</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST" id="bm_id3154255" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="42">Drawings and controls</paragraph>
<paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST">Displays the drawings and controls contained in your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD" id="bm_id3145230" localize="false"/><paragraph role="heading" id="hd_id3155937" xml-lang="en-US" level="3" l10n="U" oldref="44">Field codes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_FIELD" id="bm_id3145230" localize="false"/><paragraph role="heading" id="hd_id3155937" xml-lang="en-US" level="3" l10n="U" oldref="44">Field codes</paragraph>
<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="45"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD">Displays the field names in the document instead of the contents of the fields.</ahelp> You can also choose <link href="text/swriter/01/03090000.xhp" name="View - Fields"><emph>View - Fields</emph></link> in a text document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT" id="bm_id3150298" localize="false"/><paragraph role="heading" id="hd_id3150647" xml-lang="en-US" level="3" l10n="U" oldref="46">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3159335" xml-lang="en-US" l10n="CHG" oldref="47"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT">Displays notes. Click a note to edit the text. Use the context menu in Navigator to locate or delete a note. Use the note's context menu to delete this note or all notes or all notes of this author.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT" id="bm_id3150298" localize="false"/><paragraph role="heading" id="hd_id3150647" xml-lang="en-US" level="3" l10n="U" oldref="46">Comments</paragraph>
+<paragraph role="paragraph" id="par_id3159335" xml-lang="en-US" l10n="CHG" oldref="47"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT">Displays comments. Click a comment to edit the text. Use the context menu in Navigator to locate or delete a comment. Use the comments's context menu to delete this comment or all comments or all comments of this author.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147001" xml-lang="en-US" level="2" l10n="U" oldref="63">Settings (for HTML document only)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_CONTENT_OPT_LB_METRIC" id="bm_id3149814" localize="false"/><paragraph role="heading" id="hd_id3149926" xml-lang="en-US" level="3" l10n="U" oldref="58">Measurement unit (for HTML document only)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_CONTENT_OPT:LB_METRIC" id="bm_id3149814" localize="false"/><paragraph role="heading" id="hd_id3149926" xml-lang="en-US" level="3" l10n="U" oldref="58">Measurement unit (for HTML document only)</paragraph>
<paragraph role="paragraph" id="par_id3154716" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SW_LISTBOX_TP_CONTENT_OPT_LB_METRIC">Specifies the <link href="text/shared/00/00000003.xhp#metrik" name="Unit">Unit</link> for HTML documents.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01040300.xhp b/helpcontent2/source/text/shared/optionen/01040300.xhp
index 9706d7330c..1a123d5f00 100755
--- a/helpcontent2/source/text/shared/optionen/01040300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040300.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,38 +55,38 @@
<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts">Basic Fonts</link></paragraph>
<paragraph role="paragraph" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_STD_FONT">Specifies the settings for the basic fonts in your documents.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18">These settings define the basic fonts for the predefined templates. You can also modify or customize the <link href="text/shared/optionen/01040301.xhp" name="default text templates">default text templates</link>.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#grundschriften"/>
</section>
<paragraph role="heading" id="hd_id3152811" xml-lang="en-US" level="2" l10n="U" oldref="3">Basic fonts</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_STANDARD" id="bm_id3151211" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_STANDARD" id="bm_id3151211" localize="false"/>
<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="3" l10n="U" oldref="4">Default</paragraph>
<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_STANDARD">Specifies the font to be used for the <emph>Default</emph> Paragraph Style.</ahelp> The <emph>Default</emph> Paragraph Style font is used for nearly all Paragraph Styles, unless the Paragraph Style explicitly defines another font.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_STANDARD_SIZE" id="bm_id7955870" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_TITLE_SIZE" id="bm_id5661793" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_LIST_SIZE" id="bm_id2680745" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_LABEL_SIZE" id="bm_id9615466.00000001" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_MetricBox_TP_STD_FONT_LB_INDEX_SIZE" id="bm_id426648" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE" id="bm_id7955870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE" id="bm_id5661793" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE" id="bm_id2680745" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE" id="bm_id9615466.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricBox:TP_STD_FONT:LB_INDEX_SIZE" id="bm_id426648" localize="false"/>
<paragraph role="heading" id="hd_id573137" xml-lang="en-US" level="3" l10n="NEW">Size</paragraph>
<paragraph role="paragraph" id="par_id7700735" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the size of the font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_TITLE" id="bm_id3154909" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_TITLE" id="bm_id3154909" localize="false"/>
<paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="3" l10n="U" oldref="6">Heading</paragraph>
<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_TITLE">Specifies the font to be used for headings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_LIST" id="bm_id3152922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_LIST" id="bm_id3152922" localize="false"/>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="3" l10n="U" oldref="8">List</paragraph>
<paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_LIST">Specifies the fonts for lists and numbering and all derived styles.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="U" oldref="10">When you choose <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/06050000.xhp" name="Format - Numbering/Bullets"><emph>Format - Numbering/Bullets</emph></link>
</caseinline><defaultinline>
<emph>Format - Numbering/Bullets</emph></defaultinline></switchinline> to format a paragraph with numbers or bullets in a text document, the program assigns these Paragraph Styles automatically.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_LABEL" id="bm_id3155307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_LABEL" id="bm_id3155307" localize="false"/>
<paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="3" l10n="U" oldref="11">Caption</paragraph>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_LABEL">Specifies the font used for the captions of images and tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_STD_FONT_LB_IDX" id="bm_id3149667" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_STD_FONT:LB_IDX" id="bm_id3149667" localize="false"/>
<paragraph role="heading" id="hd_id3152463" xml-lang="en-US" level="3" l10n="U" oldref="13">Index</paragraph>
<paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW_COMBOBOX_TP_STD_FONT_LB_IDX">Specifies the font used for indexes, alphabetical indexes, and tables of contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_STD_FONT_CB_DOCONLY" id="bm_id3148577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_STD_FONT:CB_DOCONLY" id="bm_id3148577" localize="false"/>
<paragraph role="heading" id="hd_id3150103" xml-lang="en-US" level="3" l10n="U" oldref="15">Current document only</paragraph>
<paragraph role="paragraph" id="par_id3083444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW_CHECKBOX_TP_STD_FONT_CB_DOCONLY">Specifies that the settings apply to the current document only.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#standard"/>
diff --git a/helpcontent2/source/text/shared/optionen/01040301.xhp b/helpcontent2/source/text/shared/optionen/01040301.xhp
index a841edc9ef..8e320903c7 100755
--- a/helpcontent2/source/text/shared/optionen/01040301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040301.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040301.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index 0be229b14a..bfc17e6196 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01040400.xhp,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,15 +31,14 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Print</title>
-<filename>/text/shared/optionen/01040400.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="drucken">
+ <topic id="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Print</title>
+ <filename>/text/shared/optionen/01040400.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="drucken">
<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>pictures; printing</bookmark_value>
<bookmark_value>tables in text; printing</bookmark_value>
<bookmark_value>drawings; printing in text documents </bookmark_value>
@@ -59,70 +54,88 @@
<bookmark_value>reversing printing order</bookmark_value>
<bookmark_value>brochures; printing several</bookmark_value>
<bookmark_value>printing; brochures</bookmark_value>
-<bookmark_value>notes; printing in text</bookmark_value>
+<bookmark_value>comments; printing in text</bookmark_value>
<bookmark_value>printing; creating individual jobs</bookmark_value>
<bookmark_value>faxes;selecting a fax machine</bookmark_value>
</bookmark><comment>mw made "fax machine selection" a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/><paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#drucken1"/>
-</section>
-<paragraph role="note" id="par_id3153542" xml-lang="en-US" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent documents. If you only want to change the settings for the current document, use the <emph>Options</emph> button in the<emph> File - Print</emph> dialog.</paragraph>
-<paragraph role="heading" id="hd_id3156330" xml-lang="en-US" level="2" l10n="U" oldref="3">Contents</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/><paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="5">Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="7">Tables</paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="3" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="11">Controls</paragraph>
-<paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="13">Background</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/><paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="3" l10n="U" oldref="40">Print black</paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/><paragraph role="heading" id="hd_id8004394" xml-lang="en-US" level="3" l10n="NEW">Hidden text</paragraph>
-<paragraph role="paragraph" id="par_id2021546" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id5788750" localize="false"/><paragraph role="heading" id="hd_id2623981" xml-lang="en-US" level="3" l10n="NEW">Text placeholder</paragraph>
-<paragraph role="paragraph" id="par_id7242042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
-<paragraph role="heading" id="hd_id3151115" xml-lang="en-US" level="2" l10n="U" oldref="15">Pages</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/><paragraph role="heading" id="hd_id3150874" xml-lang="en-US" level="3" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3152885" xml-lang="en-US" level="3" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
-<paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/><paragraph role="heading" id="hd_id3148577" xml-lang="en-US" level="3" l10n="U" oldref="21">Reversed</paragraph>
-<paragraph role="paragraph" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order.</ahelp> The last page of the document will then be the first one printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/><paragraph role="heading" id="hd_id3147318" xml-lang="en-US" level="3" l10n="U" oldref="23">Brochure</paragraph>
-<paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
-<section id="brochure">
-<paragraph role="paragraph" id="par_id3149410" xml-lang="en-US" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the <emph>Right pages</emph> option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the <emph>Left pages</emph> option marked.</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/><paragraph role="heading" id="hd_id9475386" xml-lang="en-US" level="3" l10n="NEW">Right to left</paragraph>
-<paragraph role="paragraph" id="par_id7894222" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149300" xml-lang="en-US" level="2" l10n="U" oldref="26">Notes</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/><paragraph role="heading" id="hd_id3150095" xml-lang="en-US" level="3" l10n="U" oldref="28">None</paragraph>
-<paragraph role="paragraph" id="par_id3151320" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that notes in your document are not printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY" id="bm_id3153948" localize="false"/><paragraph role="heading" id="hd_id3155601" xml-lang="en-US" level="3" l10n="U" oldref="30">Notes only</paragraph>
-<paragraph role="paragraph" id="par_id3146988" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that notes in your document are printed, but not the actual text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END" id="bm_id3154272" localize="false"/><paragraph role="heading" id="hd_id3153839" xml-lang="en-US" level="3" l10n="U" oldref="32">End of document</paragraph>
-<paragraph role="paragraph" id="par_id3146789" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that notes are printed at the end of the document, after the actual text. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND" id="bm_id3157868" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="3" l10n="U" oldref="34">End of page</paragraph>
-<paragraph role="paragraph" id="par_id3154360" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that notes are printed on an extra page that follows each page containing notes.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148916" xml-lang="en-US" level="2" l10n="U" oldref="45">Other</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/><paragraph role="heading" id="hd_id4188055" xml-lang="en-US" level="3" l10n="NEW">Print automatically inserted blank pages</paragraph>
-<paragraph role="paragraph" id="par_id8295541" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/><paragraph role="heading" id="hd_id3145642" xml-lang="en-US" level="3" l10n="CHG" oldref="47">Create single print jobs</paragraph>
-<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/><paragraph role="heading" id="hd_id3156384" xml-lang="en-US" level="3" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
-<paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the <emph>Paper tray from printer settings </emph>option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/><paragraph role="heading" id="hd_id3147362" xml-lang="en-US" level="3" l10n="U" oldref="38">Fax</paragraph>
-<paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
</section>
-</body>
-</helpdocument>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#drucken1"/>
+ </section>
+<paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="2" l10n="U" oldref="3">Contents</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3145675" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="2" l10n="U" oldref="5">Graphics</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U" oldref="7">Tables</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id3151211" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="2" l10n="U" oldref="11">Controls</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id3154684" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="U" oldref="13">Background</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id3144761" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="40">Print black</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id342723" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="2" l10n="NEW">Hidden text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id5788750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="2" l10n="NEW">Text placeholder</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U" oldref="15">Pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="2" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="2" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="2" l10n="U" oldref="21">Reversed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="2" l10n="U" oldref="23">Brochure</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
+ <section id="brochure">
+ <paragraph xml-lang="en-US" id="par_id3149410" role="paragraph" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the "Front sides / right pages /odd pages" option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the "Back pages / left pages / even pages" option marked.</paragraph>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="2" l10n="NEW">Right to left</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7894222" role="paragraph" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U" oldref="26">Comments</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id3157848" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid=".">Specifies whether comments in your document are printed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U" oldref="45">Other</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id2646871" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="2" l10n="NEW">Print automatically inserted blank pages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="2" l10n="CHG" oldref="47">Create single print jobs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="2" l10n="U" oldref="38">Fax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01040500.xhp b/helpcontent2/source/text/shared/optionen/01040500.xhp
index ef40ee7d0f..3e8ba15e04 100644
--- a/helpcontent2/source/text/shared/optionen/01040500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040500.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,20 +62,20 @@
<paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="28">Defines the defaults for all newly created text tables in text documents.</paragraph>
</section>
<section id="opttabb">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_HEADER" id="bm_id3154123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER" id="bm_id3154123" localize="false"/>
<paragraph role="heading" id="hd_id3152922" xml-lang="en-US" level="3" l10n="U" oldref="29">Heading</paragraph>
<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_HEADER">Specifies that the first row of the table is formatted with the "Table heading" Paragraph Style.</ahelp></paragraph>
</section>
<section id="opttabc">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_REPEAT_HEADER" id="bm_id3154216" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER" id="bm_id3154216" localize="false"/>
<paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="31">Repeat on each page</paragraph>
<paragraph role="paragraph" id="par_id3149204" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_REPEAT_HEADER">Specifies whether the table heading is carried over onto the new page after a page break.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_DONT_SPLIT" id="bm_id3159149" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT" id="bm_id3159149" localize="false"/>
<paragraph role="heading" id="hd_id3125864" xml-lang="en-US" level="3" l10n="U" oldref="33">Do not split (not in HTML)</paragraph>
<paragraph role="paragraph" id="par_id3155429" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_DONT_SPLIT">Specifies that tables are not split by any type of text flow break.</ahelp> You can also find this option in menu <emph>Table - Table Properties - Text Flow</emph>.</paragraph>
<section id="opttabd">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_BORDER" id="bm_id3153091" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER" id="bm_id3153091" localize="false"/>
<paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="3" l10n="U" oldref="35">Border</paragraph>
<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_BORDER">Specifies that table cells have a border by default.</ahelp></paragraph>
</section>
@@ -88,18 +85,18 @@
<section id="opttabf">
<bookmark xml-lang="en-US" branch="hid/FN_SET_MODOPT_TBLNUMFMT" id="bm_id3219862" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TableNumberRecognition" id="bm_id3147434" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFORMATTING" id="bm_id3152577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING" id="bm_id3152577" localize="false"/>
<paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="3" l10n="U" oldref="39">Number recognition</paragraph>
<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFORMATTING">Specifies that numbers in a text table are recognized and formatted as numbers.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="41">If <emph>Number recognition</emph> is not marked, numbers are saved in text format and are automatically left-aligned.</paragraph>
</section>
<section id="opttabf1">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFMT_FORMATTING" id="bm_id3154729" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING" id="bm_id3154729" localize="false"/>
<paragraph role="heading" id="hd_id3155856" xml-lang="en-US" level="3" l10n="U" oldref="42">Number format recognition</paragraph>
<paragraph role="paragraph" id="par_id3159346" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMFMT_FORMATTING">If<emph> Number format recognition </emph>is not marked, only input in the format that has been set at the cell is accepted. Any other input resets the format to <emph>Text</emph>.</ahelp></paragraph>
</section>
<section id="opttabg">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMALIGNMENT" id="bm_id3149581" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT" id="bm_id3149581" localize="false"/>
<paragraph role="heading" id="hd_id3153876" xml-lang="en-US" level="3" l10n="U" oldref="44">Alignment</paragraph>
<paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW_CHECKBOX_TP_OPTTABLE_PAGE_CB_NUMALIGNMENT">Specifies that numbers are always bottom right aligned in the cell.</ahelp> If this field is not marked numbers are always top left aligned in the cell.</paragraph>
<paragraph role="note" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="46">Direct formatting is not influenced by the <emph>Alignment</emph> field. If you center align the cell contents directly, they remain centered irrespective of whether text or numbers are involved.</paragraph>
@@ -107,29 +104,29 @@
<paragraph role="heading" id="hd_id3154360" xml-lang="en-US" level="2" l10n="U" oldref="48">Keyboard handling</paragraph>
<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="3">Move cells</paragraph>
<paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="U" oldref="4">Defines the default settings for moving rows and columns with the keyboard. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWMOVE" id="bm_id3150042" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWMOVE" id="bm_id3150042" localize="false"/>
<paragraph role="heading" id="hd_id3155445" xml-lang="en-US" level="4" l10n="U" oldref="5">Row</paragraph>
<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWMOVE">Specifies the value to be used for moving a row.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLMOVE" id="bm_id3163806" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_COLMOVE" id="bm_id3163806" localize="false"/>
<paragraph role="heading" id="hd_id3150388" xml-lang="en-US" level="4" l10n="U" oldref="7">Column</paragraph>
<paragraph role="paragraph" id="par_id3155905" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLMOVE">Specifies the value to be used for moving a column.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155938" xml-lang="en-US" level="3" l10n="U" oldref="9">Insert</paragraph>
<paragraph role="paragraph" id="par_id3155176" xml-lang="en-US" l10n="U" oldref="10">Specifies the default settings for inserting rows and columns with the keyboard. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWINSERT" id="bm_id3154703" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWINSERT" id="bm_id3154703" localize="false"/>
<paragraph role="heading" id="hd_id3155333" xml-lang="en-US" level="4" l10n="U" oldref="11">Row</paragraph>
<paragraph role="paragraph" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWINSERT">Specifies the default value for inserting rows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLINSERT" id="bm_id3145767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTTABLE_PAGE:MF_COLINSERT" id="bm_id3145767" localize="false"/>
<paragraph role="heading" id="hd_id3155607" xml-lang="en-US" level="4" l10n="U" oldref="13">Column</paragraph>
<paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLINSERT">Specifies the default value for inserting columns.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150645" xml-lang="en-US" level="3" l10n="U" oldref="15">Behavior of rows/columns</paragraph>
<paragraph role="paragraph" id="par_id3150298" xml-lang="en-US" l10n="CHG" oldref="16">Determines the relative effect of rows and columns on adjacent rows or columns, as well as on the entire table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX" id="bm_id3159238" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIX" id="bm_id3159238" localize="false"/>
<paragraph role="heading" id="hd_id3149335" xml-lang="en-US" level="4" l10n="U" oldref="17">Fixed</paragraph>
<paragraph role="paragraph" id="par_id3151213" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX">Specifies that changes to a row or column only affect the corresponding adjacent area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP" id="bm_id3153269" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIXPROP" id="bm_id3153269" localize="false"/>
<paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="4" l10n="U" oldref="19">Fixed, proportional</paragraph>
<paragraph role="paragraph" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP">Specifies that changes to a row or column have an effect on the entire table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_VAR" id="bm_id3153234" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTTABLE_PAGE:RB_VAR" id="bm_id3153234" localize="false"/>
<paragraph role="heading" id="hd_id3150783" xml-lang="en-US" level="4" l10n="U" oldref="21">Variable</paragraph>
<paragraph role="paragraph" id="par_id3166423" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_VAR">Specifies that changes to a row or column affect the table size.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01040600.xhp b/helpcontent2/source/text/shared/optionen/01040600.xhp
index b868a8ac6d..bb8d6bffdb 100644
--- a/helpcontent2/source/text/shared/optionen/01040600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040600.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040600.xhp,v $
- * $Revision: 1.15.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,60 +70,60 @@
</section>
<paragraph role="heading" id="hd_id3144510" xml-lang="en-US" level="2" l10n="U" oldref="27">Display of</paragraph>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="CHG" oldref="28">Defines which non-printing characters are visible on screen. Activate the <link href="text/swriter/01/03100000.xhp" name="Non-printing Characters On/Off"><emph>Non-printing Characters</emph></link> icon on the <emph>Standard</emph> bar. All characters that you have selected on the <emph>Formatting Aids</emph> tab page will be displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_PARA" id="bm_id3150871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_PARA" id="bm_id3150871" localize="false"/>
<paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="3" l10n="U" oldref="29">Paragraph end</paragraph>
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_PARA">Specifies whether paragraph delimiters are displayed. The paragraph delimiters also contain paragraph format information.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SHYPH" id="bm_id3148453" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_SHYPH" id="bm_id3148453" localize="false"/>
<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3" l10n="U" oldref="31">Custom hyphens</paragraph>
<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SHYPH">Specifies whether user-defined delimiters are displayed. These are hidden delimiters that you enter within a word by pressing <switchinline select="sys"><caseinline select="MAC">Command+Hyphen(-)
</caseinline><defaultinline>Ctrl+Hyphen(-).</defaultinline></switchinline> Words with user-defined delimiters are only separated at the end of a line at the point where a user-defined delimiter has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SPACE" id="bm_id3149562" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_SPACE" id="bm_id3149562" localize="false"/>
<paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="3" l10n="U" oldref="33">Spaces</paragraph>
<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"/>
+<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+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"/>
+<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>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_BREAK" id="bm_id3150104" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_BREAK" id="bm_id3150104" localize="false"/>
<paragraph role="heading" id="hd_id3159154" xml-lang="en-US" level="3" l10n="U" oldref="39">Breaks</paragraph>
<paragraph role="paragraph" id="par_id3150874" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_BREAK">Displays all line breaks inserted with the Shift+Enter shortcut. These breaks create a new line, but do not start a new paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTSHDWCRSR_CB_CHAR_HIDDEN" id="bm_id3112582" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN" id="bm_id3112582" localize="false"/>
<paragraph role="heading" id="par_idN108E5" xml-lang="en-US" level="3" l10n="NEW">Hidden text<comment>UFI: new, although name of control is re-used, see spec "Hidden Text in Writer"</comment></paragraph>
<paragraph role="paragraph" id="par_idN108FB" xml-lang="en-US" l10n="CHG"><ahelp hid="sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN">Displays text that uses the character format "hidden", when <emph>View - Non-printing Characters</emph> is enabled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN" id="bm_id3153876" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTSHDWCRSR_CB_FLD_HIDDEN" id="bm_id5794244" localize="false"/>
+<!-- removed HID SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN -->
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN" id="bm_id5794244" localize="false"/>
<paragraph role="heading" id="hd_id3149481" xml-lang="en-US" level="3" l10n="CHG" oldref="41">Fields: Hidden text (not for HTML documents)<comment>UFI: this is the old "Hidden text" control renamed</comment></paragraph>
<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="CHG" oldref="42"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN">Displays text that is hidden by <emph>Conditional Text</emph> or <emph>Hidden Text</emph> fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN_PARA" id="bm_id3149377" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTSHDWCRSR_CB_FLD_HIDDEN_PARA" id="bm_id468764" localize="false"/>
+<!-- removed HID SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN_PARA -->
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN_PARA" id="bm_id468764" localize="false"/>
<paragraph role="heading" id="hd_id3149300" xml-lang="en-US" level="3" l10n="CHG" oldref="43">Fields: Hidden paragraphs (not for HTML documents)</paragraph>
<paragraph role="paragraph" id="par_id3149418" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HIDDEN_PARA">If you have inserted text using the <emph>Hidden Paragraph</emph> field, specifies whether to display the hidden paragraph.</ahelp> This option has the same function as the menu commands <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/01/03140000.xhp" name="View - Hidden Paragraphs">View - Hidden Paragraphs</link>
</caseinline><defaultinline>View - Hidden Paragraphs</defaultinline></switchinline> available in open text documents.</paragraph>
<paragraph role="heading" id="hd_id3156180" xml-lang="en-US" level="2" l10n="U" oldref="3">Direct cursor (not for HTML documents)</paragraph>
<paragraph role="paragraph" id="par_id3146900" xml-lang="en-US" l10n="CHG" oldref="4">Defines all the properties of the direct cursor.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF" id="bm_id3150327" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF" id="bm_id3150327" localize="false"/>
<paragraph role="heading" id="hd_id3154273" xml-lang="en-US" level="3" l10n="U" oldref="5">Direct cursor</paragraph>
<paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF">Activates the direct cursor.</ahelp> You can also activate this function by clicking the <switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/02/18130000.xhp" name="Direct Cursor On/Off">Direct Cursor On/Off</link>
</caseinline><defaultinline>Direct Cursor On/Off</defaultinline></switchinline> icon in a text document.</paragraph>
<paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="2" l10n="U" oldref="7">Insert (not for HTML document)</paragraph>
<paragraph role="paragraph" id="par_id3149020" xml-lang="en-US" l10n="U" oldref="8">Defines the insert options for the direct cursor. If you click at any position in your document, a new paragraph can be written or inserted exactly at this position. The properties of this paragraph depend on the selected option. You can select from the following options:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN" id="bm_id3154755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN" id="bm_id3154755" localize="false"/>
<paragraph role="heading" id="hd_id3148995" xml-lang="en-US" level="3" l10n="U" oldref="9">Paragraph alignment</paragraph>
<paragraph role="paragraph" id="par_id3156384" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN">Sets the paragraph alignment when the direct cursor is used. Depending on where the mouse is clicked, the paragraph is formatted left aligned, centered or right aligned. The cursor before the mouse-click shows, by means of a triangle, which alignment is set. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT" id="bm_id3151249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT" id="bm_id3151249" localize="false"/>
<paragraph role="heading" id="hd_id3150387" xml-lang="en-US" level="3" l10n="U" oldref="11">Left paragraph margin</paragraph>
<paragraph role="paragraph" id="par_id3151188" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT">When the direct cursor is used, the left paragraph indent is set at the horizontal position where you click the direct cursor. The paragraph is left aligned. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB" id="bm_id3153966" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB" id="bm_id3153966" localize="false"/>
<paragraph role="heading" id="hd_id3145147" xml-lang="en-US" level="3" l10n="U" oldref="13">Tabs</paragraph>
<paragraph role="paragraph" id="par_id3155174" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB">When the direct cursor is used, as many tabs as necessary are added in the new paragraph until the clicked position is reached.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE" id="bm_id3146917" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE" id="bm_id3146917" localize="false"/>
<paragraph role="heading" id="hd_id3166449" xml-lang="en-US" level="3" l10n="U" oldref="15">Tabs and Spaces</paragraph>
<paragraph role="paragraph" id="par_id3155904" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE">When the Direct Cursor is used, a corresponding number of tabs and spaces are inserted in the new paragraph as necessary until the clicked position is reached.</ahelp></paragraph>
<paragraph role="note" id="par_id3149964" xml-lang="en-US" l10n="U" oldref="17">All insert options refer only to the current paragraph generated with the Direct Cursor.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT" id="bm_id3151275" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT" id="bm_id3151275" localize="false"/>
<paragraph role="heading" id="hd_id3146134" xml-lang="en-US" level="3" l10n="U" oldref="24">Cursor in protected areas - Enabled</paragraph>
<paragraph role="paragraph" id="par_id3147508" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SW:CHECKBOX:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT">Specifies that you can set the cursor in a protected area, but cannot make any changes.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01040700.xhp b/helpcontent2/source/text/shared/optionen/01040700.xhp
index 3d06e10947..83a265ca6d 100755
--- a/helpcontent2/source/text/shared/optionen/01040700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040700.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040700.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,52 +29,55 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01040700xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changes</title>
-<filename>/text/shared/optionen/01040700.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T16:30:58">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="aenderungen">
+ <topic id="textsharedoptionen01040700xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Changes</title>
+ <filename>/text/shared/optionen/01040700.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="aenderungen">
<bookmark xml-lang="en-US" branch="hid/HID_REDLINE_OPT" id="bm_id3149795" localize="false"/>
-<paragraph role="heading" id="hd_id3153823" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040700.xhp" name="Changes">Changes</link></paragraph>
-<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_REDLINE_OPT">Defines the appearance of changes in the document.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156153" xml-lang="en-US" l10n="U" oldref="27">To record or show changes, with the text or spreadsheet document open, choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link>.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#registeraenderungen"/>
-</section>
-<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="3">Text display</paragraph>
-<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for displaying recorded changes. Select the type of change with the radio buttons, and the corresponding display attribute and color. The preview field shows the effect of the selected display options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_INS_ATTR" id="bm_id3153896" localize="false"/>
-<paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="3" l10n="U" oldref="21">Insertions / Attributes</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_INS_ATTR">Specifies how changes in the document are displayed when text is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_ATTR" id="bm_id3150358" localize="false"/>
-<paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="3" l10n="U" oldref="23">Deletions / Attributes</paragraph>
-<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_ATTR">Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_ATTR" id="bm_id3149203" localize="false"/>
-<paragraph role="heading" id="hd_id3148674" xml-lang="en-US" level="3" l10n="U" oldref="25">Changed attributes / Attributes</paragraph>
-<paragraph role="paragraph" id="par_id3151042" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_ATTR">Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_INS_COL" id="bm_id3147084" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_COL" id="bm_id3154217" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_COL" id="bm_id3149810" localize="false"/>
-<paragraph role="heading" id="hd_id3153105" xml-lang="en-US" level="3" l10n="U" oldref="28">Color</paragraph>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_COL">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by $[officename], then modified to match to the author of each change.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145607" xml-lang="en-US" level="2" l10n="U" oldref="15">Lines changed</paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="16">To indicate which lines of the text have been changed, you can define a mark that appears in the left or right page margin.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS" id="bm_id3161831" localize="false"/>
-<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="17">Mark</paragraph>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS">Defines if and where changed lines in the document are marked.</ahelp> You can set the markings so that they always appear on the left or right page margin, or on even or uneven pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL" id="bm_id3148618" localize="false"/>
-<paragraph role="heading" id="hd_id3163713" xml-lang="en-US" level="3" l10n="U" oldref="19">Color</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL">Specifies the color for highlighting the changed lines in the text.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3153823" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040700.xhp" name="Changes">Changes</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149416" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_REDLINE_OPT">Defines the appearance of changes in the document.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156153" role="paragraph" l10n="U" oldref="27">To record or show changes in your text or spreadsheet document, choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes - Record</emph></link> or <emph>Edit - Changes - Show</emph>.</paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#registeraenderungen"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3155419" role="heading" level="2" l10n="U" oldref="3">Text display</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144510" role="paragraph" l10n="U" oldref="4">Defines the settings for displaying recorded changes. Select the type of change and the corresponding display attribute and color. The preview field shows the effect of the selected display options.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_INS_ATTR" id="bm_id3153896" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148550" role="heading" level="3" l10n="U"
+ oldref="21">Insertions / Attributes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154758" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_INS_ATTR">Specifies how changes in the document are displayed when text is inserted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_DEL_ATTR" id="bm_id3150358" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152812" role="heading" level="3" l10n="U"
+ oldref="23">Deletions / Attributes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154365" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_DEL_ATTR">Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_CHG_ATTR" id="bm_id3149203" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148674" role="heading" level="3" l10n="U"
+ oldref="25">Changed attributes / Attributes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151042" role="paragraph" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_ATTR">Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_INS_COL" id="bm_id3147084" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_DEL_COL" id="bm_id3154217" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_CHG_COL" id="bm_id3149810" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153105" role="heading" level="3" l10n="U"
+ oldref="28">Color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145419" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SW_LISTBOX_TP_REDLINE_OPT_LB_CHG_COL">You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by $[officename], then modified to match to the author of each change.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145607" role="heading" level="2" l10n="U"
+ oldref="15">Lines changed</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="16">To indicate which lines of the text have been changed, you can define a mark that appears in the left or right page margin.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_MARKPOS" id="bm_id3161831" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145785" role="heading" level="3" l10n="U"
+ oldref="17">Mark</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS">Defines if and where changed lines in the document are marked.</ahelp> You can set the markings so that they always appear on the left or right page margin, or on the outer or inner margin.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_REDLINE_OPT:LB_LC_COL" id="bm_id3148618" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163713" role="heading" level="3" l10n="U"
+ oldref="19">Color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL">Specifies the color for highlighting the changed lines in the text.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01040900.xhp b/helpcontent2/source/text/shared/optionen/01040900.xhp
index 9725b80aac..e0b3ad9d32 100755
--- a/helpcontent2/source/text/shared/optionen/01040900.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040900.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01040900.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,14 +63,14 @@
<section id="aktu">
<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="2" l10n="U" oldref="45">Update</paragraph>
<paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3" l10n="U" oldref="3">Update links when loading</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCPAGE_LAYOUT_RB_ALWAYS" id="bm_id3150985" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_ALWAYS" id="bm_id3149416" localize="false"/><paragraph role="heading" id="hd_id3155136" xml-lang="en-US" level="4" l10n="U" oldref="4">Always</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_LAYOUT:RB_ALWAYS" id="bm_id3150985" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS" id="bm_id3149416" localize="false"/><paragraph role="heading" id="hd_id3155136" xml-lang="en-US" level="4" l10n="U" oldref="4">Always</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_ALWAYS">Always updates links while loading a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCPAGE_LAYOUT_RB_REQUEST" id="bm_id3153542" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_REQUEST" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="4" l10n="U" oldref="5">On request</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_LAYOUT:RB_REQUEST" id="bm_id3153542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="4" l10n="U" oldref="5">On request</paragraph>
<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_REQUEST">Updates links only on request while loading a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCPAGE_LAYOUT_RB_NEVER" id="bm_id3147530" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_NEVER" id="bm_id3149669" localize="false"/><paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="4" l10n="U" oldref="6">Never</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER" id="bm_id3147530" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER" id="bm_id3149669" localize="false"/><paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="4" l10n="U" oldref="6">Never</paragraph>
<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_NEVER">Links are never updated while loading a document.</ahelp></paragraph>
</section>
<paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3" l10n="U" oldref="25">Automatically</paragraph>
@@ -81,7 +78,7 @@
<case select="WRITER"><paragraph role="paragraph" id="par_id8801538" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/06990000.xhp">To update fields manually</link></paragraph><comment>i81240</comment>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS" id="bm_id3153380" localize="false"/><paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="4" l10n="U" oldref="21">Fields</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS" id="bm_id3153380" localize="false"/><paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="4" l10n="U" oldref="21">Fields</paragraph>
<paragraph role="paragraph" id="par_id3154071" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS">The contents of all fields are updated automatically whenever the screen contents are displayed as new. Even with this box unchecked, some fields are updated each time a special condition takes place.</ahelp> The following table lists the fields that are updated without regard to this checkbox.</paragraph>
<table id="tbl_id4289681">
<tablerow>
@@ -149,12 +146,12 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="4" l10n="U" oldref="22">Charts</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS" id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="4" l10n="U" oldref="22">Charts</paragraph>
<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS">Specifies whether to automatically update charts. Whenever a Writer table cell value changes and the cursor leaves that cell, the chart that displays the cell value is updated automatically.</ahelp><comment>see message "[sw-features] changed/CWS chart2mst3 : Automatic update for charts in Writer" by Thomas Lange</comment></paragraph>
<paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="2" l10n="U" oldref="46">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTLOAD_PAGE_LB_METRIC" id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3153364" xml-lang="en-US" level="3" l10n="U" oldref="31">Measurement unit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC" id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3153364" xml-lang="en-US" level="3" l10n="U" oldref="31">Measurement unit</paragraph>
<paragraph role="paragraph" id="par_id3146147" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="SW_LISTBOX_TP_OPTLOAD_PAGE_LB_METRIC">Specifies the <link href="text/shared/00/00000003.xhp#metrik" name="unit of measurement">unit of measurement</link> for text documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_METRICFIELD_TP_OPTLOAD_PAGE_MF_TAB" id="bm_id3154729" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab stops</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB" id="bm_id3154729" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="33">Tab stops</paragraph>
<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW_METRICFIELD_TP_OPTLOAD_PAGE_MF_TAB">Specifies the spacing between the individual tab stops.</ahelp> The horizontal ruler displays the selected spacing.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01041000.xhp b/helpcontent2/source/text/shared/optionen/01041000.xhp
index e4bd7d8df6..0e93dac57e 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01041000.xhp,v $
- * $Revision: 1.16.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,28 +29,28 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedoptionen01041000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Compatibility</title>
-<filename>/text/shared/optionen/01041000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedoptionen01041000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Compatibility</title>
+ <filename>/text/shared/optionen/01041000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3577990"><bookmark_value>Word documents;compatibility</bookmark_value>
-<bookmark_value>importing;compatibility settings for text import</bookmark_value>
-<bookmark_value>options;compatibility (Writer)</bookmark_value>
-<bookmark_value>compatibility settings for MS Word import</bookmark_value>
-<bookmark_value>Microsoft Office;importing Word documents</bookmark_value>
-<bookmark_value>layout;importing Word documents</bookmark_value>
-<bookmark_value>formatting;printer metrics (Writer)</bookmark_value>
-<bookmark_value>metrics;document formatting (Writer)</bookmark_value>
-<bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
+ <bookmark_value>importing;compatibility settings for text import</bookmark_value>
+ <bookmark_value>options;compatibility (Writer)</bookmark_value>
+ <bookmark_value>compatibility settings for MS Word import</bookmark_value>
+ <bookmark_value>Microsoft Office;importing Word documents</bookmark_value>
+ <bookmark_value>layout;importing Word documents</bookmark_value>
+ <bookmark_value>formatting;printer metrics (Writer)</bookmark_value>
+ <bookmark_value>metrics;document formatting (Writer)</bookmark_value>
+ <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>
+<paragraph xml-lang="en-US" id="par_idN10607" role="heading" 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>
@@ -62,21 +59,21 @@
</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"/>
-<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>
+<!-- removed HID SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS -->
+<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"/>
+<!-- removed HID SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST -->
<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"/>
+<!-- removed HID SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART -->
<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"/>
+<!-- removed HID SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT -->
<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 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>
@@ -104,7 +101,7 @@
<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"/>
+<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>
diff --git a/helpcontent2/source/text/shared/optionen/01041100.xhp b/helpcontent2/source/text/shared/optionen/01041100.xhp
index c1bf1decf4..86f739a77c 100755
--- a/helpcontent2/source/text/shared/optionen/01041100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01041100.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,38 +66,38 @@
<paragraph xml-lang="en-US" id="par_idN1058F" role="heading" level="2" l10n="NEW">Caption</paragraph>
<paragraph xml-lang="en-US" id="par_idN10593" role="paragraph" l10n="NEW">Defines the options to be applied to the selected object type. These options are identical to those in the <emph>Insert - Caption</emph> menu, which is available when an object is selected. Below the settings is a preview of the object category, together with numbering type.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_COMBOBOX_TP_OPTCAPTION_PAGE_BOX_CATEGORY" id="bm_id3156330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:TP_OPTCAPTION_PAGE:BOX_CATEGORY" id="bm_id3156330" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="3" l10n="U" oldref="5">Category</paragraph>
<paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="13"><ahelp hid="SW_COMBOBOX_TP_OPTCAPTION_PAGE_BOX_CATEGORY">Specifies the category of the selected object.</ahelp><comment>UFI: copied text from optionen/01040801</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_FORMAT" id="bm_id3149236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:BOX_FORMAT" id="bm_id3149236" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155628" role="heading" level="3" l10n="U" oldref="6">Numbering</paragraph>
<paragraph xml-lang="en-US" id="par_id3149233" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_FORMAT">Specifies the type of numbering required.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_OPTCAPTION_PAGE_ED_SEPARATOR" id="bm_id3154071" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OPTCAPTION_PAGE:ED_SEPARATOR" id="bm_id3154071" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_OPTCAPTION_PAGE_EDT_TEXT" id="bm_id4456617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OPTCAPTION_PAGE:EDT_TEXT" id="bm_id4456617" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149457" role="heading" level="3" l10n="U" oldref="10">Separator</paragraph>
<paragraph xml-lang="en-US" id="par_idN106E2" role="paragraph" l10n="U" oldref="17"><ahelp hid="SW_EDIT_TP_OPTCAPTION_PAGE_ED_SEPARATOR">Defines the character to be displayed after the number of the heading or chapter level.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_POS" id="bm_id3153627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:BOX_POS" id="bm_id3153627" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="3" l10n="U" oldref="8">Position</paragraph>
<paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="15"><ahelp hid="SW_LISTBOX_TP_OPTCAPTION_PAGE_BOX_POS">Determines the position of the caption with respect to the object.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1064E" role="heading" level="2" l10n="NEW">Numbering captions by chapter</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_OPTCAPTION_PAGE_LB_LEVEL" id="bm_id3145068" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:LB_LEVEL" id="bm_id3145068" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145609" role="heading" level="3" l10n="U" oldref="9">Level</paragraph>
<paragraph xml-lang="en-US" id="par_id3153898" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW_LISTBOX_TP_OPTCAPTION_PAGE_LB_LEVEL">Specifies the headings or chapter levels where you want the numbering to start.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3153524" role="paragraph" l10n="U" oldref="17"><ahelp hid="SW_EDIT_TP_OPTCAPTION_PAGE_ED_SEPARATOR">Defines the character to be displayed after the number of the heading or chapter level.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN106A8" role="heading" level="2" l10n="NEW">Category and frame format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE" id="bm_id2708517" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTCAPTION_PAGE:LB_CHARSTYLE" id="bm_id2708517" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="3" l10n="NEW">Character style</paragraph>
<paragraph xml-lang="en-US" id="par_idN106B4" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the character style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR" id="bm_id3149820" localize="false"/>
+<!-- removed HID SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR -->
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTCAPTION_PAGE_CB_APPLYBORDER" id="bm_id346995" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER" id="bm_id346995" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3143280" role="heading" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph>
<paragraph xml-lang="en-US" id="par_id3149826" role="paragraph" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/optionen/01050000.xhp b/helpcontent2/source/text/shared/optionen/01050000.xhp
index 8e820974a4..cb0cc70bfa 100755
--- a/helpcontent2/source/text/shared/optionen/01050000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,7 +40,7 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_SW_ONLINEOPTIONS" id="bm_id3148491" localize="false"/>
+<!-- removed HID SID_SW_ONLINEOPTIONS -->
<paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Writer/Web Options</paragraph>
<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="2">
<variable id="webbrowser"><ahelp hid="SID_SW_ONLINEOPTIONS">Defines the basic settings for $[officename] documents in HTML format.</ahelp>
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp
index 06f8cf0662..5c592e8461 100644
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050100.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,80 +29,97 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01050100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Grid</title>
-<filename>/text/shared/optionen/01050100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="raster">
+ <topic id="textsharedoptionen01050100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Grid</title>
+ <filename>/text/shared/optionen/01050100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="raster">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147226"><bookmark_value>grids; defaults (Writer/Calc)</bookmark_value>
-<bookmark_value>defaults; grids (Writer/Calc)</bookmark_value>
-<bookmark_value>snap grid defaults (Writer/Calc)</bookmark_value>
+ <bookmark_value>defaults; grids (Writer/Calc)</bookmark_value>
+ <bookmark_value>snap grid defaults (Writer/Calc)</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_GRID" id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3147226" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01050100.xhp" name="Grid">Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_GRID">Specifies the settings for the configurable grid on your document pages. This grid helps you determine the exact position of your objects. You can also set this grid in line with the "magnetic" snap grid.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#raster"/>
-</section>
-<paragraph role="heading" id="hd_id3153749" xml-lang="en-US" level="2" l10n="U" oldref="11">Grid</paragraph>
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="12">Specifies the subdivision of the grid. You have the option of using different <link href="text/shared/00/00000003.xhp#metrik" name="units of measure">units of measure</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP" id="bm_id3150669" localize="false"/><paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="3" l10n="U" oldref="5">Snap to grid</paragraph>
-<section id="rasterfang">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp> To change the status of the snap grip only for the current action, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key
+<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_GRID" id="bm_id3155552" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01050100.xhp" name="Grid">Grid</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_GRID">Specifies the settings for the configurable grid on your document pages. This grid helps you determine the exact position of your objects. You can also set this grid in line with the "magnetic" snap grid.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#raster"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3153749" role="heading" level="2" l10n="U"
+ oldref="11">Grid</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP" id="bm_id3150669" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145382" role="heading" level="3" l10n="U" oldref="5">Snap to grid</paragraph>
+ <section id="rasterfang">
+ <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp> To change the status of the snap grip only for the current action, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key
</caseinline><defaultinline>Ctrl key</defaultinline></switchinline>.</paragraph>
-</section>
+ </section>
<bookmark xml-lang="en-US" branch="hid/SID_GRID_VISIBLE" id="bm_id8442192" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GridVisible" id="bm_id3148473" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE" id="bm_id3149795" localize="false"/><paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="7">Visible grid</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="rastersicht"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE">Specifies whether to display the grid.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE" id="bm_id3149795" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Visible grid</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="CHG" oldref="8"><variable id="rastersicht"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE">Specifies whether to display the grid.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
+ <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
</variable>
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
+ <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
</variable>
</caseinline></switchinline></paragraph>
-<section id="aufun">
-<paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="36">Resolution</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_DRAW_X" id="bm_id3151041" localize="false"/><paragraph role="heading" id="hd_id3149203" xml-lang="en-US" level="3" l10n="U" oldref="13">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_DRAW_X">Defines the unit of measure for the spacing between grid points on the X-axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y" id="bm_id3156280" localize="false"/><paragraph role="heading" id="hd_id3150447" xml-lang="en-US" level="3" l10n="U" oldref="17">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y">Defines the grid points spacing in the desired unit of measurement on the Y-axis.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="37">Subdivision</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X" id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3153368" xml-lang="en-US" level="3" l10n="U" oldref="15">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X">Specify the number of intermediate points between grid points on the X-axis.</ahelp><comment>UFI: see #i39831#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y" id="bm_id3147428" localize="false"/><paragraph role="heading" id="hd_id3147441" xml-lang="en-US" level="3" l10n="U" oldref="19">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y">Specify the number of intermediate points between grid points on the Y-axis.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE" id="bm_id3153138" localize="false"/><paragraph role="heading" id="hd_id3149667" xml-lang="en-US" level="3" l10n="U" oldref="9">Synchronize axes</paragraph>
-<paragraph role="paragraph" id="par_id3147350" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE">Specifies whether to change the current grid settings symmetrically.</ahelp> The resolution and subdivision for the X and Y axes remain the same.</paragraph>
-<paragraph role="paragraph" id="par_id3146121" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="DRAW">There are additional commands on the context menu of a page:
+ <section id="aufun">
+ <paragraph xml-lang="en-US" id="hd_id3154684" role="heading" level="2" l10n="U"
+ oldref="36">Resolution</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X" id="bm_id3151041" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149203" role="heading" level="3" l10n="U"
+ oldref="13">Horizontal</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_DRAW_X">Defines the unit of measure for the spacing between grid points on the X-axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y" id="bm_id3156280" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150447" role="heading" level="3" l10n="U"
+ oldref="17">Vertical</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148923" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y">Defines the grid points spacing in the desired unit of measurement on the Y-axis.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147228" role="heading" level="2" l10n="U"
+ oldref="37">Subdivision</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X" id="bm_id3145785" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153368" role="heading" level="3" l10n="U"
+ oldref="15">Horizontal</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X">Specify the number of intermediate points between grid points on the X-axis.</ahelp><comment>UFI: see #i39831#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y" id="bm_id3147428" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147441" role="heading" level="3" l10n="U"
+ oldref="19">Vertical</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="CHG" oldref="20"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y">Specify the number of intermediate points between grid points on the Y-axis.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE" id="bm_id3153138" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149667" role="heading" level="3" l10n="U" oldref="9">Synchronize axes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147350" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE">Specifies whether to change the current grid settings symmetrically.</ahelp> The resolution and subdivision for the X and Y axes remain the same.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146121" role="paragraph" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="DRAW">There are additional commands on the context menu of a page:
</caseinline><caseinline select="IMPRESS">There are additional commands on the context menu of a page:
</caseinline></switchinline></paragraph>
-</section>
+ </section>
<bookmark xml-lang="en-US" branch="hid/SID_GRID_FRONT" id="bm_id8062547" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id3147319" localize="false"/><paragraph role="heading" id="hd_id3146984" xml-lang="en-US" level="2" l10n="U" oldref="32"><switchinline select="appl"><caseinline select="DRAW">Grid to Front
+<bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id3147319" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146984" role="heading" level="2" l10n="U"
+ oldref="32"><switchinline select="appl"><caseinline select="DRAW">Grid to Front
</caseinline><caseinline select="IMPRESS">Grid to Front
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="CHG" oldref="33"><switchinline select="appl"><caseinline select="DRAW">Sets the visible grid in front of all objects.
+ <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="CHG" oldref="33"><switchinline select="appl"><caseinline select="DRAW">Sets the visible grid in front of all objects.
</caseinline><caseinline select="IMPRESS">Sets the visible grid in front of all objects.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id4122135" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the visible grid in front of all objects.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id4122135" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the visible grid in front of all objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_FRONT" id="bm_id6135046" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/><paragraph role="heading" id="hd_id3149419" xml-lang="en-US" level="2" l10n="U" oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front
+<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149419" role="heading" level="2" l10n="U"
+ oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front
</caseinline><caseinline select="IMPRESS">Snap Lines to Front
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150592" xml-lang="en-US" l10n="CHG" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of all objects.
+ <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="CHG" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of all objects.
</caseinline><caseinline select="IMPRESS">Sets the snap lines in front of all objects.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id1251869" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the snap lines in front of all objects.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id984221" xml-lang="en-US" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id1251869" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the snap lines in front of all objects.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01050300.xhp b/helpcontent2/source/text/shared/optionen/01050300.xhp
index 91bd7cd2b5..8c5c7faaa9 100755
--- a/helpcontent2/source/text/shared/optionen/01050300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050300.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01050300.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01060000.xhp b/helpcontent2/source/text/shared/optionen/01060000.xhp
index a9ce0e6cf2..4a14e09704 100644
--- a/helpcontent2/source/text/shared/optionen/01060000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 66fec37911..761436676d 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -1,17 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01060100.xhp,v $
- * $Revision: 1.15.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,135 +29,151 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedoptionen01060100xml" indexer="include">
-<title id="tit" xml-lang="en-US">View</title>
-<filename>/text/shared/optionen/01060100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="inhalte">
+ <topic id="textsharedoptionen01060100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">View</title>
+ <filename>/text/shared/optionen/01060100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="inhalte">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147242"><bookmark_value>cells; showing grid lines (Calc)</bookmark_value>
-<bookmark_value>borders; cells on screen (Calc)</bookmark_value>
-<bookmark_value>grids; displaying lines (Calc)</bookmark_value>
-<bookmark_value>colors; grid lines and cells (Calc)</bookmark_value>
-<bookmark_value>page breaks; displaying (Calc)</bookmark_value>
-<bookmark_value>guides; showing (Calc)</bookmark_value>
-<bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
-<bookmark_value>displaying; zero values (Calc)</bookmark_value>
-<bookmark_value>zero values; displaying (Calc)</bookmark_value>
-<bookmark_value>displaying; notes (Calc)</bookmark_value>
-<bookmark_value>notes; displaying (Calc)</bookmark_value>
-<bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
-<bookmark_value>cells; formatting without effect (Calc)</bookmark_value>
-<bookmark_value>cells; coloring (Calc)</bookmark_value>
-<bookmark_value>anchors; displaying (Calc)</bookmark_value>
-<bookmark_value>colors;restriction (Calc)</bookmark_value>
-<bookmark_value>text overflow in spreadsheet cells</bookmark_value>
-<bookmark_value>references; displaying in color (Calc)</bookmark_value>
-<bookmark_value>objects; displaying in spreadsheets</bookmark_value>
-<bookmark_value>pictures; displaying in Calc</bookmark_value>
-<bookmark_value>charts; displaying (Calc)</bookmark_value>
-<bookmark_value>draw objects; displaying (Calc)</bookmark_value>
-<bookmark_value>row headers; displaying (Calc)</bookmark_value>
-<bookmark_value>column headers; displaying (Calc)</bookmark_value>
-<bookmark_value>scrollbars; displaying (Calc)</bookmark_value>
-<bookmark_value>sheet tabs; displaying</bookmark_value>
-<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_value>borders; cells on screen (Calc)</bookmark_value>
+ <bookmark_value>grids; displaying lines (Calc)</bookmark_value>
+ <bookmark_value>colors; grid lines and cells (Calc)</bookmark_value>
+ <bookmark_value>page breaks; displaying (Calc)</bookmark_value>
+ <bookmark_value>guides; showing (Calc)</bookmark_value>
+ <bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
+ <bookmark_value>displaying; zero values (Calc)</bookmark_value>
+ <bookmark_value>zero values; displaying (Calc)</bookmark_value>
+ <bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
+ <bookmark_value>cells; formatting without effect (Calc)</bookmark_value>
+ <bookmark_value>cells; coloring (Calc)</bookmark_value>
+ <bookmark_value>anchors; displaying (Calc)</bookmark_value>
+ <bookmark_value>colors;restriction (Calc)</bookmark_value>
+ <bookmark_value>text overflow in spreadsheet cells</bookmark_value>
+ <bookmark_value>references; displaying in color (Calc)</bookmark_value>
+ <bookmark_value>objects; displaying in spreadsheets</bookmark_value>
+ <bookmark_value>pictures; displaying in Calc</bookmark_value>
+ <bookmark_value>charts; displaying (Calc)</bookmark_value>
+ <bookmark_value>draw objects; displaying (Calc)</bookmark_value>
+ <bookmark_value>row headers; displaying (Calc)</bookmark_value>
+ <bookmark_value>column headers; displaying (Calc)</bookmark_value>
+ <bookmark_value>scrollbars; displaying (Calc)</bookmark_value>
+ <bookmark_value>sheet tabs; displaying</bookmark_value>
+ <bookmark_value>tabs; displaying sheet tabs</bookmark_value>
+ <bookmark_value>outlines;outline symbols</bookmark_value>
+</bookmark><comment>MW copied "displaying;comments" over to Calc guide note_insert.xhp and deleted "comments;displaying"</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>
-<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"/>
-</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>
-<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.
+<paragraph xml-lang="en-US" id="hd_id3150445" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153988" role="paragraph" 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"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3153682" role="heading" level="2" l10n="U"
+ oldref="28">Visual aids</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" 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 xml-lang="en-US" id="hd_id3147242" role="heading" level="3" l10n="U"
+ oldref="30">Grid lines</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" 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"/>
+<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>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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>
+<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><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - 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 xml-lang="en-US" id="hd_id3152349" role="heading" level="3" l10n="U"
+ oldref="34">Page breaks</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151245" role="paragraph" 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 xml-lang="en-US" id="hd_id3149669" role="heading" level="3" l10n="U"
+ oldref="36">Guides while moving</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" 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 xml-lang="en-US" id="hd_id3150358" role="heading" level="3" l10n="U"
+ oldref="38">Simple handles</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154140" role="paragraph" 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 xml-lang="en-US" id="hd_id3149202" role="heading" level="3" l10n="U"
+ oldref="40">Large handles</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" 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 xml-lang="en-US" id="hd_id3152920" role="heading" level="2" l10n="U" oldref="3">Display</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3125864" role="paragraph" 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 xml-lang="en-US" id="hd_id3154218" role="heading" level="3" l10n="U" oldref="5">Formulas</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150440" role="paragraph" 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 xml-lang="en-US" id="hd_id3155132" role="heading" level="3" l10n="U" oldref="7">Zero values</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" 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">Comment 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 comment exists. The comment will be shown only when you enable tips under <emph>%PRODUCTNAME - General</emph> in the Options dialog box.</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>
-<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 xml-lang="en-US" id="par_id3150487" role="paragraph" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a comment permanently, select the <emph>Show comment</emph> command from the cell's context menu.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149667" role="paragraph" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</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="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 show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</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>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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>
-<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>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANCHOR" id="bm_id3146972" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3157846" role="heading" level="3" l10n="U"
+ oldref="14">Anchor</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147494" role="paragraph" 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 xml-lang="en-US" id="hd_id3146898" role="heading" level="3" l10n="U"
+ oldref="26">Text overflow</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" 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 xml-lang="en-US" id="hd_id3150327" role="heading" level="3" l10n="U"
+ oldref="54">Show references in color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153766" role="paragraph" 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 xml-lang="en-US" id="hd_id3155444" role="heading" level="2" l10n="U"
+ oldref="16">Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148405" role="paragraph" 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 xml-lang="en-US" id="hd_id3150043" role="heading" level="3" l10n="U"
+ oldref="18">Objects/Graphics</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163549" role="paragraph" 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 xml-lang="en-US" id="hd_id3151249" role="heading" level="3" l10n="U"
+ oldref="20">Charts</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" 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 xml-lang="en-US" id="hd_id3154703" role="heading" level="3" l10n="U"
+ oldref="22">Drawing objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155959" role="paragraph" 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 xml-lang="en-US" id="hd_id0909200810585828" role="heading" 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 xml-lang="en-US" id="hd_id0909200810585881" role="heading" level="3" l10n="NEW">Synchronize sheets</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0909200810585870" role="paragraph" 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 xml-lang="en-US" id="hd_id3153920" role="heading" level="2" l10n="U"
+ oldref="42">Window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154661" role="paragraph" 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 xml-lang="en-US" id="hd_id3149923" role="heading" level="3" l10n="U"
+ oldref="44">Column/Row headers</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149816" role="paragraph" 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 xml-lang="en-US" id="hd_id3154205" role="heading" level="3" l10n="U"
+ oldref="46">Horizontal scrollbar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155578" role="paragraph" 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 xml-lang="en-US" id="hd_id3148422" role="heading" level="3" l10n="U"
+ oldref="48">Vertical scrollbar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147128" role="paragraph" 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 xml-lang="en-US" id="hd_id3150826" role="heading" level="3" l10n="U"
+ oldref="50">Sheet tabs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154658" role="paragraph" 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>
-<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>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_OUTLINE" id="bm_id3154199" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152584" role="heading" level="3" l10n="U"
+ oldref="52">Outline symbols</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145135" role="paragraph" 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>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01060300.xhp b/helpcontent2/source/text/shared/optionen/01060300.xhp
index cc9820e737..6c623fdec1 100755
--- a/helpcontent2/source/text/shared/optionen/01060300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060300.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060300.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,31 +58,31 @@
<embed href="text/shared/00/00000406.xhp#tabelleeingabe"/>
</section>
<paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="2" l10n="U" oldref="24">Metrics</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT" id="bm_id3147210" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="20">Measurement unit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_LAYOUT:LB_UNIT" id="bm_id3147210" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="20">Measurement unit</paragraph>
<paragraph role="paragraph" id="par_id3150444" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT">Defines the unit of measure in spreadsheets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:METRICFIELD:RID_SCPAGE_LAYOUT:MF_TAB" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3149795" xml-lang="en-US" level="3" l10n="U" oldref="22">Tab stops</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:MetricField:RID_SCPAGE_LAYOUT:MF_TAB" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3149795" xml-lang="en-US" level="3" l10n="U" oldref="22">Tab stops</paragraph>
<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:METRICFIELD:RID_SCPAGE_LAYOUT:MF_TAB">Defines the tab stops distance.</ahelp></paragraph>
<embed href="text/shared/optionen/01040900.xhp#aktu"/>
<paragraph role="heading" id="hd_id3155135" xml-lang="en-US" level="2" l10n="U" oldref="3">Input settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_ALIGN" id="bm_id3155389" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_LAYOUT_LB_ALIGN" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3148491" xml-lang="en-US" level="3" l10n="U" oldref="5">Press Enter to move selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_ALIGN" id="bm_id3155389" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_LAYOUT:LB_ALIGN" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3148491" xml-lang="en-US" level="3" l10n="U" oldref="5">Press Enter to move selection</paragraph>
<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_LISTBOX_RID_SCPAGE_LAYOUT_LB_ALIGN">Determines the direction that the cursor in the spreadsheet will move after you press the Enter key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EDITMODE" id="bm_id3151245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EDITMODE" id="bm_id3151245" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SetInputMode" id="bm_id3079317" localize="false"/><comment>see i53756</comment><paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="3" l10n="U" oldref="8">Press Enter to switch to edit mode</paragraph>
<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EDITMODE">Allows you to immediately edit the selected cell after pressing the Enter key.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_FORMAT" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="10">Expand formatting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_FORMAT" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="10">Expand formatting</paragraph>
<paragraph role="paragraph" id="par_id3150400" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_FORMAT">Specifies whether to automatically apply the formatting attributes of the selected cell to the empty adjacent cells.</ahelp> If, for example, the contents of the selected cell have the bold attribute, this bold attribute will also apply to adjacent cells. Cells that already have a special format will not be modified by this function. You can see the range in question by pressing the <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + * (multiplication sign on the number pad) shortcut. This format also applies to all new values inserted within this range. The normal default settings apply to cells outside this range.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EXPREF" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="14">Expand references when new columns/rows are inserted</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EXPREF" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="14">Expand references when new columns/rows are inserted</paragraph>
<paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_EXPREF">Specifies whether to expand references when inserting columns or rows adjacent to the reference range. This is only possible if the reference range, where the column or row is inserted, originally spanned at least two cells in the desired direction.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="16">
<emph>Example:</emph> If the range A1:B1 is referenced in a formula and you insert a new column after column B, the reference is expanded to A1:C1. If the range A1:B1 is referenced and a new row is inserted under row 1, the reference is not expanded, since there is only a single cell in the vertical direction.</paragraph>
<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="17">If you insert rows or columns in the middle of a reference area, the reference is always expanded.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_MARKHDR" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="3" l10n="U" oldref="18">Highlight selection in column/row headings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_MARKHDR" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="3" l10n="U" oldref="18">Highlight selection in column/row headings</paragraph>
<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_MARKHDR">Specifies whether to highlight column and row headers in the selected columns or rows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_TEXTFMT" id="bm_id3153770" localize="false"/><paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3" l10n="U" oldref="25">Use printer metrics for text formatting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT" id="bm_id3153770" localize="false"/><paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="3" l10n="U" oldref="25">Use printer metrics for text formatting</paragraph>
<paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_TEXTFMT">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>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_REPLWARN" id="bm_id3153363" localize="false"/><paragraph role="heading" id="hd_id3146146" xml-lang="en-US" level="3" l10n="U" oldref="27">Show overwrite warning when pasting data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN" id="bm_id3153363" localize="false"/><paragraph role="heading" id="hd_id3146146" xml-lang="en-US" level="3" l10n="U" oldref="27">Show overwrite warning when pasting data</paragraph>
<paragraph role="paragraph" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_LAYOUT_CB_REPLWARN">Specifies that, when you paste cells from the clipboard to a cell range that is not empty, a warning appears.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01060400.xhp b/helpcontent2/source/text/shared/optionen/01060400.xhp
index e0f5cd87f6..570b0d8fe3 100755
--- a/helpcontent2/source/text/shared/optionen/01060400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060400.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060400.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,22 +54,22 @@
<case select="CALC"><embed href="text/scalc/guide/sorted_list.xhp#sorted_list"/>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_USERLISTS:LB_LISTS" id="bm_id3147336" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_USERLISTS:LB_LISTS" id="bm_id3147336" localize="false"/>
<paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="3">Lists</paragraph>
<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCPAGE_USERLISTS:LB_LISTS">Displays all the available lists. These lists can be selected for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILINEEDIT:RID_SCPAGE_USERLISTS:ED_ENTRIES" id="bm_id3154758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:MultiLineEdit:RID_SCPAGE_USERLISTS:ED_ENTRIES" id="bm_id3154758" localize="false"/>
<paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="2" l10n="U" oldref="5">Entries</paragraph>
<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:MULTILINEEDIT:RID_SCPAGE_USERLISTS:ED_ENTRIES">Displays the content of the currently selected list. This content can be edited.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCPAGE_USERLISTS:ED_COPYFROM" id="bm_id3152811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM" id="bm_id3152811" localize="false"/>
<paragraph role="heading" id="hd_id3145069" xml-lang="en-US" level="2" l10n="U" oldref="7">Copy list from</paragraph>
<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:EDIT:RID_SCPAGE_USERLISTS:ED_COPYFROM">Defines the spreadsheet and the cells to copy, in order to include them in the <emph>Lists</emph> box. The currently selected range in the spreadsheet is the default.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_COPY" id="bm_id3145606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY" id="bm_id3145606" localize="false"/>
<paragraph role="heading" id="hd_id3151211" xml-lang="en-US" level="2" l10n="U" oldref="13">Copy</paragraph>
<paragraph role="paragraph" id="par_id3158409" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_COPY">Copies the contents of the cells in the <emph>Copy list from</emph> box. If you select a reference to related rows and columns, the <link href="text/shared/optionen/01060401.xhp" name="Copy List"><emph>Copy List</emph></link> dialog appears after clicking the button. You can use this dialog to define if the reference is converted to sort lists by row or by column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_NEW" id="bm_id3147084" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW" id="bm_id3147084" localize="false"/>
<paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="9">New/Discard</paragraph>
<paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_NEW">Enters the contents of a new list into the <emph>Entries</emph> box.</ahelp> This button will change from <emph>New</emph> to <emph>Discard</emph>, which enables you to delete the new list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_ADD" id="bm_id3149562" localize="false"/>
+<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>
<embed href="text/shared/00/00000001.xhp#loeschen"/>
diff --git a/helpcontent2/source/text/shared/optionen/01060401.xhp b/helpcontent2/source/text/shared/optionen/01060401.xhp
index dc57b206c9..b9bc8a6fbe 100755
--- a/helpcontent2/source/text/shared/optionen/01060401.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060401.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060401.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153341"><bookmark_value>sort lists; copying to in Calc</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC_MODALDIALOG_RID_SCDLG_COLORROW" id="bm_id3156329" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ModalDialog:RID_SCDLG_COLORROW" id="bm_id3156329" localize="false"/>
<paragraph role="heading" id="hd_id3153341" xml-lang="en-US" level="1" l10n="U" oldref="1">Copy List</paragraph>
<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC_MODALDIALOG_RID_SCDLG_COLORROW">Allows you to copy marked cells to a sort list.</ahelp></paragraph>
<section id="howtoget">
@@ -55,10 +52,10 @@
</section>
<paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="2" l10n="U" oldref="3">List from</paragraph>
<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="4">Choose between the options<emph> Rows</emph> and <emph>Columns</emph>. Cells without text will be ignored when copying.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_ROWS" id="bm_id3147303" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_COLORROW:BTN_GROUP_ROWS" id="bm_id3147303" localize="false"/>
<paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="3" l10n="U" oldref="5">Rows</paragraph>
<paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_ROWS">Select the<emph> Rows </emph>option to summarize the contents of the selected rows in a list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_COLS" id="bm_id3154366" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_COLORROW:BTN_GROUP_COLS" id="bm_id3154366" localize="false"/>
<paragraph role="heading" id="hd_id3153525" xml-lang="en-US" level="3" l10n="U" oldref="7">Columns</paragraph>
<paragraph role="paragraph" id="par_id3154216" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_COLORROW_BTN_GROUP_COLS">Select the<emph> Columns </emph>option to summarize the contents of the selected columns in a list.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01060500.xhp b/helpcontent2/source/text/shared/optionen/01060500.xhp
index 8e12eb1056..4f6356b778 100644
--- a/helpcontent2/source/text/shared/optionen/01060500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060500.xhp
@@ -1,18 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060500.xhp,v $
- * $Revision: 1.15 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,194 +29,201 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculate</title>
-<filename>/text/shared/optionen/01060500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T13:17:25">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="berechnen">
+ <topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Calculate</title>
+ <filename>/text/shared/optionen/01060500.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="berechnen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149399"><bookmark_value>references; iterative (Calc)</bookmark_value>
-<bookmark_value>calculating;iterative references (Calc)</bookmark_value>
-<bookmark_value>iterative references in spreadsheets</bookmark_value>
-<bookmark_value>recursions in spreadsheets</bookmark_value>
-<bookmark_value>dates; default (Calc)</bookmark_value>
-<bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
-<bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
-<bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
-<bookmark_value>numbers; decimal places (Calc)</bookmark_value>
-<bookmark_value>decimal places displayed (Calc)</bookmark_value>
-<bookmark_value>precision as shown (Calc)</bookmark_value>
-<bookmark_value>values; rounded as shown (Calc)</bookmark_value>
-<bookmark_value>rounding precision (Calc)</bookmark_value>
-<bookmark_value>search criteria for database functions in cells</bookmark_value>
-<bookmark_value>Excel; search criteria</bookmark_value>
-</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment>
+ <bookmark_value>calculating;iterative references (Calc)</bookmark_value>
+ <bookmark_value>iterative references in spreadsheets</bookmark_value>
+ <bookmark_value>recursions in spreadsheets</bookmark_value>
+ <bookmark_value>dates; default (Calc)</bookmark_value>
+ <bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
+ <bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
+ <bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
+ <bookmark_value>decimal places displayed (Calc)</bookmark_value>
+ <bookmark_value>precision as shown (Calc)</bookmark_value>
+ <bookmark_value>values; rounded as shown (Calc)</bookmark_value>
+ <bookmark_value>rounding precision (Calc)</bookmark_value>
+ <bookmark_value>search criteria for database functions in cells</bookmark_value>
+ <bookmark_value>Excel; search criteria</bookmark_value>
+</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment><comment>mw deleted "numbers;decimal places (Calc)"</comment>
<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
-<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#exopbe"/>
-</section>
-<paragraph role="heading" id="hd_id3149399" xml-lang="en-US" level="2" l10n="U" oldref="3">Iterative references</paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE" id="bm_id3156153" localize="false"/>
-<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="3" l10n="U" oldref="5">Iterations</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
-<paragraph role="paragraph" id="par_id3148686" xml-lang="en-US" l10n="CHG" oldref="7">
-<emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153061" xml-lang="en-US" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149669">
-<tablerow>
-<tablecell colspan="" rowspan="">
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="9">A</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="10">B</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11">5</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="12">Selling Price</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="13">100</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U" oldref="14">6</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="15">Net</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U" oldref="16">=B5-B7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="U" oldref="17">7</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="18">Tax</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="19">=B6*0,15</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#exopbe"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3149399" role="heading" level="2" l10n="U" oldref="3">Iterative references</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE" id="bm_id3156153" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154142" role="heading" level="3" l10n="U" oldref="5">Iterations</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148686" role="paragraph" l10n="CHG" oldref="7">
+ <emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156155" role="listitem" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147530" role="listitem" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153061" role="listitem" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154760" role="listitem" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
+ </listitem>
+ </list>
+ <table id="tbl_id3149669">
+ <tablerow>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154365" role="paragraph" l10n="U" oldref="9">A</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145606" role="paragraph" l10n="U" oldref="10">B</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149202" role="paragraph" l10n="U" oldref="11">5</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="U" oldref="12">Selling Price</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="13">100</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph" l10n="U" oldref="14">6</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147317" role="paragraph" l10n="U" oldref="15">Net</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147348" role="paragraph" l10n="U" oldref="16">=B5-B7</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="U" oldref="17">7</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="U" oldref="18">Tax</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="19">=B6*0,15</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS" id="bm_id3146119" localize="false"/>
-<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="22">Steps</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCPAGE_CALC:ED_EPS" id="bm_id3145273" localize="false"/>
-<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="24">Minimum Change</paragraph>
-<paragraph role="paragraph" id="par_id3153139" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147125" xml-lang="en-US" level="2" l10n="U" oldref="45">Date</paragraph>
-<paragraph role="paragraph" id="par_id3155416" xml-lang="en-US" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD" id="bm_id3153159" localize="false"/>
-<paragraph role="heading" id="hd_id3147396" xml-lang="en-US" level="3" l10n="U" oldref="47">12/30/1899 (default)</paragraph>
-<paragraph role="paragraph" id="par_id3145646" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10" id="bm_id3150715" localize="false"/>
-<paragraph role="heading" id="hd_id3156283" xml-lang="en-US" level="3" l10n="U" oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
-<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904" id="bm_id3147173" localize="false"/>
-<paragraph role="heading" id="hd_id3156181" xml-lang="en-US" level="3" l10n="U" oldref="51">01/01/1904</paragraph>
-<paragraph role="paragraph" id="par_id3153948" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE" id="bm_id3151205" localize="false"/>
-<paragraph role="heading" id="hd_id3153838" xml-lang="en-US" level="2" l10n="U" oldref="26">Case sensitive</paragraph>
-<paragraph role="paragraph" id="par_id3146793" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="28">
-<emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
-<paragraph role="note" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC" id="bm_id3147362" localize="false"/>
-<paragraph role="heading" id="hd_id3145231" xml-lang="en-US" level="2" l10n="U" oldref="53">Decimal places</paragraph>
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC" id="bm_id3145766" localize="false"/>
-<paragraph role="heading" id="hd_id3145150" xml-lang="en-US" level="2" l10n="U" oldref="30">Precision as shown</paragraph>
-<paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH" id="bm_id3150364" localize="false"/>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="2" l10n="U" oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
-<paragraph role="paragraph" id="par_id3149211" xml-lang="en-US" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
-<table id="tbl_id3149814">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148422" xml-lang="en-US" l10n="U" oldref="34">.* in following position:</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156139" xml-lang="en-US" l10n="U" oldref="35">Search result:</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150979" xml-lang="en-US" l10n="U" oldref="36">win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153782" xml-lang="en-US" l10n="U" oldref="38">win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151278" xml-lang="en-US" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155506" xml-lang="en-US" l10n="U" oldref="40">.*win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150886" xml-lang="en-US" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="42">.*win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152985" xml-lang="en-US" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_STEPS" id="bm_id3146119" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145750" role="heading" level="3" l10n="U"
+ oldref="22">Steps</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCPAGE_CALC:ED_EPS" id="bm_id3145273" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153728" role="heading" level="3" l10n="U"
+ oldref="24">Minimum Change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153139" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147125" role="heading" level="2" l10n="U"
+ oldref="45">Date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155416" role="paragraph" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD" id="bm_id3153159" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147396" role="heading" level="3" l10n="U"
+ oldref="47">12/30/1899 (default)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145646" role="paragraph" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10" id="bm_id3150715" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156283" role="heading" level="3" l10n="U"
+ oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154018" role="paragraph" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904" id="bm_id3147173" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156181" role="heading" level="3" l10n="U"
+ oldref="51">01/01/1904</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153948" role="paragraph" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE" id="bm_id3151205" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153838" role="heading" level="2" l10n="U"
+ oldref="26">Case sensitive</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146793" role="paragraph" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="28">
+ <emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153965" role="note" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_PREC" id="bm_id3147362" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145231" role="heading" level="2" l10n="U"
+ oldref="53">Decimal places</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC" id="bm_id3145766" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
+ oldref="30">Precision as shown</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150644" role="paragraph" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH" id="bm_id3150364" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3152581" role="heading" level="2" l10n="U"
+ oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
+ <table id="tbl_id3149814">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="34">.* in following position:</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156139" role="tablehead" l10n="U" oldref="35">Search result:</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150979" role="tablecontent" l10n="U" oldref="36">win</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159239" role="tablecontent" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153782" role="tablecontent" l10n="U" oldref="38">win.*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151278" role="tablecontent" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155506" role="tablecontent" l10n="U" oldref="40">.*win</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150886" role="tablecontent" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147167" role="tablecontent" l10n="U" oldref="42">.*win.*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152985" role="tablecontent" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id3148814" xml-lang="en-US" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX" id="bm_id3154419" localize="false"/>
-<paragraph role="heading" id="hd_id3156448" xml-lang="en-US" level="2" l10n="U" oldref="58">Enable regular expressions in formulas</paragraph>
-<paragraph role="paragraph" id="par_id3155092" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
+ <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX" id="bm_id3154419" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156448" role="heading" level="2" l10n="U"
+ oldref="58">Enable regular expressions in formulas</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
</caseinline></switchinline><comment>Sorry, no more switches allowed inside AVIS tags</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
-<paragraph role="heading" id="hd_id3156199" xml-lang="en-US" level="2" l10n="U" oldref="55">Automatically find column and row labels</paragraph>
-<paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="57">
-<emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
+ oldref="55">Automatically find column and row labels</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151242" role="paragraph" l10n="U" oldref="57">
+ <emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01060600.xhp b/helpcontent2/source/text/shared/optionen/01060600.xhp
index 576ce2dd1e..0229554125 100755
--- a/helpcontent2/source/text/shared/optionen/01060600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060600.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060600.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,16 +51,16 @@
</section>
<paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="2" l10n="U" oldref="3">Color Definition for Changes</paragraph>
<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="CHG" oldref="4">Defines colors for recorded changes. If you select the "By author" entry, $[officename] will automatically set the color depending on the author who undertook the changes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_CONTENT" id="bm_id3153192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_CONTENT" id="bm_id3153192" localize="false"/>
<paragraph role="heading" id="hd_id3150400" xml-lang="en-US" level="3" l10n="U" oldref="5">Changes</paragraph>
<paragraph role="paragraph" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_CONTENT">Specifies the color for changes of cell contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_REMOVE" id="bm_id3152920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_REMOVE" id="bm_id3152920" localize="false"/>
<paragraph role="heading" id="hd_id3158410" xml-lang="en-US" level="3" l10n="U" oldref="7">Deletions</paragraph>
<paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_REMOVE">Specifies the color to highlight deletions in a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT" id="bm_id3154123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_INSERT" id="bm_id3154123" localize="false"/>
<paragraph role="heading" id="hd_id3154685" xml-lang="en-US" level="3" l10n="U" oldref="9">Insertions</paragraph>
<paragraph role="paragraph" id="par_id3151383" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT">Specifies the color to highlight insertions in a document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_MOVE" id="bm_id3156422" localize="false"/>
<paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="11">Moved entries</paragraph>
<paragraph role="paragraph" id="par_id3159151" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE">Specifies the color to highlight moved cell contents.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01060700.xhp b/helpcontent2/source/text/shared/optionen/01060700.xhp
index 6014d46add..ccaa74c92b 100755
--- a/helpcontent2/source/text/shared/optionen/01060700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060700.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01060700.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,8 +31,8 @@
-->
- <helpdocument version="1.0">
<meta>
+
<topic id="textsharedoptionen01060700xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Print</title>
<filename>/text/shared/optionen/01060700.xhp</filename>
@@ -47,16 +43,15 @@
<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060700.xhp" name="Print">Print</link></paragraph>
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="">Determines the printer settings for spreadsheets.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="3">
-<emph>Tools - Options - %PRODUCTNAME Calc - Print</emph> defines the settings for all spreadsheets. To define settings for the current document only, choose <emph>File - Print</emph>, then click the <emph>Options</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="3"><emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print</emph> defines the settings for all spreadsheets. To define settings for the current document only, choose <emph>File - Print</emph>, then click the <emph>Options</emph> button.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#drucken2"/>
</section>
<paragraph role="heading" id="hd_id3153542" xml-lang="en-US" level="2" l10n="U" oldref="4">Pages</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SKIPEMPTYPAGES" id="bm_id3149579" localize="false"/><paragraph role="heading" id="hd_id3156155" xml-lang="en-US" level="3" l10n="U" oldref="5">Suppress output of empty pages</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES" id="bm_id3149579" localize="false"/><paragraph role="heading" id="hd_id3156155" xml-lang="en-US" level="3" l10n="U" oldref="5">Suppress output of empty pages</paragraph>
<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SKIPEMPTYPAGES">Specifies that empty pages that have no cell contents or draw objects are not printed.</ahelp> Cell attributes such as borders or background colors are not considered cell contents. Empty pages are not counted for page numbering.</paragraph>
<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2" l10n="U" oldref="7">Sheets</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SELECTEDSHEETS" id="bm_id3145316" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="8">Print only selected sheets</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS" id="bm_id3145316" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3" l10n="U" oldref="8">Print only selected sheets</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SELECTEDSHEETS">Specifies that only contents from selected sheets are printed, even if you specify a wider range in the <emph>File - Print</emph> dialog or in the <emph>Format - Print Ranges</emph> dialog. Contents from sheets that are not selected will not be printed.</ahelp></paragraph>
<paragraph role="tip" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="10">To select multiple sheets, click on the sheet names on the bottom margin of the workspace while keeping the Ctrl key pressed.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01070000.xhp b/helpcontent2/source/text/shared/optionen/01070000.xhp
index ae2e8c2208..f14806ff45 100644
--- a/helpcontent2/source/text/shared/optionen/01070000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01070000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01070100.xhp b/helpcontent2/source/text/shared/optionen/01070100.xhp
index f3543ad40d..611fe0cbf2 100644
--- a/helpcontent2/source/text/shared/optionen/01070100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01070100.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,11 +51,11 @@
<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_CONTENTS" id="bm_id3109850" localize="false"/><paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070100.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SD_OPTIONS_CONTENTS">Specifies the available display modes.</ahelp> By selecting an alternative display, you can speed up the screen display while editing your presentation.</paragraph>
</section><comment>removed 4 options, see i81634</comment><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="23">Display</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER" id="bm_id3159252" localize="false"/><paragraph role="heading" id="hd_id3155430" xml-lang="en-US" level="3" l10n="U" oldref="25">Rulers visible</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER" id="bm_id3159252" localize="false"/><paragraph role="heading" id="hd_id3155430" xml-lang="en-US" level="3" l10n="U" oldref="25">Rulers visible</paragraph>
<paragraph role="paragraph" id="par_id3147443" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER">Specifies whether to display the rulers at the top and to the left of the work area.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_MOVE" id="bm_id2451068" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id3163712" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Guides when moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Guides when moving</paragraph>
<paragraph role="paragraph" id="par_id3154147" xml-lang="en-US" l10n="U" oldref="28"><variable id="verschieb"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES">Specifies whether to display guides when moving an object.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="29"><variable id="vertext"><item type="productname">%PRODUCTNAME</item> creates dotted guides that extend beyond the box containing the selected object and which cover the entire work area, helping you position the object.
@@ -66,9 +63,9 @@
<paragraph role="paragraph" id="par_id3153365" xml-lang="en-US" l10n="U" oldref="30">You also can use this function through the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/shared/02/01171400.xhp" name="Icon">icon</link>
</caseinline><caseinline select="DRAW"><link href="text/shared/02/01171400.xhp" name="Icon">icon</link>
</caseinline><defaultinline>icon</defaultinline></switchinline> with the same name in the <emph>Options</emph> bar if a presentation or a drawing document is opened.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HANDLES_BEZIER" id="bm_id3153188" localize="false"/><paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="31">All control points in Bézier editor</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER" id="bm_id3153188" localize="false"/><paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="31">All control points in Bézier editor</paragraph>
<paragraph role="paragraph" id="par_id3153877" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HANDLES_BEZIER">Displays the control points of all Bézier points if you have previously selected a <link href="text/shared/00/00000005.xhp#bezierobjekt" name="Bézier curve">Bézier curve</link>. If the <emph>All control points in Bézier</emph> editor option is not marked, only the control points of the selected Bézier points will be visible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_MOVE_OUTLINE" id="bm_id3150115" localize="false"/><paragraph role="heading" id="hd_id3149418" xml-lang="en-US" level="3" l10n="U" oldref="33">Contour of each individual object</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE" id="bm_id3150115" localize="false"/><paragraph role="heading" id="hd_id3149418" xml-lang="en-US" level="3" l10n="U" oldref="33">Contour of each individual object</paragraph>
<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_MOVE_OUTLINE"><item type="productname">%PRODUCTNAME</item> displays the contour line of each individual object when moving this object.</ahelp> The <emph>Contour of each individual object </emph>option enables you to see if single objects conflict with other objects in the target position. If you do not mark the <emph>Contour of each individual object </emph>option, <item type="productname">%PRODUCTNAME</item> only displays a square contour that includes all selected objects.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp
index 1478f6666d..f05c46b1d5 100644
--- a/helpcontent2/source/text/shared/optionen/01070300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070300.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01070300.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,85 +29,97 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01070300xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Grid</title>
-<filename>/text/shared/optionen/01070300.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="fangen">
+ <topic id="textsharedoptionen01070300xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Grid</title>
+ <filename>/text/shared/optionen/01070300.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="fangen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3163802"><bookmark_value>snapping in presentations and drawings</bookmark_value>
-<bookmark_value>points;reducing editing points when snapping (Impress/Draw)</bookmark_value>
+ <bookmark_value>points;reducing editing points when snapping (Impress/Draw)</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_SNAP" id="bm_id3147834" localize="false"/><paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070300.xhp" name="Grid">Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_SNAP">Defines the grid settings for creating and moving objects.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#etopfe"/>
-</section>
-<embed href="text/shared/optionen/01050100.xhp#raster"/>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="3">If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key pressed to deactivate this function for as long as needed.</paragraph>
-<embed href="text/shared/optionen/01050100.xhp#aufun"/>
-<paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="4">Snap</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_OPTIONS_SNAP" id="bm_id3147834" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147571" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01070300.xhp" name="Grid">Grid</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_SNAP">Defines the grid settings for creating and moving objects.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#etopfe"/>
+ </section>
+ <embed href="text/shared/optionen/01050100.xhp#raster"/>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="3">If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the Shift key pressed to deactivate this function for as long as needed.</paragraph>
+ <embed href="text/shared/optionen/01050100.xhp#aufun"/>
+ <paragraph xml-lang="en-US" id="hd_id3156346" role="heading" level="2" l10n="U" oldref="4">Snap</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELPLINES_USE" id="bm_id3115680" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesUse" id="bm_id3147335" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES" id="bm_id3156329" localize="false"/><paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="8">To snap lines</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><variable id="anlinie"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES">Snaps the edge of a dragged object to the nearest snap line when you release the mouse.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES" id="bm_id3156329" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="3" l10n="U" oldref="8">To snap lines</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="U" oldref="9"><variable id="anlinie"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES">Snaps the edge of a dragged object to the nearest snap line when you release the mouse.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
+ <paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Guides</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
+</caseinline><defaultinline><emph>Snap to Guides</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_SNAP_BORDER" id="bm_id2054461" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id3153254" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_BORDER" id="bm_id3153063" localize="false"/><paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="3" l10n="U" oldref="31">To the page margins</paragraph>
-<paragraph role="paragraph" id="par_id3156024" xml-lang="en-US" l10n="U" oldref="11"><variable id="seitenrand"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_BORDER">Specifies whether to align the contour of the graphic object to the nearest page margin.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER" id="bm_id3153063" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="3" l10n="U"
+ oldref="31">To the page margins</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156024" role="paragraph" l10n="U" oldref="11"><variable id="seitenrand"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_BORDER">Specifies whether to align the contour of the graphic object to the nearest page margin.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="33"><variable id="seittext">The cursor or a contour line of the graphics object must be in the snap range.
+ <paragraph xml-lang="en-US" id="par_id3149670" role="paragraph" l10n="U" oldref="33"><variable id="seittext">The cursor or a contour line of the graphics object must be in the snap range.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="CHG" oldref="38">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
+ <paragraph xml-lang="en-US" id="par_id3148947" role="paragraph" l10n="CHG" oldref="38">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Page Margins</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
+</caseinline><defaultinline><emph>Snap to Page Margins</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_SNAP_FRAME" id="bm_id215332" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SnapFrame" id="bm_id3153194" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_FRAME" id="bm_id3151380" localize="false"/><paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="3" l10n="U" oldref="12">To object frame</paragraph>
-<paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="13"><variable id="rahmen"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_FRAME">Specifies whether to align the contour of the graphic object to the border of the nearest graphic object.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME" id="bm_id3151380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154365" role="heading" level="3" l10n="U"
+ oldref="12">To object frame</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148674" role="paragraph" l10n="U" oldref="13"><variable id="rahmen"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_FRAME">Specifies whether to align the contour of the graphic object to the border of the nearest graphic object.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="34"><variable id="rahmtext">The cursor or a contour line of the graphics object must be in the snap range.
+ <paragraph xml-lang="en-US" id="par_id3147228" role="paragraph" l10n="U" oldref="34"><variable id="rahmtext">The cursor or a contour line of the graphics object must be in the snap range.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="CHG" oldref="39">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="CHG" oldref="39">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Object Border</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
+</caseinline><defaultinline><emph>Snap to Object Border</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_SNAP_POINTS" id="bm_id5317182" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SnapPoints" id="bm_id3155131" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_POINTS" id="bm_id3147288" localize="false"/><paragraph role="heading" id="hd_id3155431" xml-lang="en-US" level="3" l10n="U" oldref="14">To object points</paragraph>
-<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="15"><variable id="opunkte"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_POINTS">Specifies whether to align the contour of the graphic object to the points of the nearest graphic object.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS" id="bm_id3147288" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155431" role="heading" level="3" l10n="U"
+ oldref="14">To object points</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145271" role="paragraph" l10n="U" oldref="15"><variable id="opunkte"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_POINTS">Specifies whether to align the contour of the graphic object to the points of the nearest graphic object.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="35"><variable id="opunktetext">This only applies if the cursor or a contour line of the graphics object is in the snap range.
+ <paragraph xml-lang="en-US" id="par_id3149483" role="paragraph" l10n="U" oldref="35"><variable id="opunktetext">This only applies if the cursor or a contour line of the graphics object is in the snap range.
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="40">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link>
+ <paragraph xml-lang="en-US" id="par_id3146146" role="paragraph" l10n="CHG" oldref="40">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link>
</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link>
-</caseinline><defaultinline>
-<emph>Snap to Object Points</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_SNAP_AREA" id="bm_id3152460" localize="false"/><paragraph role="heading" id="hd_id3148645" xml-lang="en-US" level="3" l10n="U" oldref="16">Snap range</paragraph>
-<paragraph role="paragraph" id="par_id3154145" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_SNAP_AREA">Defines the snap distance between the mouse pointer and the object contour. $[officename] Impress snaps to a snap point if the mouse pointer is nearer than the distance selected in the <emph>Snap range</emph> control.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="2" l10n="U" oldref="19">Snap position</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ORTHO" id="bm_id3153191" localize="false"/><paragraph role="heading" id="hd_id3154639" xml-lang="en-US" level="3" l10n="U" oldref="21">When creating or moving objects</paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ORTHO">Specifies that graphic objects are restricted vertically, horizontally or diagonally (45°) when creating or moving them.</ahelp> You can temporarily deactivate this setting by pressing the Shift key.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_BIGORTHO" id="bm_id3155415" localize="false"/><paragraph role="heading" id="hd_id3159345" xml-lang="en-US" level="3" l10n="U" oldref="23">Extend edges</paragraph>
-<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_BIGORTHO">Specifies that a square is created based on the longer side of a rectangle when the Shift key is pressed before you release the mouse button. This also applies to an ellipse (a circle will be created based on the longest diameter of the ellipse). When the<emph> Extend edges </emph>box is not marked, a square or a circle will be created based on the shorter side or diameter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ROTATE" id="bm_id3151073" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_ANGLE" id="bm_id3153878" localize="false"/><paragraph role="heading" id="hd_id3149413" xml-lang="en-US" level="3" l10n="U" oldref="25">When rotating</paragraph>
-<paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_ANGLE">Specifies that graphic objects can only be rotated within the rotation angle that you selected in the <emph>When rotating</emph> control.</ahelp> If you want to rotate an object outside the defined angle, press the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key when rotating. Release the key when the desired rotation angle is reached.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_BEZ_ANGLE" id="bm_id3153839" localize="false"/><paragraph role="heading" id="hd_id3154163" xml-lang="en-US" level="3" l10n="U" oldref="27">Point reduction</paragraph>
-<paragraph role="paragraph" id="par_id3156275" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_BEZ_ANGLE">Defines the angle for point reduction.</ahelp> When working with polygons, you might find it useful to reduce their editing points.</paragraph>
-</body>
-</helpdocument>
+</caseinline><defaultinline><emph>Snap to Object Points</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA" id="bm_id3152460" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148645" role="heading" level="3" l10n="U"
+ oldref="16">Snap range</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154145" role="paragraph" l10n="CHG" oldref="17"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_SNAP_AREA">Defines the snap distance between the mouse pointer and the object contour. $[officename] Impress snaps to a snap point if the mouse pointer is nearer than the distance selected in the <emph>Snap range</emph> control.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="2" l10n="U"
+ oldref="19">Snap position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO" id="bm_id3153191" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154639" role="heading" level="3" l10n="U"
+ oldref="21">When creating or moving objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150417" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_ORTHO">Specifies that graphic objects are restricted vertically, horizontally or diagonally (45°) when creating or moving them.</ahelp> You can temporarily deactivate this setting by pressing the Shift key.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO" id="bm_id3155415" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3159345" role="heading" level="3" l10n="U"
+ oldref="23">Extend edges</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154942" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_BIGORTHO">Specifies that a square is created based on the longer side of a rectangle when the Shift key is pressed before you release the mouse button. This also applies to an ellipse (a circle will be created based on the longest diameter of the ellipse). When the<emph> Extend edges </emph>box is not marked, a square or a circle will be created based on the shorter side or diameter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE" id="bm_id3151073" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE" id="bm_id3153878" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149413" role="heading" level="3" l10n="U"
+ oldref="25">When rotating</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="CHG" oldref="26"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_ANGLE">Specifies that graphic objects can only be rotated within the rotation angle that you selected in the <emph>When rotating</emph> control.</ahelp> If you want to rotate an object outside the defined angle, press the Shift key when rotating. Release the key when the desired rotation angle is reached.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE" id="bm_id3153839" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154163" role="heading" level="3" l10n="U"
+ oldref="27">Point reduction</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156275" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_GRID_MTR_FLD_BEZ_ANGLE">Defines the angle for point reduction.</ahelp> When working with polygons, you might find it useful to reduce their editing points.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01070400.xhp b/helpcontent2/source/text/shared/optionen/01070400.xhp
index 0f8e8040a0..2a2f58e3c1 100755
--- a/helpcontent2/source/text/shared/optionen/01070400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070400.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01070400.xhp,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -66,42 +63,43 @@
</section><comment>removed contents-to-print section for impress, i85723</comment><paragraph role="heading" id="hd_id3150486" xml-lang="en-US" level="2" l10n="U" oldref="13">Print</paragraph>
<paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="CHG" oldref="14">Defines additional elements to be printed on the page margin.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME" id="bm_id3148645" localize="false"/><paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="3" l10n="U" oldref="15">Page name</paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name of a document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE" id="bm_id3152598" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="17">Date</paragraph>
<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE">Specifies whether to print the current date.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME" id="bm_id3159345" localize="false"/><paragraph role="heading" id="hd_id3149301" xml-lang="en-US" level="3" l10n="U" oldref="19">Time</paragraph>
-<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies wither to print the current time.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies whether to print the current time.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES" id="bm_id3148457" localize="false"/><paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="23">Hidden pages</paragraph>
<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES">Specifies whether to print the pages that are currently hidden from the presentation.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="2" l10n="U" oldref="43">Quality</paragraph>
<paragraph role="paragraph" id="par_id3147229" xml-lang="en-US" l10n="U" oldref="54">See also <embedvar href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_COLOR" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="45">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="45">Default</paragraph>
<paragraph role="paragraph" id="par_id3145608" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_COLOR">Specifies that you want to print in original colors.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_GRAYSCALE" id="bm_id3147287" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="50">Grayscale</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_GRAYSCALE" id="bm_id3147287" localize="false"/><paragraph role="heading" id="hd_id3155131" xml-lang="en-US" level="3" l10n="U" oldref="50">Grayscale</paragraph>
<paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_GRAYSCALE">Specifies that you want to print colors as grayscale.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_BLACKWHITE" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="3" l10n="U" oldref="52">Black &amp; white</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_BLACKWHITE" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="3" l10n="U" oldref="52">Black &amp; white</paragraph>
<paragraph role="paragraph" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SD_RADIOBUTTON_TP_PRINT_OPTIONS_RBT_BLACKWHITE">Specifies that you want to print the document in black and white.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="2" l10n="U" oldref="21">Page options</paragraph>
<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="22">Define additional options for printing the pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_DEFAULT" id="bm_id3146900" localize="false"/><paragraph role="heading" id="hd_id3151207" xml-lang="en-US" level="3" l10n="U" oldref="25">Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT" id="bm_id3146900" localize="false"/><paragraph role="heading" id="hd_id3151207" xml-lang="en-US" level="3" l10n="U" oldref="25">Default</paragraph>
<paragraph role="paragraph" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_DEFAULT">Specifies that you do not want to further scale pages when printing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGESIZE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3153710" xml-lang="en-US" level="3" l10n="U" oldref="27">Fit to page</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE" id="bm_id3150752" localize="false"/><paragraph role="heading" id="hd_id3153710" xml-lang="en-US" level="3" l10n="U" oldref="27">Fit to page</paragraph>
<section id="fittopage">
<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGESIZE">Specifies whether to scale down objects that are beyond the margins of the current printer, so that they fit on the paper in the printer.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGETILE" id="bm_id3154757" localize="false"/><paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="29">Tile pages</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE" id="bm_id3154757" localize="false"/><paragraph role="heading" id="hd_id3155764" xml-lang="en-US" level="3" l10n="U" oldref="29">Tile pages</paragraph>
<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_PAGETILE">Specifies that pages are to be printed in tiled format. If the pages or slides are smaller than the paper, several pages or slides will be printed on one page of paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BOOKLET" id="bm_id3149566" localize="false"/><paragraph role="heading" id="hd_id3150388" xml-lang="en-US" level="3" l10n="U" oldref="31">Brochure</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET" id="bm_id3149566" localize="false"/><paragraph role="heading" id="hd_id3150388" xml-lang="en-US" level="3" l10n="U" oldref="31">Brochure</paragraph>
<paragraph role="paragraph" id="par_id3147322" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BOOKLET">Select the<emph> Brochure </emph>option to print the document in brochure format.</ahelp> You can also decide if you want to print the front, the back or both sides of the brochure.</paragraph>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_FRONT" id="bm_id3147004" localize="false"/><paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="3" l10n="U" oldref="35">Front</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT" id="bm_id3147004" localize="false"/><paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="3" l10n="U" oldref="35">Front</paragraph>
<paragraph role="paragraph" id="par_id3145766" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_FRONT">Select<emph> Front </emph>to print the front of a brochure.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_BACK" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3145760" xml-lang="en-US" level="3" l10n="U" oldref="37">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3145760" xml-lang="en-US" level="3" l10n="U" oldref="37">Back</paragraph>
<paragraph role="paragraph" id="par_id3154118" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_BACK">Select <emph>Back</emph> to print the back of a brochure.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAPERBIN" id="bm_id3146808" localize="false"/><paragraph role="heading" id="hd_id3153704" xml-lang="en-US" level="3" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN" id="bm_id3146808" localize="false"/><paragraph role="heading" id="hd_id3153704" xml-lang="en-US" level="3" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
<paragraph role="paragraph" id="par_id3150380" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAPERBIN">Determines that the paper tray to be used is the one defined in the printer setup.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp
index 35ca157bf2..018a4d6580 100644
--- a/helpcontent2/source/text/shared/optionen/01070500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070500.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01070500.xhp,v $
- * $Revision: 1.14.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,7 +54,7 @@
<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"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_QUICKEDIT" id="bm_id7033098" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id3147264" localize="false"/>
<paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow quick editing</paragraph>
@@ -68,7 +65,7 @@
</caseinline><caseinline select="CHART">
</caseinline><caseinline select="MATH">
</caseinline><defaultinline>In a presentation or drawing document, you can also activate the text editing mode through the<emph> Allow Quick Editing </emph><link href="text/simpress/02/13180000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_PICKTHROUGH" id="bm_id3148920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH" id="bm_id3148920" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_PICK_THROUGH" id="bm_id1003023" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id3153969" localize="false"/>
<paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="3" l10n="U" oldref="7">Only text area selectable</paragraph>
@@ -82,40 +79,40 @@
</caseinline><caseinline select="MATH">
</caseinline><defaultinline>In a presentation or drawing document, you can also activate this mode through the<emph> Select Text Area Only </emph><link href="text/simpress/02/13190000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3155308" xml-lang="en-US" level="2" l10n="U" oldref="9">New document (only in presentations)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE" id="bm_id3152460" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE" id="bm_id3152460" localize="false"/>
<paragraph role="heading" id="hd_id3146986" xml-lang="en-US" level="3" l10n="U" oldref="30">Start with Wizard</paragraph>
<paragraph role="paragraph" id="par_id3148646" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE">Specifies whether to activate the Wizard when opening a presentation with <emph>File - New - Presentation</emph>.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="2" l10n="U" oldref="13">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE" id="bm_id3145750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE" id="bm_id3145750" localize="false"/>
<paragraph role="heading" id="hd_id3146120" xml-lang="en-US" level="3" l10n="U" oldref="15">Use background cache</paragraph>
<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE">Specifies whether to use the cache for displaying objects on the master page.</ahelp> This speeds up the display. Unmark the <emph>Use background cache</emph> option if you want to display changing contents on the master page.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY" id="bm_id3150094" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY" id="bm_id3150094" localize="false"/>
<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3" l10n="U" oldref="17">Copy when moving</paragraph>
<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY">Specifies whether to automatically create a copy when you move an object while holding down the Ctrl key.</ahelp> The same will apply for rotating and resizing the object. The original object will remain in its current position and size.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS" id="bm_id3150592" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS" id="bm_id3150592" localize="false"/>
<paragraph role="heading" id="hd_id3148457" xml-lang="en-US" level="3" l10n="U" oldref="19">Objects always moveable</paragraph>
<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS">Specifies that you want to move an object with the <emph>Rotate</emph> tool enabled. If<emph> Object always moveable </emph>is not marked, the <emph>Rotate</emph> tool can only be used to rotate an object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION" id="bm_id3151207" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION" id="bm_id3151207" localize="false"/>
<paragraph role="heading" id="hd_id3154512" xml-lang="en-US" level="3" l10n="U" oldref="21">Do not distort objects in curve (only in drawings)</paragraph>
<paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION">Maintains relative alignment of Bézier points and 2D drawing objects to each other when you distort the object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_TP_OPTIONS_MISC_LB_METRIC" id="bm_id3153709" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ListBox:TP_OPTIONS_MISC:LB_METRIC" id="bm_id3153709" localize="false"/>
<paragraph role="heading" id="hd_id3154163" xml-lang="en-US" level="3" l10n="U" oldref="32">Unit of measurement</paragraph>
<paragraph role="paragraph" id="par_id3155066" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SD_LISTBOX_TP_OPTIONS_MISC_LB_METRIC">Determines the <link href="text/shared/00/00000003.xhp#metrik" name="Unit of measurement">Unit of measurement</link> for presentations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_METRICFIELD_TP_OPTIONS_MISC_MTR_FLD_TABSTOP" id="bm_id3154757" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP" id="bm_id3154757" localize="false"/>
<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="34">Tab stops</paragraph>
<paragraph role="paragraph" id="par_id3155443" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SD_METRICFIELD_TP_OPTIONS_MISC_MTR_FLD_TABSTOP">Defines the spacing between tab stops.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156383" xml-lang="en-US" level="2" l10n="U" oldref="24">Start presentation (only in presentations)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE" id="bm_id3151249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE" id="bm_id3151249" localize="false"/>
<paragraph role="heading" id="hd_id3155902" xml-lang="en-US" level="3" l10n="U" oldref="26">Always with current page</paragraph>
<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE">Specifies that you always want a presentation to start with the current slide.</ahelp> Unmark<emph> Always with current page</emph> to always start a presentation with the first page.</paragraph>
<paragraph role="heading" id="hd_id3163806" xml-lang="en-US" level="2" l10n="U" oldref="41">Scale (only in drawings)</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_COMBOBOX_TP_OPTIONS_MISC_CB_SCALE" id="bm_id3146317" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE" id="bm_id3146317" localize="false"/>
<paragraph role="heading" id="hd_id3145147" xml-lang="en-US" level="3" l10n="U" oldref="43">Drawing scale</paragraph>
<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>
<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"/>
+<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>
<paragraph role="paragraph" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="40">Microsoft PowerPoint adds the bottom spacing of a paragraph to the top spacing of the next paragraph to calculate the total spacing between both paragraphs. $[officename] Impress utilizes only the larger of the two spacings.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01080000.xhp b/helpcontent2/source/text/shared/optionen/01080000.xhp
index 014f957bc1..906fe5f4cb 100644
--- a/helpcontent2/source/text/shared/optionen/01080000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01080000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01080000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01090000.xhp b/helpcontent2/source/text/shared/optionen/01090000.xhp
index 0c89a75233..000d4df425 100644
--- a/helpcontent2/source/text/shared/optionen/01090000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01090000.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:SmEditOptions" id="bm_id3155338" localize="false"/>
<paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Math Options</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="druckentext"><ahelp hid=".uno:SmEditOptions">Defines the print format and print options for all new formula documents. These options apply when you print a formula directly from <item type="productname">%PRODUCTNAME</item> Math.</ahelp>
-</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph>Tools - Options</emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
+</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#etsodr"/>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index eee7100256..641f4e3e43 100755
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01090100.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -55,7 +52,7 @@
<bookmark_value>scaling; printing in $[officename] Math</bookmark_value>
<bookmark_value>fitting to pages;print settings in Math</bookmark_value>
</bookmark><comment>mw inserted "fitting..."</comment>
-<bookmark xml-lang="en-US" branch="hid/STARMATH:TABPAGE:RID_PRINTOPTIONPAGE" id="bm_id3150178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:TabPage:RID_PRINTOPTIONPAGE" id="bm_id3150178" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PRINT_OPTIONS" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="1" l10n="U" oldref="1">Settings</paragraph>
<paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="18"><variable id="einst"><ahelp hid="HID_PRINT_OPTIONS">Defines formula settings that will be valid for all documents.</ahelp>
</variable></paragraph>
@@ -63,22 +60,22 @@
<embed href="text/shared/00/00000406.xhp#formeinst"/>
</section>
<paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="2" l10n="U" oldref="2">Print options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title</paragraph>
<paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW">Specifies whether you want the name of the document to be included in the printout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT" id="bm_id3146798" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="6">Formula text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_EQUATION_TEXT" id="bm_id3146798" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="6">Formula text</paragraph>
<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT">Specifies whether to include the contents of the <emph>Commands</emph> window at the bottom of the printout.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="3" l10n="U" oldref="8">Border</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME">Applies a thin border to the formula area in the printout.</ahelp><emph>Title row</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
+<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Applies a thin border to the formula area in the printout.</ahelp> <emph>Title</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
<paragraph role="heading" id="hd_id3153822" xml-lang="en-US" level="2" l10n="U" oldref="10">Print format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE" id="bm_id3151246" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="12">Original size</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ORIGINAL_SIZE" id="bm_id3151246" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="12">Original size</paragraph>
<paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE">Prints the formula without adjusting the current font size.</ahelp> It is possible that with large formulas a part of the command text is cut off.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_FIT_TO_PAGE" id="bm_id3147264" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="14">Fit to size</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_FIT_TO_PAGE" id="bm_id3147264" localize="false"/><paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="3" l10n="U" oldref="14">Fit to size</paragraph>
<paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_FIT_TO_PAGE">Adjusts the formula to the page format used in the printout.</ahelp> The real size will be determined by the used paper format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ZOOM" id="bm_id3151210" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_METRICFIELD_RID_PRINTOPTIONPAGE_MF_ZOOM" id="bm_id3154140" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="16">Scaling</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ZOOM" id="bm_id3151210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM" id="bm_id3154140" localize="false"/><paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="16">Scaling</paragraph>
<paragraph role="paragraph" id="par_id3147084" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="STARMATH_METRICFIELD_RID_PRINTOPTIONPAGE_MF_ZOOM">Reduces or enlarges the size of the printed formula by a specified enlargement factor.</ahelp> Type the desired enlargement factor directly in the <emph>Scaling</emph> control, or set the value using the arrow buttons.</paragraph>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="19">Other options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="21">Ignore ~ and ' at the and of the line</paragraph>
+<bookmark xml-lang="en-US" branch="hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="21">Ignore ~ and ' at the and of the line</paragraph>
<paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING">Specifies that these space wildcards will be removed if they are at the end of a line.</ahelp> In earlier versions of $[officename], adding such characters at the end of a line prevented the right edge of the formula from being cut off during printing.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01110000.xhp b/helpcontent2/source/text/shared/optionen/01110000.xhp
index 47effa3304..ea7cbcfd52 100755
--- a/helpcontent2/source/text/shared/optionen/01110000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01110000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110000.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01110100.xhp b/helpcontent2/source/text/shared/optionen/01110100.xhp
index 36b2810886..a6d44e6440 100755
--- a/helpcontent2/source/text/shared/optionen/01110100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01110100.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01110100.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,13 +50,13 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#diagrgfarbe"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SCH:LISTBOX:TP_DEF_COLOR:LB_CHART_COLOR_LIST" id="bm_id3153346" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_OPTPAGE_CHART_DEFCOLORS_LB_CHART_COLOR_LIST" id="bm_id4940946" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="2" l10n="U" oldref="3">Chart colors</paragraph>
+<!-- removed HID SCH:LISTBOX:TP_DEF_COLOR:LB_CHART_COLOR_LIST -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST" id="bm_id4940946" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="2" l10n="U" oldref="3">Chart colors</paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SCH:LISTBOX:TP_DEF_COLOR:LB_CHART_COLOR_LIST">Displays all the colors available for the data series.</ahelp> Select a data series to change its color. Select the desired color from the adjacent color table.</paragraph>
<paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="2" l10n="U" oldref="5">Color table</paragraph>
<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="6">This table is used as a means of replacing the chart colors for the selected data rows. For example, if you selected data row 6 and then click on the color green 8, the old color of the data row is replaced by green 8. The name of the selected color is shown below the color table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SCH:PUSHBUTTON:TP_DEF_COLOR:PB_RESET_TO_DEFAULT" id="bm_id3145383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OPTPAGE_CHART_DEFCOLORS_PB_RESET_TO_DEFAULT" id="bm_id5361491" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="2" l10n="U" oldref="7">Default</paragraph>
+<!-- removed HID SCH:PUSHBUTTON:TP_DEF_COLOR:PB_RESET_TO_DEFAULT -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT" id="bm_id5361491" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="2" l10n="U" oldref="7">Default</paragraph>
<paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SCH:PUSHBUTTON:TP_DEF_COLOR:PB_RESET_TO_DEFAULT">Restores the color settings that were defined when the program was installed.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01130100.xhp b/helpcontent2/source/text/shared/optionen/01130100.xhp
index 69f8c5eaa0..5981a50cf4 100755
--- a/helpcontent2/source/text/shared/optionen/01130100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01130100.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,65 +32,70 @@
<meta>
-<topic id="textsharedoptionen01130100xml" indexer="include">
-<title id="tit" xml-lang="en-US">VBA Properties</title>
-<filename>/text/shared/optionen/01130100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="office">
+ <topic id="textsharedoptionen01130100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">VBA Properties</title>
+ <filename>/text/shared/optionen/01130100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="office">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>Microsoft Office; importing/exporting VBA code</bookmark_value>
-<bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
-<bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
-<bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
+ <bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
+ <bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
+ <bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
</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 (Visual Basic for Applications) code.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#etsofi"/>
-</section>
-<paragraph role="heading" id="hd_id3145582" xml-lang="en-US" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174017" id="bm_id0523200811471179" localize="false"/><comment>Help IDs got changed, but are not updated in hid.lst. So only numeric IDs here</comment>
-<paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved.
+<paragraph xml-lang="en-US" id="hd_id3143267" role="heading" level="1" l10n="U"
+ oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" 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"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3145582" role="heading" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149762" role="paragraph" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE" id="bm_id1012200910594212" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE" id="bm_id101220091104572" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE" id="bm_id1012200911053796" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155420" role="heading" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159399" role="paragraph" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174018" id="bm_id052320081146569" localize="false"/>
-<paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
-<section id="origtext">
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with it in an unchanged form.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
-<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174019" id="bm_id0523200811462736" localize="false"/>
-<paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="11">Load Basic code</paragraph>
-<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 (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"/>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="2" l10n="U" oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174022" id="bm_id0523200811451458" localize="false"/>
-<paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="15">Load Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#codetext"/>
-<bookmark xml-lang="en-US" branch="hid/809174023" id="bm_id0523200811435766" localize="false"/>
-<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="3" l10n="U" oldref="16">Save original Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#origtext"/>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG" id="bm_id1012200911004150" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG" id="bm_id1012200911020741" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG" id="bm_id1012200911024686" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
+ <section id="origtext">
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with the code in an unchanged form.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151246" role="paragraph" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154924" role="heading" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154072" role="heading" level="3" l10n="U"
+ oldref="11">Load Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL" id="bm_id1012200911063630" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0523200811475727" role="heading" level="3" l10n="NEW">Executable code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0523200811475733" role="paragraph" 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>
+ <paragraph xml-lang="en-US" id="hd_id3151211" role="heading" level="3" l10n="U"
+ oldref="12">Save original Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+ <paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="2" l10n="U"
+ oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="3" l10n="U"
+ oldref="15">Load Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+ <paragraph xml-lang="en-US" id="hd_id3145419" role="heading" level="3" l10n="U"
+ oldref="16">Save original Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+ <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01130200.xhp b/helpcontent2/source/text/shared/optionen/01130200.xhp
index 2fa1eb0190..ad48159533 100755
--- a/helpcontent2/source/text/shared/optionen/01130200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130200.xhp
@@ -1,17 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01130200.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,31 +27,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textsharedoptionen01130200xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Microsoft Office</title>
-<filename>/text/shared/optionen/01130200.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="office1">
- <paragraph id="hd_id3156410" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph>
- <paragraph role="paragraph" id="par_id3149095" l10n="U" xml-lang="en-US" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph>
- </section>
- <paragraph role="paragraph" id="par_id3159233" l10n="U" xml-lang="en-US" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#etsofi2"/>
-</section>
- <bookmark branch="hid/HID_OFAPAGE_MSFLTR2_CLB" xml-lang="en-US" id="bm_id3158430"/><paragraph role="heading" level="2" id="hd_id3146798" l10n="U" xml-lang="en-US" oldref="3">List Box</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150670" xml-lang="en-US" oldref="4"><ahelp visibility="visible" hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph>
- <paragraph role="paragraph" id="par_id3154286" l10n="U" xml-lang="en-US" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph>
- <paragraph role="paragraph" id="par_id3153880" l10n="U" xml-lang="en-US" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph>
- </body>
-</helpdocument>
+ <topic id="textsharedoptionen01130200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Microsoft Office</title>
+ <filename>/text/shared/optionen/01130200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="office1">
+ <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0107200910364795" role="paragraph" l10n="NEW">If an OLE server is active for the embedded object, then the OLE server will be used to handle the object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0107200910364725" role="paragraph" l10n="NEW">If no OLE server is active for MathType objects, then embedded MathType objects can be converted to %PRODUCTNAME Math objects. For this conversion, the embedded MathType objects must not exceed the MathType 3.1 specifications.<comment>mail answer by Thomas Lange re i97686</comment></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#etsofi2"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/HID_OFAPAGE_MSFLTR2_CLB" id="bm_id3158430" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="2" l10n="U" oldref="3">List Box</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150670" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153880" role="paragraph" l10n="U" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01140000.xhp b/helpcontent2/source/text/shared/optionen/01140000.xhp
index 7b8cb30ebc..0c7e811c28 100755
--- a/helpcontent2/source/text/shared/optionen/01140000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01140000.xhp
@@ -1,18 +1,14 @@
<?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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: 01140000.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,73 +31,86 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Languages</title>
-<filename>/text/shared/optionen/01140000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="sprachen">
+ <topic id="textsharedoptionen01140000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Languages</title>
+ <filename>/text/shared/optionen/01140000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="sprachen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154751"><bookmark_value>languages; locale settings</bookmark_value>
-<bookmark_value>locale settings</bookmark_value>
-<bookmark_value>Asian languages; enabling</bookmark_value>
-<bookmark_value>languages; Asian support</bookmark_value>
-<bookmark_value>complex text layout; enabling</bookmark_value>
-<bookmark_value>Arabic;language settings</bookmark_value>
-<bookmark_value>Hebrew;language settings</bookmark_value>
-<bookmark_value>Thai;language settings</bookmark_value>
-<bookmark_value>Hindi;language settings</bookmark_value>
-<bookmark_value>decimal separator key</bookmark_value>
-</bookmark><comment>mw deleted "language settings;" and "Asian languages;supporting"</comment><paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01140000.xhp" name="Languages">Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Defines the default languages and some other locale settings for documents.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#sprachen"/>
-</section>
-<paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="2" l10n="U" oldref="21">Language of</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_USERINTERFACE" id="bm_id7035737" localize="false"/><paragraph role="heading" id="par_idN10681" xml-lang="en-US" level="3" l10n="NEW">User interface</paragraph>
-<paragraph role="paragraph" id="par_idN10685" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Select the language used for the user interface, for example menus, dialogs, help files. You must have installed at least one additional language pack or a multi-language version of %PRODUCTNAME.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_LOCALESETTING" id="bm_id3145136" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_LOCALESETTING" id="bm_id1609241" localize="false"/><paragraph role="heading" id="hd_id3154751" xml-lang="en-US" level="3" l10n="U" oldref="22">Locale setting</paragraph>
-<paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_LOCALESETTING">Specifies the locale setting of the country setting. This influences settings for numbering, currency and units of measure.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="27">A change in this field is immediately applicable. However, some formats that were formatted by default change only if the document is newly loaded.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_DECIMALSEPARATOR" id="bm_id2873012" localize="false"/><paragraph role="heading" id="par_idN106DE" xml-lang="en-US" level="3" l10n="NEW">Decimal separator key - Same as locale setting</paragraph>
-<paragraph role="paragraph" id="par_idN106E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies to use the decimal separator key that is set in your system when you press the respective key on the number pad.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN106F1" xml-lang="en-US" l10n="NEW">If this checkbox is activated, the character shown after "Same as locale setting" is inserted when you press the key on the number pad. If this checkbox is not activated, the character that your keyboard driver software provides is inserted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_CURRENCY" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_CURRENCY" id="bm_id9471419" localize="false"/><paragraph role="heading" id="hd_id3147209" xml-lang="en-US" level="3" l10n="U" oldref="24">Default currency</paragraph>
-<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_CURRENCY">Specifies the default currency that is used for the currency format and the currency fields.</ahelp> If you change the locale setting, the default currency changes automatically.</paragraph>
-<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="29">The default entry applies to the currency format that is assigned to the selected locale setting.</paragraph>
-<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="26">A change in <emph>Default currency</emph> field will be transmitted to all open documents and will lead to corresponding changes in the dialogs and icons that control the currency format in these documents.</paragraph>
-<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="2" l10n="U" oldref="5">Default languages for documents</paragraph>
-<paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="6">Specifies the languages for spellchecking, thesaurus and hyphenation.</paragraph>
-<embed href="text/shared/guide/language_select.xhp#language_select"/>
-<section id="sprachmodul">
-<paragraph role="warning" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="8">The spellcheck for the selected language only functions when you have installed the corresponding language module. <embedvar href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
-</paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_WEST_LANG" id="bm_id3148452" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_WEST_LANG" id="bm_id4734946" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="U" oldref="9">Western</paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_WEST_LANG">Specifies the language used for the spellcheck function in western alphabets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_ASIAN_LANG" id="bm_id3152933" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_ASIAN_LANG" id="bm_id908841" localize="false"/><paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="3" l10n="U" oldref="11">Asian</paragraph>
-<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_ASIAN_LANG">Specifies the language used for the spellcheck function in Asian alphabets.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_COMPLEX_LANG" id="bm_id3151041" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_LANGUAGES_LB_COMPLEX_LANG" id="bm_id2717062" localize="false"/><paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="3" l10n="U" oldref="31">CTL</paragraph>
-<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_COMPLEX_LANG">Specifies the language for the complex text layout spellcheck.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CURRENT_DOC" id="bm_id3155131" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_CURRENT_DOC" id="bm_id3376262" localize="false"/><paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="15">For the current document only</paragraph>
-<paragraph role="paragraph" id="par_id3155432" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CURRENT_DOC">Specifies that the settings for default languages are valid only for the current document.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="2" l10n="CHG" oldref="17">Enhanced language support</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_ASIANSUPPORT" id="bm_id3155854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_ASIANSUPPORT" id="bm_id105594" localize="false"/><paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="3" l10n="CHG" oldref="19">Enabled for Asian languages</paragraph>
-<paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_ASIANSUPPORT">Activates Asian languages support. You can now modify the corresponding Asian language settings in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18">If you want to write in Chinese, Japanese or Korean, you can activate the support for these languages in the user interface.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CTLSUPPORT" id="bm_id3150010" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT" id="bm_id295724" localize="false"/><paragraph role="heading" id="hd_id3146147" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Enabled for complex text layout (CTL)</paragraph>
-<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CTLSUPPORT">Activates complex text layout support. You can now modify the settings corresponding to complex text layout in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
-<embed href="text/shared/guide/ctl.xhp#ctl"/>
-</body>
-</helpdocument>
+ <bookmark_value>locale settings</bookmark_value>
+ <bookmark_value>Asian languages; enabling</bookmark_value>
+ <bookmark_value>languages; Asian support</bookmark_value>
+ <bookmark_value>complex text layout; enabling</bookmark_value>
+ <bookmark_value>Arabic;language settings</bookmark_value>
+ <bookmark_value>Hebrew;language settings</bookmark_value>
+ <bookmark_value>Thai;language settings</bookmark_value>
+ <bookmark_value>Hindi;language settings</bookmark_value>
+ <bookmark_value>decimal separator key</bookmark_value>
+</bookmark><comment>mw deleted "language settings;" and "Asian languages;supporting"</comment>
+<paragraph xml-lang="en-US" id="hd_id3151299" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01140000.xhp" name="Languages">Languages</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148520" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Defines the default languages and some other locale settings for documents.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#sprachen"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3156042" role="heading" level="2" l10n="U"
+ oldref="21">Language of</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE" id="bm_id7035737" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="3" l10n="NEW">User interface</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10685" role="paragraph" l10n="CHG"><ahelp hid=".">Select the language used for the user interface, for example menus, dialogs, help files. You must have installed at least one additional language pack or a multi-language version of %PRODUCTNAME.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0125201009445727" role="paragraph" l10n="NEW">The "Default" entry selects the language of the user interface for the operating system. If this language is not available in the %PRODUCTNAME installation, the language of the %PRODUCTNAME installation is the default language.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING" id="bm_id1609241" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154751" role="heading" level="3" l10n="U"
+ oldref="22">Locale setting</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157958" role="paragraph" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_LOCALESETTING">Specifies the locale setting of the country setting. This influences settings for numbering, currency and units of measure.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0125201009445950" role="paragraph" l10n="NEW">The "Default" entry selects the locale setting that is selected for the operating system.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="U" oldref="27">A change in this field is immediately applicable. However, some formats that were formatted by default change only if the document is newly loaded.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR" id="bm_id2873012" localize="false"/>
+<paragraph xml-lang="en-US" id="par_idN106DE" role="heading" level="3" l10n="NEW">Decimal separator key - Same as locale setting</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E2" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies to use the decimal separator key that is set in your system when you press the respective key on the number pad.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106F1" role="paragraph" l10n="NEW">If this checkbox is activated, the character shown after "Same as locale setting" is inserted when you press the key on the number pad. If this checkbox is not activated, the character that your keyboard driver software provides is inserted.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY" id="bm_id9471419" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147209" role="heading" level="3" l10n="U"
+ oldref="24">Default currency</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145120" role="paragraph" l10n="U" oldref="25"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_CURRENCY">Specifies the default currency that is used for the currency format and the currency fields.</ahelp> If you change the locale setting, the default currency changes automatically.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="29">The default entry applies to the currency format that is assigned to the selected locale setting.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157909" role="paragraph" l10n="U" oldref="26">A change in <emph>Default currency</emph> field will be transmitted to all open documents and will lead to corresponding changes in the dialogs and icons that control the currency format in these documents.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153127" role="heading" level="2" l10n="U" oldref="5">Default languages for documents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149763" role="paragraph" l10n="U" oldref="6">Specifies the languages for spellchecking, thesaurus and hyphenation.</paragraph>
+ <embed href="text/shared/guide/language_select.xhp#language_select"/>
+ <section id="sprachmodul">
+ <paragraph xml-lang="en-US" id="par_id3148663" role="warning" l10n="U" oldref="8">The spellcheck for the selected language only functions when you have installed the corresponding language module. <embedvar href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
+ </paragraph>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG" id="bm_id4734946" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="3" l10n="U" oldref="9">Western</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="10"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_WEST_LANG">Specifies the language used for the spellcheck function in western alphabets.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG" id="bm_id908841" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156422" role="heading" level="3" l10n="U"
+ oldref="11">Asian</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="12"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_ASIAN_LANG">Specifies the language used for the spellcheck function in Asian alphabets.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG" id="bm_id2717062" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158407" role="heading" level="3" l10n="U"
+ oldref="31">CTL</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156212" role="paragraph" l10n="U" oldref="32"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_LANGUAGES_LB_COMPLEX_LANG">Specifies the language for the complex text layout spellcheck.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC" id="bm_id3376262" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149807" role="heading" level="3" l10n="U"
+ oldref="15">For the current document only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155432" role="paragraph" l10n="U" oldref="16"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CURRENT_DOC">Specifies that the settings for default languages are valid only for the current document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156441" role="heading" level="2" l10n="CHG"
+ oldref="17">Enhanced language support</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT" id="bm_id105594" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148575" role="heading" level="3" l10n="CHG"
+ oldref="19">Enabled for Asian languages</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145748" role="paragraph" l10n="U" oldref="20"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_ASIANSUPPORT">Activates Asian languages support. You can now modify the corresponding Asian language settings in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152938" role="paragraph" l10n="U" oldref="18">If you want to write in Chinese, Japanese or Korean, you can activate the support for these languages in the user interface.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT" id="bm_id295724" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146147" role="heading" level="3" l10n="CHG"
+ oldref="33">Enabled for complex text layout (CTL)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149667" role="paragraph" l10n="U" oldref="35"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_CTLSUPPORT">Activates complex text layout support. You can now modify the settings corresponding to complex text layout in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
+ <embed href="text/shared/guide/ctl.xhp#ctl"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01150000.xhp b/helpcontent2/source/text/shared/optionen/01150000.xhp
index 1cb9e859b6..81fed70731 100644
--- a/helpcontent2/source/text/shared/optionen/01150000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150000.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01150000.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01150100.xhp b/helpcontent2/source/text/shared/optionen/01150100.xhp
index f5f33089b7..9c9fc456d4 100755
--- a/helpcontent2/source/text/shared/optionen/01150100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150100.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01150100.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,35 +54,35 @@
</bookmark>
<paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="2" l10n="U" oldref="3">Kerning</paragraph>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="4">Defines the default settings for kerning between individual characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_KERNING" id="bm_id3149811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING" id="bm_id3149811" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="5">Western characters only</paragraph>
<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_KERNING">Specifies that kerning is only applied to western text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_PUNCT" id="bm_id3157910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT" id="bm_id3157910" localize="false"/>
<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="7">Western text and Asian punctuation</paragraph>
<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_PUNCT">Specifies that kerning is applied to both western text and Asian punctuation.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153088" xml-lang="en-US" level="2" l10n="U" oldref="9">Character spacing</paragraph>
<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="10">Defines the default settings for character spacing in Asian texts, cells, and drawing objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_NO_COMP" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP" id="bm_id3159158" localize="false"/>
<paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="11">No compression</paragraph>
<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_NO_COMP">Specifies that no compression at all will occur.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_COMP" id="bm_id3154514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP" id="bm_id3154514" localize="false"/>
<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="3" l10n="U" oldref="13">Compress only punctuation</paragraph>
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_COMP">Specifies that only the punctuation is compressed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_KANA_COMP" id="bm_id3148944" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP" id="bm_id3148944" localize="false"/>
<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="15">Compress punctuation and Japanese Kana</paragraph>
<paragraph role="paragraph" id="par_id3154346" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_KANA_COMP">Specifies that punctuation and Japanese Kana are compressed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="2" l10n="U" oldref="17">First and last characters</paragraph>
<paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="18">Defines the default settings for 'first' and 'last' characters. In the dialog that appears when you choose <emph>Format -</emph><link href="text/shared/01/05020700.xhp" name="Asian Typography"><emph>Asian Typography</emph></link>, you can specify whether the list of forbidden characters applies to those at the beginning or end of a line in a paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ASIAN_LAYOUT_LB_LANGUAGE" id="bm_id3154138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE" id="bm_id3154138" localize="false"/>
<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="19">Language</paragraph>
<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ASIAN_LAYOUT_LB_LANGUAGE">Specifies the language for which you want to define first and last characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_ASIAN_LAYOUT_CB_STANDARD" id="bm_id3150767" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD" id="bm_id3150767" localize="false"/>
<paragraph role="heading" id="hd_id3145606" xml-lang="en-US" level="3" l10n="U" oldref="21">Default</paragraph>
<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ASIAN_LAYOUT_CB_STANDARD">When you mark<emph> Default</emph>, the following two text boxes are filled with the default characters for the selected language:</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_START" id="bm_id3154216" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START" id="bm_id3154216" localize="false"/>
<paragraph role="heading" id="hd_id3144761" xml-lang="en-US" level="3" l10n="U" oldref="23">Not at start of line:</paragraph>
<paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_START">Specifies the characters that should not appear alone at the beginning of a line.</ahelp> If a character typed here is positioned at the beginning of a line after a line break, it is automatically moved to the end of the previous line. For example, an exclamation point at the end of a sentence never appears at the start of a line if it is part of the <emph>Not at start of line</emph> list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_END" id="bm_id3149560" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END" id="bm_id3149560" localize="false"/>
<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="U" oldref="25">Not at end of line:</paragraph>
<paragraph role="paragraph" id="par_id3153367" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_END">Specifies the characters that should not appear alone at the end of a line.</ahelp> If a character typed here is positioned at the end of a line due to a line break, it is automatically moved to the beginning of the next line. For example, a currency symbol that appears in front of an amount never appears at the end of a line if it is part of the<emph> Not at end of line</emph> list.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01150200.xhp b/helpcontent2/source/text/shared/optionen/01150200.xhp
index 9e5bc244c5..a915f6d9bf 100755
--- a/helpcontent2/source/text/shared/optionen/01150200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150200.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01150200.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,9 +49,9 @@
<embed href="text/shared/00/00000406.xhp#suchja"/>
</section>
<section id="asia">
- <bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_CASE" xml-lang="en-US" id="bm_id3150276"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_FULL_HALF_WIDTH" xml-lang="en-US" id="bm_id3152350"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_HIRAGANA_KATAKANA" xml-lang="en-US" id="bm_id3149233"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_CONTRACTIONS" xml-lang="en-US" id="bm_id3143270"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_MINUS_DASH_CHOON" xml-lang="en-US" id="bm_id3149415"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_REPEAT_CHAR_MARKS" xml-lang="en-US" id="bm_id3145119"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_VARIANT_FORM_KANJI" xml-lang="en-US" id="bm_id3156155"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_OLD_KANA_FORMS" xml-lang="en-US" id="bm_id3154898"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_DIZI_DUZU" xml-lang="en-US" id="bm_id3147574"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_BAVA_HAFA" xml-lang="en-US" id="bm_id3159157"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_TSITHICHI_DHIZI" xml-lang="en-US" id="bm_id3156329"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_HYUFYU_BYUVYU" xml-lang="en-US" id="bm_id3153821"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_SESHE_ZEJE" xml-lang="en-US" id="bm_id3156152"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_IAIYA" xml-lang="en-US" id="bm_id3145315"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_KIKU" xml-lang="en-US" id="bm_id3155135"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_PROLONGED_SOUNDMARK" xml-lang="en-US" id="bm_id3155419"/><paragraph role="heading" level="2" id="hd_id3159399" l10n="U" xml-lang="en-US" oldref="3">Treat as equal</paragraph>
+ <bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE" xml-lang="en-US" id="bm_id3150276"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH" xml-lang="en-US" id="bm_id3152350"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA" xml-lang="en-US" id="bm_id3149233"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS" xml-lang="en-US" id="bm_id3143270"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON" xml-lang="en-US" id="bm_id3149415"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS" xml-lang="en-US" id="bm_id3145119"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI" xml-lang="en-US" id="bm_id3156155"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS" xml-lang="en-US" id="bm_id3154898"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU" xml-lang="en-US" id="bm_id3147574"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA" xml-lang="en-US" id="bm_id3159157"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI" xml-lang="en-US" id="bm_id3156329"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU" xml-lang="en-US" id="bm_id3153821"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE" xml-lang="en-US" id="bm_id3156152"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA" xml-lang="en-US" id="bm_id3145315"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU" xml-lang="en-US" id="bm_id3155135"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK" xml-lang="en-US" id="bm_id3155419"/><paragraph role="heading" level="2" id="hd_id3159399" l10n="U" xml-lang="en-US" oldref="3">Treat as equal</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154514" xml-lang="en-US" oldref="4"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_PROLONGED_SOUNDMARK" visibility="visible">Specifies the options to be treated as equal in a search.</ahelp></paragraph>
- <bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_PUNCTUATION" xml-lang="en-US" id="bm_id3156024"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_PROLONGED_SOUNDMARK" xml-lang="en-US" id="bm_id3151246"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_WHITESPACES" xml-lang="en-US" id="bm_id3151245"/><bookmark branch="hid/SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_MIDDLE_DOT" xml-lang="en-US" id="bm_id3153898"/><paragraph role="heading" level="2" id="hd_id3148944" l10n="U" xml-lang="en-US" oldref="5">Ignore</paragraph>
+ <bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION" xml-lang="en-US" id="bm_id3156024"/><!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_PROLONGED_SOUNDMARK --><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES" xml-lang="en-US" id="bm_id3151245"/><bookmark branch="hid/cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT" xml-lang="en-US" id="bm_id3153898"/><paragraph role="heading" level="2" id="hd_id3148944" l10n="U" xml-lang="en-US" oldref="5">Ignore</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147264" xml-lang="en-US" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_MIDDLE_DOT" visibility="visible">Specifies the characters to be ignored.</ahelp></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01150300.xhp b/helpcontent2/source/text/shared/optionen/01150300.xhp
index 5257ba00fd..8c1375009a 100755
--- a/helpcontent2/source/text/shared/optionen/01150300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150300.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01150300.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,8 +55,8 @@ dedr: reviewed</lastedited>
<embed href="text/shared/guide/ctl.xhp#ctl"/>
<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="5">Sequence checking</paragraph>
<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="6">In languages such as Thai, rules specify that certain characters are not allowed next to other characters. If Sequence Input Checking (SIC) is enabled, <item type="productname">%PRODUCTNAME</item> will not allow a character next to another if this is forbidden by a rule.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_OPTIONS_CTL_CB_SEQUENCECHECKING" id="bm_id3153681" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_SEQU_CHECK" id="bm_id3147009" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING" id="bm_id3153681" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_SEQU_CHECK -->
<paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="3" l10n="U" oldref="1">Use sequence checking</paragraph>
<paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_LANGUAGES_CB_SEQU_CHECK">Enables sequence input checking for languages such as Thai.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US" l10n="NEW"><comment>hid/svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_RESTRICTED</comment><comment>UFI: must wait for next CWS to be converted to a Help ID</comment></paragraph>
@@ -67,14 +64,14 @@ dedr: reviewed</lastedited>
<paragraph role="paragraph" id="par_idN10695" xml-lang="en-US" l10n="NEW">Prevents the use as well as the printing of illegal character combinations.<comment>UFI: see #103780#</comment></paragraph>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="7">Cursor control</paragraph>
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="8">Select the type of text cursor movement and text selection for mixed text (right-to-left mixed with left-to-right text direction).</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_LOGICAL" id="bm_id3145383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL" id="bm_id3145383" localize="false"/>
<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="3" l10n="U" oldref="9">Logical</paragraph>
<paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_LOGICAL">Pressing the Right Arrow key moves the text cursor toward the end of the current text. Pressing the Left Arrow key moves the text cursor toward the beginning of the current text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_VISUAL" id="bm_id3148685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL" id="bm_id3148685" localize="false"/>
<paragraph role="heading" id="hd_id3145317" xml-lang="en-US" level="3" l10n="U" oldref="11">Visual</paragraph>
<paragraph role="paragraph" id="par_id3149233" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_VISUAL">Pressing the Right Arrow key moves the text cursor in the right-hand direction. Pressing the Left Arrow key moves the text cursor in the left-hand direction.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="2" l10n="U" oldref="13">General options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_OPTIONS_CTL_LB_NUMERALS" id="bm_id3159400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS" id="bm_id3159400" localize="false"/>
<paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="3" l10n="U" oldref="14">Numerals (in text only)</paragraph>
<paragraph role="paragraph" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_OPTIONS_CTL_LB_NUMERALS">Selects the type of numerals used within text, text in objects, fields, and controls, in all <item type="productname">%PRODUCTNAME</item> modules. Only cell contents of <item type="productname">%PRODUCTNAME</item> Calc are not affected.</ahelp><comment>UFI: see http://www.webster-dictionary.org/definition/Indian%20numerals</comment></paragraph>
<list type="unordered">
diff --git a/helpcontent2/source/text/shared/optionen/01160000.xhp b/helpcontent2/source/text/shared/optionen/01160000.xhp
index 414157cc5d..2ffb6cede2 100755
--- a/helpcontent2/source/text/shared/optionen/01160000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160000.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01160000.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/01160100.xhp b/helpcontent2/source/text/shared/optionen/01160100.xhp
index 1b2be3d82f..4228e383d0 100755
--- a/helpcontent2/source/text/shared/optionen/01160100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160100.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01160100.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154136"><bookmark_value>connections to data sources (Base)</bookmark_value>
<bookmark_value>data sources; connection settings (Base)</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_TABPAGE_RID_OFAPAGE_CONNPOOLOPTIONS" id="bm_id3147261" localize="false"/>
+<!-- removed HID OFFMGR_TABPAGE_RID_OFAPAGE_CONNPOOLOPTIONS -->
<bookmark xml-lang="en-US" branch="hid/HID_DSBROWSER_DISCONNECTING" id="bm_id3149798" localize="false"/>
<paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01160100.xhp" name="Connections">Connections</link></paragraph>
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="2">Defines how the connections to data sources are pooled.</paragraph>
@@ -59,20 +56,20 @@
<embed href="text/shared/00/00000406.xhp#verbindungen"/>
</section>
<paragraph role="heading" id="hd_id3154824" xml-lang="en-US" level="2" l10n="U" oldref="12">Connection Pool</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS" id="bm_id3152997" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS" id="bm_id5568712" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS" id="bm_id5568712" localize="false"/>
<paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="U" oldref="4">Connection pooling enabled</paragraph>
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS">Specifies whether the chosen connections are pooled.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="6">Drivers known in $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="U" oldref="7">Displays a list of defined drivers and connection data.</paragraph>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="13">Current driver</paragraph>
<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="14">The currently selected driver is displayed below the list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING" id="bm_id3149234" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING" id="bm_id8145084" localize="false"/>
+<!-- removed HID OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING" id="bm_id8145084" localize="false"/>
<paragraph role="heading" id="hd_id3149166" xml-lang="en-US" level="3" l10n="U" oldref="8">Enable pooling for this driver</paragraph>
<paragraph role="paragraph" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="OFFMGR_CHECKBOX_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING">Select a driver from the list and mark the <emph>Enable pooling for this driver</emph> checkbox in order to pool its connection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR_NUMERICFIELD_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT" id="bm_id3153562" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT" id="bm_id5520798" localize="false"/>
+<!-- removed HID OFFMGR_NUMERICFIELD_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT" id="bm_id5520798" localize="false"/>
<paragraph role="heading" id="hd_id3155135" xml-lang="en-US" level="3" l10n="U" oldref="10">Timeout (seconds)</paragraph>
<paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="OFFMGR_NUMERICFIELD_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT">Defines the time in seconds after which a pooled connection is freed.</ahelp> The time can be anywhere between 30 and 600 seconds.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01160200.xhp b/helpcontent2/source/text/shared/optionen/01160200.xhp
index 90755e5285..47d3a6eb2a 100755
--- a/helpcontent2/source/text/shared/optionen/01160200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160200.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01160200.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,13 +52,13 @@
<bookmark xml-lang="en-US" branch="hid/HID_DBPATH_CTL_PATH" id="bm_id4985198" localize="false"/>
<paragraph role="heading" id="par_idN1058E" xml-lang="en-US" level="2" l10n="NEW">Registered Databases</paragraph>
<paragraph role="paragraph" id="par_idN10592" xml-lang="en-US" l10n="NEW"><ahelp hid="35535">Lists the registered name and database file of all registered databases. Double-click an entry to edit.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_NEW" id="bm_id1757866" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW" id="bm_id1757866" localize="false"/>
<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid="809226765">Opens the <link href="text/shared/optionen/01160201.xhp">Database Link</link> dialog to create a new entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_DELETE" id="bm_id2827234" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE" id="bm_id2827234" localize="false"/>
<paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid="809226770">Removes the selected entry from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_EDIT" id="bm_id8034607" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT" id="bm_id8034607" localize="false"/>
<paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="NEW"><ahelp hid="809226766">Opens the <link href="text/shared/optionen/01160201.xhp">Database Link</link> dialog to edit the selected entry.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01160201.xhp b/helpcontent2/source/text/shared/optionen/01160201.xhp
index 0e62397bb1..7dc925d156 100755
--- a/helpcontent2/source/text/shared/optionen/01160201.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160201.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01160201.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,10 +44,10 @@
<paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW">Creates or edits an entry in the <link href="text/shared/optionen/01160200.xhp">Databases</link> tab page.</paragraph>
<paragraph role="heading" id="par_idN1054F" xml-lang="en-US" level="2" l10n="NEW">Database file</paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Enter the path and the file name of the database file. The name of the file must end with the *.odb extension.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_DLG_DOCUMENTLINK_PB_BROWSEFILE" id="bm_id8789330" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE" id="bm_id8789330" localize="false"/>
<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid="1346114049">Opens a file dialog where you can select the database file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_DLG_DOCUMENTLINK_ET_NAME" id="bm_id2885219" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:DLG_DOCUMENTLINK:ET_NAME" id="bm_id2885219" localize="false"/>
<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Registered name</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid="1346111489">Enter a name for the database. %PRODUCTNAME uses this name to access the database.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/improvement.xhp b/helpcontent2/source/text/shared/optionen/improvement.xhp
new file mode 100644
index 0000000000..2c72a97367
--- /dev/null
+++ b/helpcontent2/source/text/shared/optionen/improvement.xhp
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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="textsharedoptionenimprovementxhp">
+ <title xml-lang="en-US" id="tit">Improvement Program</title>
+ <filename>/text/shared/optionen/improvement.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="improvement">
+<bookmark xml-lang="en-US" branch="index" id="bm_id7687094"><bookmark_value>improvement program</bookmark_value>
+ <bookmark_value>online feedback options</bookmark_value>
+ <bookmark_value>options;improvement program</bookmark_value>
+ <bookmark_value>improvement program</bookmark_value>
+ <bookmark_value>feedback;automatically</bookmark_value>
+ <bookmark_value>user feedback;automatically</bookmark_value>
+</bookmark>
+<paragraph xml-lang="en-US" id="hd_id0526200912315340" role="heading" level="1" l10n="NEW"><link href="text/shared/optionen/improvement.xhp">Improvement Program</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0526200312315378" role="paragraph" l10n="NEW">The Improvement Program records some user interactions and sends them to the User Experience project.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#improvement"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the OpenOffice.org web site: <link href="http://ux.openoffice.org/">http://ux.openoffice.org/</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0526200903594946" role="paragraph" l10n="NEW">The second time you start your new %PRODUCTNAME software, you see a window that gives information about the Improvement Program. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0526200904094345" role="paragraph" l10n="NEW">At this time you can choose to accept or deny your participation.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id052620090409438" role="paragraph" l10n="NEW">If you accept, data recording starts immediately. When you start a new session of %PRODUCTNAME, the collected data will be sent. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200904094433" role="paragraph" l10n="NEW">If you deny to participate, no data will be sent and recording of data stops immediately.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id0526200903594945" role="paragraph" l10n="NEW">At any time, you can enable or disable the recording of user interaction data and the sending of these data. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Improvement Program</item>. Click the <emph>Info</emph> icon to browse to a web page with more information.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES" id="bm_id0526200903272942" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0526200903594944" role="paragraph" l10n="NEW"><ahelp hid=".">Click <emph>Yes, I am willing to participate …</emph> to enable the automatic feedback.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO" id="bm_id0526200903274930" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0526200903595080" role="paragraph" l10n="NEW"><ahelp hid=".">Click <emph>No, I do not wish to participate</emph> to disable the automatic feedback.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0526200903595037" role="heading" level="2" l10n="NEW">Tracked data</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0526200903595096" role="heading" level="2" l10n="NEW">The following data will be recorded and sent:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595033" role="paragraph" l10n="NEW">Clicks on toolbar buttons, including extension toolbars </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595014" role="paragraph" l10n="NEW">Execution of menu commands, including extension menus</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595145" role="paragraph" l10n="NEW">Clicks on context menu commands</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595115" role="paragraph" l10n="NEW">Fonts applied by using the menu </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595144" role="paragraph" l10n="NEW">Font sizes applied by using the menu </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595146" role="paragraph" l10n="NEW">Buttons, like OK, Cancel, etc. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595296" role="paragraph" l10n="NEW">Document language and paragraph language applied by using the menu or status bar </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595242" role="paragraph" l10n="NEW">Each recorded item also includes a time stamp and the module (Writer, Calc, Impress, …) where it has been called </paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id0526200903595229" role="heading" level="2" l10n="NEW">The following data will not be recorded and sent:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595234" role="paragraph" l10n="NEW">User names and passwords </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595218" role="paragraph" l10n="NEW">Any type of document content </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595213" role="paragraph" l10n="NEW">Paths, filenames </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0526200903595354" role="paragraph" l10n="NEW">User's source code </paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id0526200904021320" role="heading" level="2" l10n="NEW">Show Data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA" id="bm_id052620090329187" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0526200903595552" role="paragraph" l10n="NEW"><ahelp hid=".">Click the button to show the currently collected data. This data will be sent next time, plus any data that gets collected until you end the current session.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/java.xhp b/helpcontent2/source/text/shared/optionen/java.xhp
index 3cf438966a..b71eeaa119 100755
--- a/helpcontent2/source/text/shared/optionen/java.xhp
+++ b/helpcontent2/source/text/shared/optionen/java.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: java.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,16 +50,16 @@
<embed href="text/shared/00/00000406.xhp#java"/>
</section>
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Java options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE" id="bm_id3150325" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE" id="bm_id6882839" localize="false"/><paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Use a Java runtime environment</paragraph>
+<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE" id="bm_id6882839" localize="false"/><paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="3" l10n="NEW">Use a Java runtime environment</paragraph>
<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE">Allows you to run Java applications in %PRODUCTNAME.</ahelp> When a Java application attempts to access your hard drive, a prompt opens.<comment>UFI: moved this para here from Security tab page</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_JAVA_LIST" id="bm_id6775719" localize="false"/><paragraph role="heading" id="par_idN10610" xml-lang="en-US" level="3" l10n="NEW">Java runtime environments (JRE) already installed:</paragraph>
<paragraph role="paragraph" id="par_idN10614" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_OPTIONS_JAVA_LIST">Select the JRE that you want to use. On some systems, you must wait a minute until the list gets populated. On some systems, you must restart %PRODUCTNAME to use your changed setting.</ahelp> The path to the JRE is displayed beneath the list box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD" id="bm_id5543382" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD" id="bm_id5543382" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
<paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" l10n="CHG"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD">Add a path to the root folder of a JRE on your computer.</ahelp> The path is set in the following dialog.<comment>UFI: #i38927#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_OPTIONS_JAVA_PB_PARAMETER" id="bm_id1588793" localize="false"/><paragraph role="heading" id="par_idN105A9" xml-lang="en-US" level="3" l10n="NEW">Parameters</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER" id="bm_id1588793" localize="false"/><paragraph role="heading" id="par_idN105A9" xml-lang="en-US" level="3" l10n="NEW">Parameters</paragraph>
<paragraph role="paragraph" id="par_idN10657" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER">Opens the <link href="text/shared/optionen/javaparameters.xhp">Java Start Parameters</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_OPTIONS_JAVA_PB_CLASSPATH" id="bm_id5799127" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="3" l10n="NEW">Class Path</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH" id="bm_id5799127" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="3" l10n="NEW">Class Path</paragraph>
<paragraph role="paragraph" id="par_idN10686" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH">Opens the <link href="text/shared/optionen/javaclasspath.xhp">Class Path</link> dialog.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/javaclasspath.xhp b/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
index 91e8afd8b5..32c5652348 100755
--- a/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
+++ b/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: javaclasspath.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,18 +45,18 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#java"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH" id="bm_id3147004" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_JAVA_CLASSPATH_LB_PATH" id="bm_id6794640" localize="false"/>
+<!-- removed HID SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH -->
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH" id="bm_id6794640" localize="false"/>
<paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2" l10n="NEW">Assigned folders and archives</paragraph>
<paragraph role="paragraph" id="par_idN1059F" xml-lang="en-US" l10n="NEW"><ahelp hid="SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH">Specifies the location of Java classes or Java class libraries.</ahelp> The new classpath becomes valid after you restart <item type="productname">%PRODUCTNAME</item>.<comment>UFI: moved these paras here from the Security tab page</comment></paragraph>
<paragraph role="warning" id="par_idN105D9" xml-lang="en-US" l10n="NEW">Java classes that are accessed through the classpath do not undergo a security check.<comment>UFI: moved these paras here from the Security tab page</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_CLASSPATH_PB_ADDARCHIVE" id="bm_id5538804" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE" id="bm_id5538804" localize="false"/>
<paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="3" l10n="NEW">Add Archive</paragraph>
<paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE">Select an archive file in jar or zip format and add the file to the class path.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_CLASSPATH_PB_ADDPATH" id="bm_id3354899" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH" id="bm_id3354899" localize="false"/>
<paragraph role="heading" id="par_idN10625" xml-lang="en-US" level="3" l10n="NEW">Add Folder</paragraph>
<paragraph role="paragraph" id="par_idN10629" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH">Select a folder and add the folder to the class path.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_CLASSPATH_PB_REMOVE_PATH" id="bm_id1084017" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH" id="bm_id1084017" localize="false"/>
<paragraph role="heading" id="par_idN10640" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
<paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH">Select an archive or a folder in the list and click Remove to remove the object from the class path.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/javaparameters.xhp b/helpcontent2/source/text/shared/optionen/javaparameters.xhp
index b5138b721a..fc42f592e0 100755
--- a/helpcontent2/source/text/shared/optionen/javaparameters.xhp
+++ b/helpcontent2/source/text/shared/optionen/javaparameters.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: javaparameters.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@ dedr: reviewed</lastedited>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#java"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXDLG_JAVA_PARAMETER_ED_PARAMETER" id="bm_id1370891" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER" id="bm_id1370891" localize="false"/>
<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Java Start parameter</paragraph>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER">Enter a start parameter for a JRE as you would on a command line. Click Assign to add the parameter to the list of available start parameters.</ahelp></paragraph>
<paragraph role="note" id="par_id5404522" xml-lang="en-US" l10n="NEW">Do not use escape characters or quotes in path names.</paragraph>
@@ -60,13 +57,13 @@ dedr: reviewed</lastedited>
<paragraph role="example" id="par_idN1057E" xml-lang="en-US" l10n="NEW">-Xdebug</paragraph>
<paragraph role="example" id="par_idN10581" xml-lang="en-US" l10n="NEW">-Xrunjdwp:transport=dt_socket,server=y,address=8000</paragraph>
<paragraph role="note" id="par_idN1060C" xml-lang="en-US" l10n="NEW">These changes take effect after you restart %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_JAVA_PARAMETER_LB_ASSIGNED" id="bm_id9206518" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED" id="bm_id9206518" localize="false"/>
<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="3" l10n="NEW">Assigned start parameters</paragraph>
<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED">Lists the assigned JRE start parameters. To remove a start parameter, select the parameter, and then click <emph>Remove</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_PARAMETER_PB_ASSIGN" id="bm_id4533829" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN" id="bm_id4533829" localize="false"/>
<paragraph role="heading" id="par_idN105A7" xml-lang="en-US" level="3" l10n="NEW">Assign</paragraph>
<paragraph role="paragraph" id="par_idN105AB" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN">Adds the current JRE start parameter to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_JAVA_PARAMETER_PB_REMOVE" id="bm_id2460402" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE" id="bm_id2460402" localize="false"/>
<paragraph role="heading" id="par_idN105C2" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
<paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE">Deletes the selected JRE start parameter.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
index 29036fe5ed..ddd71a1d74 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: macrosecurity.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,9 +40,8 @@
</topic>
</meta>
<body>
-<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <link href="text/shared/optionen/01030300.xhp"><emph>Tools - Options - %PRODUCTNAME - Security</emph></link> page.</paragraph>
+<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link></variable></paragraph>
+<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01030300.xhp">%PRODUCTNAME - Security</link></emph> page.</paragraph>
<embed href="text/shared/optionen/macrosecurity_sl.xhp#macrosecurity_sl"/>
<embed href="text/shared/optionen/macrosecurity_ts.xhp#macrosecurity_ts"/>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
index 79dcf0c06b..524aa05433 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: macrosecurity_sl.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,19 +45,19 @@
<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>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_VERYHIGH" id="bm_id7283547" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH" id="bm_id7283547" localize="false"/>
<paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Very high</paragraph>
<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Only macros from trusted file locations are allowed to run. All other macros, regardless of whether they are signed or not, are disabled.<comment>UFI: for each option, the first para is copied from the string table.</comment></paragraph>
<paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted file locations can be set on the Trusted Sources tab page. Any macro from a trusted file location is allowed to run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_HIGH" id="bm_id2273934" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH" id="bm_id2273934" localize="false"/>
<paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="2" l10n="NEW">High</paragraph>
<paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US" l10n="NEW">Only signed macros from trusted sources are allowed to run. Unsigned macros are disabled.</paragraph>
<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted sources can be set on the Trusted Sources tab page. Only signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_MEDIUM" id="bm_id7128818" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM" id="bm_id7128818" localize="false"/>
<paragraph role="heading" id="par_idN105BA" xml-lang="en-US" level="2" l10n="NEW">Medium</paragraph>
<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW">Confirmation required before executing macros from unknown sources.</paragraph>
<paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Trusted sources can be set on the Trusted Sources tab page. Signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run. All other macros require your confirmation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_LOW" id="bm_id7408978" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW" id="bm_id7408978" localize="false"/>
<paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Low (not recommended)</paragraph>
<paragraph role="paragraph" id="par_idN105D6" xml-lang="en-US" l10n="NEW">All macros will be executed without confirmation. Use this setting only if you are certain that all documents that will be opened are safe.</paragraph>
<paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A macro can be set to auto-start, and it can perform potentially damaging actions, as for example delete or rename files. This setting is not recommended when you open documents from other authors.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
index 247a2d92b4..93255e6bd7 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_ts.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: macrosecurity_ts.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,15 +45,15 @@
<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Specifies the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> settings for trusted certificates and trusted file locations.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_TRUSTSOURCES" id="bm_id3047883" localize="false"/><paragraph role="heading" id="par_idN10578" xml-lang="en-US" level="2" l10n="NEW">Trusted certificates</paragraph>
<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the trusted certificates.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_VIEW_TRUSTCERT" id="bm_id146183" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="3" l10n="NEW">View</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT" id="bm_id146183" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="3" l10n="NEW">View</paragraph>
<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the View Certificate dialog for the selected certificate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_REMOVE_TRUSTCERT" id="bm_id6915799" localize="false"/><paragraph role="heading" id="par_idN105A6" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT" id="bm_id6915799" localize="false"/><paragraph role="heading" id="par_idN105A6" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
<paragraph role="paragraph" id="par_idN105AA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected certificate from the list of trusted certificates.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_ListBox_RID_XMLSECTP_TRUSTSOURCES_LB_TRUSTFILELOC" id="bm_id1044038" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="2" l10n="NEW">Trusted file locations</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC" id="bm_id1044038" localize="false"/><paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="2" l10n="NEW">Trusted file locations</paragraph>
<paragraph role="paragraph" id="par_idN105B1" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Document macros are only executed if they have been opened from one of the following locations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_FL_ADD_TRUSTFILELOC" id="bm_id1952879" localize="false"/><paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC" id="bm_id1952879" localize="false"/><paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
<paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a folder selection dialog. Select a folder from which all macros are allowed to execute.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_FL_REMOVE_TRUSTFILELOC" id="bm_id6851405" localize="false"/><paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC" id="bm_id6851405" localize="false"/><paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
<paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected folder from the list of trusted file locations.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/mailmerge.xhp b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
index e87352fb2b..bc5a3316cd 100755
--- a/helpcontent2/source/text/shared/optionen/mailmerge.xhp
+++ b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mailmerge.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,34 +49,34 @@
</section>
<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">User information</paragraph>
<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Enter the user information to use when you send e-mail.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_DISPLAYNAME" id="bm_id3323770" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME" id="bm_id3323770" localize="false"/>
<paragraph role="heading" id="par_idN1058A" xml-lang="en-US" level="3" l10n="NEW">Your name</paragraph>
<paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_ADDRESS" id="bm_id5569627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_ADDRESS" id="bm_id5569627" localize="false"/>
<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">E-mail address</paragraph>
<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your e-mail address for replies.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_MAILCONFIG_CB_REPLYTO" id="bm_id8856166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO" id="bm_id8856166" localize="false"/>
<paragraph role="heading" id="par_idN105C0" xml-lang="en-US" level="3" l10n="NEW">Send replies to different e-mail address</paragraph>
<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the e-mail address that you enter in the Reply address text box as the reply-to e-mail address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_REPLYTO" id="bm_id2134769" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_REPLYTO" id="bm_id2134769" localize="false"/>
<paragraph role="heading" id="par_idN105DB" xml-lang="en-US" level="3" l10n="NEW">Reply address</paragraph>
<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the address to use for e-mail replies.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105EE" xml-lang="en-US" level="2" l10n="NEW">Outgoing server (SMTP) settings</paragraph>
<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US" l10n="NEW">Specify the server settings for outgoing e-mails.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_SERVER" id="bm_id7700735" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_SERVER" id="bm_id7700735" localize="false"/>
<paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="3" l10n="NEW">Server name</paragraph>
<paragraph role="paragraph" id="par_idN10601" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the SMTP server name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_TP_MAILCONFIG_NF_PORT" id="bm_id6578569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_MAILCONFIG:NF_PORT" id="bm_id6578569" localize="false"/>
<paragraph role="heading" id="par_idN10618" xml-lang="en-US" level="3" l10n="NEW">Port</paragraph>
<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the SMTP port.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_TP_MAILCONFIG_LB_SECURE" id="bm_id5304116" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/879363086" id="bm_id72634" localize="false"/>
+<!-- removed HID sw_ListBox_TP_MAILCONFIG_LB_SECURE -->
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_MAILCONFIG_CB_SECURE" id="bm_id72634" localize="false"/>
<paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2" l10n="NEW">Use secure connection</paragraph>
<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When available, uses a secure connection to send e-mails.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_MAILCONFIG_PB_AUTHENTICATION" id="bm_id611896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION" id="bm_id611896" localize="false"/>
<paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="2" l10n="NEW">Server Authentication</paragraph>
<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link> dialog where you can specify the server authentication settings for secure e-mail.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_MAILCONFIG_PB_TEST" id="bm_id926847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_MAILCONFIG:PB_TEST" id="bm_id926847" localize="false"/>
<paragraph role="heading" id="par_idN10677" xml-lang="en-US" level="2" l10n="NEW">Test Settings</paragraph>
<paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link> dialog to test the current settings.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index 88d6249ab3..6804a1f093 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -117,6 +113,7 @@ XHPFILES = \
01160100.xhp \
01160200.xhp \
01160201.xhp \
+ improvement.xhp \
java.xhp \
javaclasspath.xhp \
javaparameters.xhp \
@@ -135,4 +132,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/optionen/online_update.xhp b/helpcontent2/source/text/shared/optionen/online_update.xhp
index 7e4398329d..83096d8ce1 100644
--- a/helpcontent2/source/text/shared/optionen/online_update.xhp
+++ b/helpcontent2/source/text/shared/optionen/online_update.xhp
@@ -1,19 +1,15 @@
<?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.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: online_update.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,46 +29,52 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Online Update</title>
-<filename>/text/shared/optionen/online_update.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="online_update">
+ <topic id="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Online Update</title>
+ <filename>/text/shared/optionen/online_update.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="online_update">
<bookmark xml-lang="en-US" branch="index" id="bm_id7657094"><bookmark_value>update options</bookmark_value>
-<bookmark_value>online update options</bookmark_value>
-<bookmark_value>options;online update</bookmark_value>
-<bookmark_value>online updates; checking automatically</bookmark_value>
-<bookmark_value>updates; checking automatically</bookmark_value>
+ <bookmark_value>online update options</bookmark_value>
+ <bookmark_value>options;online update</bookmark_value>
+ <bookmark_value>online updates; checking automatically</bookmark_value>
+ <bookmark_value>updates; checking automatically</bookmark_value>
+ <bookmark_value>Internet; checking for updates</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id29297" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/online_update.xhp">Online Update</link></paragraph>
-<paragraph role="paragraph" id="par_id8754844" xml-lang="en-US" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#online_update"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK" id="bm_id877101" localize="false"/><paragraph role="heading" id="hd_id2189397" xml-lang="en-US" level="2" l10n="NEW">Check for updates automatically</paragraph>
-<paragraph role="paragraph" id="par_id7523728" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem">Tools - Options - Internet - Proxy</item>.</paragraph>
-<paragraph role="paragraph" id="par_id8994109" xml-lang="en-US" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
-<paragraph role="paragraph" id="par_id476699" xml-lang="en-US" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
-<paragraph role="note" id="par_id4057130" xml-lang="en-US" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYDAY" id="bm_id3116855" localize="false"/><paragraph role="heading" id="hd_id266426" xml-lang="en-US" level="3" l10n="NEW">Every Day</paragraph>
-<paragraph role="paragraph" id="par_id3031098" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYWEEK" id="bm_id9302041" localize="false"/><paragraph role="heading" id="hd_id8276619" xml-lang="en-US" level="3" l10n="NEW">Every Week</paragraph>
-<paragraph role="paragraph" id="par_id7824030" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYMONTH" id="bm_id5097201" localize="false"/><paragraph role="heading" id="hd_id7534104" xml-lang="en-US" level="3" l10n="NEW">Every Month</paragraph>
-<paragraph role="paragraph" id="par_id209051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHECKNOW" id="bm_id5540025" localize="false"/><paragraph role="heading" id="hd_id1418805" xml-lang="en-US" level="3" l10n="NEW">Check now</paragraph>
-<paragraph role="paragraph" id="par_id1743522" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment><paragraph role="heading" id="hd_id5994140" xml-lang="en-US" level="2" l10n="NEW">Download updates automatically</paragraph>
-<paragraph role="paragraph" id="par_id7870113" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3051545" xml-lang="en-US" level="3" l10n="NEW">Download destination</paragraph>
-<paragraph role="paragraph" id="par_id3061311" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id4814905" xml-lang="en-US" level="3" l10n="NEW">Change</paragraph>
-<paragraph role="paragraph" id="par_id2143925" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id29297" role="heading" level="1" l10n="NEW"><link href="text/shared/optionen/online_update.xhp">Online Update</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id8754844" role="paragraph" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#online_update"/>
+ </section>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK" id="bm_id877101" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY" id="bm_id3116855" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id266426" role="heading" level="3" l10n="NEW">Every Day</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3031098" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK" id="bm_id9302041" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8276619" role="heading" level="3" l10n="NEW">Every Week</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7824030" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH" id="bm_id5097201" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id7534104" role="heading" level="3" l10n="NEW">Every Month</paragraph>
+ <paragraph xml-lang="en-US" id="par_id209051" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW" id="bm_id5540025" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1418805" role="heading" level="3" l10n="NEW">Check now</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1743522" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id5994140" role="heading" level="2" l10n="NEW">Download updates automatically</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7870113" role="paragraph" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3051545" role="heading" level="3" l10n="NEW">Download destination</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3061311" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id4814905" role="heading" level="3" l10n="NEW">Change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2143925" role="paragraph" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
index 4114a97952..e831448d6f 100755
--- a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
+++ b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: serverauthentication.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,45 +34,41 @@
<title id="tit" xml-lang="en-US">Server Authentication</title>
<filename>/text/shared/optionen/serverauthentication.xhp</filename>
</topic>
-<history>
-<created date="2004-10-06T16:42:30">UFI: Server Authentication dialog from Writer Mail Merge settings</created>
-<lastedited date="2004-10-27T09:32:14">DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link></paragraph>
-<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_SERVERAUTHENTICATION_CB_AUTHENTICATION" id="bm_id4849085" localize="false"/>
+<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION" id="bm_id4849085" localize="false"/>
<paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">The outgoing mail server (SMTP) requires authentication</paragraph>
<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the authentication that is required to send e-mail by SMTP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SEP_AUTHENTICATION" id="bm_id3792535" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION" id="bm_id3792535" localize="false"/>
<paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="3" l10n="NEW">The outgoing mail server (SMTP) requires separate authentication</paragraph>
<paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select if your SMTP server requires a user name and password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_USERNAME" id="bm_id1043122" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME" id="bm_id1043122" localize="false"/>
<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="4" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN105EA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name for the SMTP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_OUTPASSWORD" id="bm_id3897824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD" id="bm_id3897824" localize="false"/>
<paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="4" l10n="NEW">Password</paragraph>
<paragraph role="paragraph" id="par_idN10602" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password for the user name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_SMPTAFTERPOP" id="bm_id3506881" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP" id="bm_id3506881" localize="false"/>
<paragraph role="heading" id="par_idN10615" xml-lang="en-US" level="3" l10n="NEW">The outgoing mail server uses the same authentication as the incoming mail server.</paragraph>
<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select if you are required to first read your e-mail before you can send e-mail.</ahelp> This method is also called "SMTP after POP3".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_SERVER" id="bm_id9126255" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER" id="bm_id9126255" localize="false"/>
<paragraph role="heading" id="par_idN10629" xml-lang="en-US" level="4" l10n="NEW">Server name</paragraph>
<paragraph role="paragraph" id="par_idN1062C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the server name of your POP 3 or IMAP mail server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_DLG_MM_SERVERAUTHENTICATION_NF_PORT" id="bm_id8613849" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT" id="bm_id8613849" localize="false"/>
<paragraph role="heading" id="par_idN1063B" xml-lang="en-US" level="4" l10n="NEW">Port</paragraph>
<paragraph role="paragraph" id="par_idN10640" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the port on the POP3 or IMAP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_POP3" id="bm_id1679738" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3" id="bm_id1679738" localize="false"/>
<paragraph role="heading" id="par_idN10653" xml-lang="en-US" level="4" l10n="NEW">POP 3</paragraph>
<paragraph role="paragraph" id="par_idN10658" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies that the incoming mail server uses POP 3.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_SERVERAUTHENTICATION_RB_IMAP" id="bm_id8912015" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP" id="bm_id8912015" localize="false"/>
<paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="4" l10n="NEW">IMAP</paragraph>
<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies that the incoming mail server uses IMAP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_INUSERNAME" id="bm_id1524399" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME" id="bm_id1524399" localize="false"/>
<paragraph role="heading" id="par_idN10679" xml-lang="en-US" level="4" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN1067E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name for the IMAP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_MM_SERVERAUTHENTICATION_ED_INPASSWORD" id="bm_id5329447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD" id="bm_id5329447" localize="false"/>
<paragraph role="heading" id="par_idN10691" xml-lang="en-US" level="4" l10n="NEW">Password</paragraph>
<paragraph role="paragraph" id="par_idN10696" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the password.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/testaccount.xhp b/helpcontent2/source/text/shared/optionen/testaccount.xhp
index 6c2fac999d..2e81023e1a 100755
--- a/helpcontent2/source/text/shared/optionen/testaccount.xhp
+++ b/helpcontent2/source/text/shared/optionen/testaccount.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: testaccount.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,21 +34,17 @@
<title id="tit" xml-lang="en-US">Test Account Settings</title>
<filename>/text/shared/optionen/testaccount.xhp</filename>
</topic>
-<history>
-<created date="2004-10-06T16:32:57">UFI: Test Account Settings dialog from Mail Merge E-Mail tab page</created>
-<lastedited date="2004-10-15T13:08:20">YJ: checked</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MM_TESTACCOUNTSETTINGS_TLB" id="bm_id6709494" localize="false"/>
<paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" l10n="NEW">(Results list box)</paragraph>
<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the top list box you will see the results of the test session.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_MultiLineEdit_DLG_MM_TESTACCOUNTSETTINGS_ED_ERROR" id="bm_id3895382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR" id="bm_id3895382" localize="false"/>
<paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Errors</paragraph>
<paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the Errors list box you can read an explanation of any errors encountered while testing the settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_TESTACCOUNTSETTINGS_PB_STOP" id="bm_id9591051" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP" id="bm_id9591051" localize="false"/>
<paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Stop</paragraph>
<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click the <emph>Stop</emph> button to stop a test session manually.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate.xhp
index ffac5affd0..c66ed7d25c 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: viewcertificate.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
index f46d1dcac9..ad9060d1f4 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_c.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: viewcertificate_c.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_VIEWSIGNATURES" id="bm_id7465742" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_MultiLineEdit_RID_XMLSECTP_CERTPATH_ML_CERTSTATUS" id="bm_id3149815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS" id="bm_id3149815" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_TP_CERTPATH" id="bm_id3747978" localize="false"/>
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="certificatepath"><link href="text/shared/optionen/viewcertificate_c.xhp">Certificate Path</link>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
index 3856ea8a36..4afe249f80 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_d.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: viewcertificate_d.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><variable id="details"><link href="text/shared/optionen/viewcertificate_d.xhp">Details</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Details page of the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog displays detailed information about the certificate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity_MultiLineEdit_RID_XMLSECTP_DETAILS_ML_ELEMENT" id="bm_id6321909" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsecurity:MultiLineEdit:RID_XMLSECTP_DETAILS:ML_ELEMENT" id="bm_id6321909" localize="false"/>
<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use the value list box to view values and copy them to the clipboard.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp b/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
index c9c12827cc..b140a181f4 100644
--- a/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
+++ b/helpcontent2/source/text/shared/optionen/viewcertificate_g.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: viewcertificate_g.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/tree_strings.xhp b/helpcontent2/source/text/shared/tree_strings.xhp
index f06b372c8c..31991694cb 100755
--- a/helpcontent2/source/text/shared/tree_strings.xhp
+++ b/helpcontent2/source/text/shared/tree_strings.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tree_strings.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
<paragraph role="paragraph" id="par_id3166461" l10n="U" xml-lang="en-US" oldref="10">&lt;node id=&quot;0205&quot; title=&quot;Tables in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3155136" l10n="U" xml-lang="en-US" oldref="11">&lt;node id=&quot;0206&quot; title=&quot;Objects in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3155629" l10n="U" xml-lang="en-US" oldref="12">&lt;node id=&quot;0207&quot; title=&quot;Sections and Frames in Text Documents&quot;&gt;</paragraph>
- <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Content and Indexes&quot;&gt;</paragraph>
+ <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Contents and Indexes&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3153349" l10n="U" xml-lang="en-US" oldref="14">&lt;node id=&quot;0209&quot; title=&quot;Fields in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3145120" l10n="U" xml-lang="en-US" oldref="15">&lt;node id=&quot;0210&quot; title=&quot;Navigating Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3159400" l10n="U" xml-lang="en-US" oldref="16">&lt;node id=&quot;0211&quot; title=&quot;Calculating in Text Documents&quot;&gt;</paragraph>