summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/01
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/01')
-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
295 files changed, 4871 insertions, 5316 deletions
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