diff options
| author | Christian Lohmaier <cloph@openoffice.org> | 2010-04-23 21:45:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <cloph@openoffice.org> | 2010-04-23 21:45:49 +0200 |
| commit | 9f0bf71f06fac9cec6af0552ce4bb86a76672725 (patch) | |
| tree | 2e1edceceec797f8d40ba0cc8a3beb5b4aaa4334 /instsetoo_native | |
| parent | 9cd90e053cdf34f8a5d14f39e04ca14b10a5528b (diff) | |
| parent | a0de0def4a49a63c6675a622123b793da8b4c78d (diff) | |
cloph14: merge with DEV300_m77
Diffstat (limited to 'instsetoo_native')
21 files changed, 603 insertions, 215 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp Binary files differindex 5078e379c37d..d7f7f635917e 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp Binary files differindex e69b561f9165..515f8faecc7a 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt index becf435a74b0..50fcb25b92d2 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt @@ -33,35 +33,120 @@ multiwestern = "{D53F8583-419E-440E-AC00-40E9AB31EEBF}" multiasia = "{C0D08A10-A266-46DC-8EF4-BE0E5928129D}" [UPGRADECODE] -en-US = "{8B909084-2220-49AC-A421-142180519088}" -pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}" -ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}" +af = "{3E85B9F2-0AC3-4E57-8072-260A6FE05D02}" +ar = "{DF297699-3040-48E0-B0E6-B54385D76018}" +as-IN = "{62E2F6A6-4521-4E36-A751-46E91A58CFB5}" +be-BY = "{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974}" +bo = "{5F9461CD-2937-4EE0-AF03-24E72987244E}" +bg = "{29FF0FAA-B831-4398-BE3F-FC13949D1CAE}" +br = "{6E4658DD-79B0-4707-93C2-B022D66157A1}" +brx = "{6DD492EA-45CD-483E-8563-23355FD37E28}" +bn = "{4D1449E7-D10B-44D8-AAB0-257D6930B0C2}" +bn-BD = "{3195C77E-8462-45DA-BEFC-37F1299D889E}" +bn-IN = "{763F5343-47FC-4909-8C18-D9E0CEED533A}" +bs = "{DCC737A4-531E-4DCD-A3C4-376DA4C76D00}" +by = "{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E}" +ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}" +cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}" +cy = "{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3}" +da = "{4E7025EF-909F-4609-97BA-304684C4833D}" +de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}" +dgo = "{205ADC32-F775-476A-B68E-949F85D0B0E3}" +dz = "{3D391D0A-66D3-4141-8554-65DECA138208}" el = "{39772F91-1D37-4866-BBA4-900AB53590B0}" -nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}" -fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}" +en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}" +en-US = "{8B909084-2220-49AC-A421-142180519088}" +en-ZA = "{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93}" +eo = "{A256340D-4065-4B6F-AC1D-EB0D5127EBCE}" es = "{01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}" +et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}" +eu = "{A73CB85E-760B-4E5D-AB26-7DF091C25F16}" +fa = "{12D1FE4A-95E1-4BED-B377-2E8EA93B2461}" fi = "{481B0FE0-8313-442E-8A53-7C5139ADA3DC}" +fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}" +ga = "{39B343FE-EC1F-451E-930A-47D85E96DE67}" +gd = "{DE408221-68E9-418D-9B20-10BE458268F2}" +gl = "{38616841-D0DB-4768-B9B8-27D61A91FB47}" +gu = "{382A0F08-CF86-45C4-8119-67C87E275EFE}" +gu-IN = "{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B}" +he = "{13484272-CE60-4867-B494-D56F9049B95A}" +hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}" +hi-IN = "{DDAB0849-CC63-475C-AC87-388B93579A28}" +hr = "{0750A25E-7492-4681-8DFD-E04E89E45C0A}" hu = "{5981EE94-6763-40AD-A8A0-EEB01CCA153C}" -ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}" +is = "{ED6D0C4C-2746-40A9-A672-4D9950C421C0}" it = "{50087605-A504-441B-B514-67F13A284C10}" -cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}" -sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}" -en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}" -da = "{4E7025EF-909F-4609-97BA-304684C4833D}" -sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}" +ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}" +kid = "{1A4DA798-78EB-46B8-A5CE-4E32F883314C}" +ky = "{3110031F-1B5D-4457-BB5C-F6A330F15419}" +ka = "{08E10841-B5EF-4BF9-9688-AE25573E6DA7}" +kk = "{1527983C-2953-45B4-87A5-C7D67A1F6C60}" +km = "{B4E6E1AC-C45E-48BB-A038-073C32693B65}" +kn = "{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11}" +ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}" +kok = "{CC3129BA-331A-42CC-8569-93F9E05B6400}" +ks = "{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC}" +ku = "{2C5FB742-9A33-410D-AC5C-A376D4967D69}" +lo = "{3968BFB2-35F7-4BBC-9E3E-C640BF09587D}" +lt = "{3526DA6A-7EA6-471C-973E-C0461DE85909}" +lv = "{BC085A1A-38A6-462A-889F-6E7CA442D9D8}" +mai = "{BE522738-E05A-431A-B535-29349EBF86AE}" +mk = "{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8}" +mn = "{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E}" +mni = "{3CBD068D-E6AE-4C02-8091-DD4F2866336A}" +ms = "{F300CABB-ED67-468E-A336-87DEC6E22CFC}" +ml-IN = "{F2F04B66-9996-425D-A026-0AE99F5DB878}" +mr-IN = "{4B87A651-94B3-48DF-800C-9458C3A93179}" +my = "{E1C174A0-8126-43A8-B696-9F9DE676E1ED}" +ne = "{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C}" +nb = "{6E732530-FCDD-484C-A575-1289731020FD}" +nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}" +nn = "{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5}" no = "{00C1656C-6386-42ED-BE8C-5D6C553EF125}" +nr = "{0E64C806-9EB2-4651-BB94-B8D9814FD9E5}" +ns = "{5142883F-6084-4723-907B-EFD4A5097817}" +om = "{8D6EE539-9E74-41C0-8DED-807F91D68467}" +oc = "{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB}" +or-IN = "{11771BE2-44D3-4ACD-882B-26C4947237C5}" +pap = "{C4AC769D-F356-4D1A-A3A4-62E6729CF403}" +pa-IN = "{1869854A-30BE-40EF-B72C-AF0CCA1A5A91}" pl = "{9C92258E-9A41-4A03-AA5C-FD8EF15189BA}" -de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}" +ps = "{277B630B-64D9-4105-A542-6F279A31A72C}" +pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}" pt-BR = "{7364F154-089D-400B-B275-751AAB9A6122}" +ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}" +rw = "{D1D013B7-9570-4165-8421-BBDC97842260}" +sat = "{233A2442-D417-458E-A67F-4C3E58B54387}" +sa-IN = "{180CEB68-8F15-4533-B2C2-43D47DED7ABB}" +si = "{6CFE884D-10C2-42F7-A60F-52A8284E8D45}" +sc = "{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183}" +sd = "{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75}" +sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}" +sl = "{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD}" +sh = "{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4}" +sr = "{49A004A2-3B8B-4029-B403-89919CB52355}" +ss = "{5B0E4353-AB4E-497E-B38F-2E784C7B1F35}" +st = "{FC92FF2C-0E4B-4EB1-A962-682861EE4C33}" +sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}" +sw = "{90672FAA-14CA-4F63-8FE9-40E572A3969A}" +sw-TZ = "{905F971E-91FC-4F85-90D6-F6217A4FF01A}" +te-IN = "{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7}" +ti-ER = "{1FEF45BC-1315-46F4-B89B-6660226758DE}" +ta-IN = "{76D5C227-D097-4B4E-B4C7-B2370B4F7932}" th = "{1F9BC074-55AA-496A-9EC5-05E65CF64AE6}" -et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}" -ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}" -ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}" +tn = "{685C3085-DCD2-40F6-85C9-5084402D7E0F}" +tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}" +ts = "{AC285965-9D0F-4D55-8885-0F0A9B9888B1}" +tg = "{6C238E70-72FA-45FA-BC58-C508CD3AF6FC}" +ug = "{57836D3D-879A-4288-8C47-691ECC4EECBE}" +ur-IN = "{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD}" +uk = "{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0}" +uz = "{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D}" +ve = "{95AD70B2-CE4A-4362-975E-6C48DC70179C}" +vi = "{9B664C3A-CD48-4717-A40D-3B02475D7E20}" +xh = "{1BCF7835-9CD6-454E-9530-64222CCF29E7}" zh-CN = "{5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}" zh-TW = "{08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}" -tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}" -hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}" -ar = "{DF297699-3040-48E0-B0E6-B54385D76018}" -he = "{13484272-CE60-4867-B494-D56F9049B95A}" +zu = "{924D7527-25C6-4B95-95C7-7B68DABEC93E}" multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}" multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}" diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt index 073fad35d282..f4bd9e6fbbec 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt @@ -33,35 +33,120 @@ multiwestern = "{E404F8D3-5FC2-44BF-97F9-901A24DF6A3E}" multiasia = "{714181AC-7DE5-49D3-AF09-292EB90DB750}" [UPGRADECODE] -en-US = "{5A5BF785-994C-44D0-A2D2-7C757C1E87B2}" -pt = "{C62DBDBB-F1B6-4ACA-A0C6-D0B164A945CD}" -ru = "{E1475570-6060-4EF8-834A-A241969A2061}" +af = "{0FB73E2F-AB13-46C2-BA45-245A3F3A4750}" +ar = "{2E0EFF99-3023-4734-9D56-4E7400898182}" +as-IN = "{3A400267-1BAE-4912-9800-8C26FDD547DE}" +be-BY = "{01CD6DF5-A3D9-4D76-B39D-02FEC0C439E5}" +bo = "{18DE4A08-BD3A-433A-91B1-85998EA033F5}" +bg = "{2DFA49FA-A3B6-44CA-A2BB-01DF463186D7}" +br = "{77851653-0428-4A45-AE05-076D7D58E9B0}" +brx = "{F2BC3BEC-6634-4F9E-B878-5008EC622E5C}" +bn = "{C85CC50B-AD2E-4462-8517-36E499DF7CED}" +bn-BD = "{3D4B1DA5-3846-49B0-8BEC-05869EF3F587}" +bn-IN = "{2F8A7B29-EDC9-4681-B5B5-0DED9EA7E563}" +bs = "{2AB403D8-19E9-46FD-A514-40FE49FFDD7C}" +by = "{BFB3DBFA-B114-41D0-9C78-6BB85161A555}" +ca = "{5032D03F-55BB-4CF5-ABDA-6AAB4002D12C}" +cs = "{842F16E3-E4FA-4B23-AFA0-4DF9DE8CA4F8}" +cy = "{EC0B288E-7A19-4CC3-9B5F-FA63413226B1}" +da = "{3E8FFADF-A50E-4412-8613-5CFD55864FA3}" +de = "{63512266-4861-42F3-9269-3FBCFB9F60B2}" +dgo = "{69F5D053-0E5D-4260-A787-DBB78397D51D}" +dz = "{EC70E449-B165-43DD-A4ED-34F07C8C1E12}" el = "{8404A6EF-7E40-4B4C-86BC-450C51CFC8DA}" -nl = "{6D3E7570-BA59-492D-A83D-9C3D7B457EE6}" -fr = "{8374FA3E-5454-4060-AD5C-4D9978850194}" +en-GB = "{DD5DD115-63B5-4C5A-984A-423C4A22F9AB}" +en-US = "{5A5BF785-994C-44D0-A2D2-7C757C1E87B2}" +en-ZA = "{83C0A05D-611C-4EEC-A80B-030F9F93C693}" +eo = "{B891DEBE-300A-4CD5-8828-BE68529DE62E}" es = "{D30FCA19-CD1F-4052-9D84-BB45C1C7C0DD}" +et = "{60E1242E-CF22-4ABF-8ED4-F15BFAE31C72}" +eu = "{A1662F7D-BF01-4F7C-83FB-BAB1B9B5D081}" +fa = "{09F1B354-A2C1-434A-93ED-A8C0E480BE23}" fi = "{071D642E-D898-4224-9EB5-353FC79EB6B5}" +fr = "{8374FA3E-5454-4060-AD5C-4D9978850194}" +ga = "{4AE98AD0-7D79-48E6-A819-75F7323261D5}" +gd = "{2D44F336-E62D-41A1-A88B-0A8023217B19}" +gl = "{97F43DDB-E046-4AC5-81BB-F64707098EE3}" +gu = "{1FABFA47-C362-4AB1-9E26-C65B4511CF5A}" +gu-IN = "{DB97DBBB-CC40-405A-A774-CC3F40C935A9}" +he = "{A657505A-2A57-453B-8B47-F8D605A8AFE0}" +hi = "{C0B220D1-2548-4E2C-BD7B-B7A14FE1C977}" +hi-IN = "{EA2CB52A-E5AA-45E7-80C6-DE7EB76A1E5D}" +hr = "{764043CA-CF26-4862-80BF-29E3AAD9E144}" hu = "{03CBE5BA-E9C4-4CF3-8B36-7BEDB31F256A}" -ca = "{5032D03F-55BB-4CF5-ABDA-6AAB4002D12C}" +is = "{DF95762B-5307-4B85-B4C5-B144BB02C5FB}" it = "{3F22750A-31C1-4C86-BD57-4A928A7F657E}" -cs = "{842F16E3-E4FA-4B23-AFA0-4DF9DE8CA4F8}" -sk = "{9AB7EEDB-11F5-4088-B581-FE711EDE6DCB}" -en-GB = "{DD5DD115-63B5-4C5A-984A-423C4A22F9AB}" -da = "{3E8FFADF-A50E-4412-8613-5CFD55864FA3}" -sv = "{FD2E4280-BCFC-4109-A431-EC720C44A392}" +ja = "{52E22B79-3C25-4BFF-BC5B-FC37EE5020DC}" +kid = "{704FAB24-F8F9-4245-8BA7-1931B3176951}" +ky = "{568D4A30-A1EC-4060-A8EE-41277EF3985C}" +ka = "{C196B961-1F5F-438E-B764-73F91C6CAEA5}" +kk = "{B63AD05D-90E5-45B5-B3FA-B69C47380E86}" +km = "{3A469632-5FB9-4F99-AC5D-744B5D17C6D8}" +kn = "{D62D8785-CAF0-4650-8EA1-D713D61CC299}" +ko = "{02FDC794-9AE9-4D64-9312-FF2DE0EF3104}" +kok = "{6D72F5E0-D1D1-4BF4-8357-E5DC50CC1067}" +ks = "{4ED85F09-A3C9-4C63-A34B-A2AF16098825}" +ku = "{D89A3F76-2161-44AA-8FD7-755E3033AC02}" +lo = "{28FD3AC9-0676-46E6-97E7-5E06B0A3CF0C}" +lt = "{4E8F4857-EB42-4D96-94AD-0058C817B5F2}" +lv = "{6BF5ADF5-F75C-4E0A-8E16-9829D3B194FD}" +mai = "{4D9B6646-80B7-48D1-BB19-684152EB3DA3}" +mk = "{99F82176-F642-42A7-B0DF-052E7096A4F8}" +mn = "{7ED4CD40-F9C3-4787-AFBD-FB42F1F9223D}" +mni = "{031C2836-62D6-481F-B9D9-C0B3340280EC}" +ms = "{FC4C1B4A-6571-4674-B5B2-6D42860D4DF6}" +ml-IN = "{D3936188-9845-4AFD-A484-D6D634103917}" +mr-IN = "{E5ADEAB5-42A1-41D6-AD58-92C17CAE411D}" +my = "{5EB48BA3-4CFF-48CC-9301-DF5A99E901C8}" +ne = "{384BCFE4-EDD0-4897-9924-82CB51E80381}" +nb = "{DF312B1B-93E3-4903-8467-6DF2786F0009}" +nl = "{6D3E7570-BA59-492D-A83D-9C3D7B457EE6}" +nn = "{CB24EBA2-28FA-4EFF-9DD6-890D376F036A}" no = "{A890155F-9333-4869-8816-D32720841A01}" +nr = "{D6FACDDF-EF17-4773-A9A8-9B84A2E7E62C}" +ns = "{16FE7611-2139-4D83-81DF-F6ED5A322F06}" +om = "{CE5F3BEC-D59B-45CD-A451-A08E9F7018EA}" +oc = "{A485C6CB-34A7-4969-A0AC-78241D417C95}" +or-IN = "{2B3F3A48-231B-4AB6-B1CB-7FA173F704DB}" +pap = "{DA0E5FD9-1C4D-4AB6-BA11-B34DFBB3FA17}" +pa-IN = "{4FF51E79-A1C5-4D60-AE8D-A880483F4182}" pl = "{F5019C24-CC86-4E86-84A5-53FF98539D04}" -de = "{63512266-4861-42F3-9269-3FBCFB9F60B2}" +ps = "{7AA8672E-9811-4ECD-828D-EB694373C72C}" +pt = "{C62DBDBB-F1B6-4ACA-A0C6-D0B164A945CD}" pt-BR = "{F7F75CB1-2123-4B5B-BC00-11440725B71B}" +ru = "{E1475570-6060-4EF8-834A-A241969A2061}" +rw = "{35BAFF73-3654-4E74-8E44-0F74842785DF}" +sat = "{E34A52B2-ADAA-4C58-AC3B-9FD91C135BC2}" +sa-IN = "{6732C0EC-1DC7-428C-BC7B-E1B752AD23E5}" +si = "{E3F62111-0A68-4268-8850-C49B830A1E57}" +sc = "{F585A19E-3AB9-496C-B06A-0CE6690148C8}" +sd = "{43252725-3200-45AF-A99B-913F532BD9DF}" +sk = "{9AB7EEDB-11F5-4088-B581-FE711EDE6DCB}" +sl = "{E3363531-F96D-4756-88E8-240E9BFBD3B7}" +sh = "{8E722E7F-6100-41F6-BCF2-0E8AF1405BF0}" +sr = "{CB0957AD-996F-4B67-90C7-36E6288EEAB8}" +ss = "{BF227916-E342-4307-91DB-97D72DE31233}" +st = "{7B38DA39-FE10-43EC-A9B4-34470BD44252}" +sv = "{FD2E4280-BCFC-4109-A431-EC720C44A392}" +sw = "{D3689B53-4B06-443F-8A2B-7937E7514BC4}" +sw-TZ = "{462A874C-20D9-45B5-970A-B93C922CFCD5}" +te-IN = "{8916B89F-7763-4112-9820-B58BFF350D9B}" +ti-ER = "{47D18328-E629-4E6E-9E64-BE6C37C89098}" +ta-IN = "{DF4D12DF-EB5D-44C8-8E41-60DFEFF1E623}" th = "{8A51A028-CFBE-4B1F-8C20-94E4A6D53675}" -et = "{60E1242E-CF22-4ABF-8ED4-F15BFAE31C72}" -ja = "{52E22B79-3C25-4BFF-BC5B-FC37EE5020DC}" -ko = "{02FDC794-9AE9-4D64-9312-FF2DE0EF3104}" +tn = "{BF0EB46F-05D8-4349-BEE8-57A0BFFE809E}" +tr = "{6D6315EA-4B6F-4A62-AE4B-7197F6C00106}" +ts = "{6824A943-F895-4F67-812C-0062BEF03E38}" +tg = "{8AFD7661-482B-48DC-A103-5542A0D54B94}" +ug = "{7C8A4BC9-0288-4CD2-B721-C43A283F5E52}" +ur-IN = "{2E261973-B842-4C33-8FEE-1C2EC8D45451}" +uk = "{AE29A49E-45F0-4BB4-82C9-77FFCA6394E3}" +uz = "{CF6C8A15-A742-437F-9669-F8BE198873DF}" +ve = "{C633A368-E04A-44EA-AFAF-15ADEDD8BF91}" +vi = "{71643076-66F2-47E8-9826-0D378956568E}" +xh = "{56F23458-B7E6-4D97-89F2-A5A56E605A6C}" zh-CN = "{14D843EF-5A1D-4EE4-9BAB-EC0A7A6F96D0}" zh-TW = "{98E66873-0C3E-4399-8676-A9D720071672}" -tr = "{6D6315EA-4B6F-4A62-AE4B-7197F6C00106}" -hi = "{C0B220D1-2548-4E2C-BD7B-B7A14FE1C977}" -ar = "{2E0EFF99-3023-4734-9D56-4E7400898182}" -he = "{A657505A-2A57-453B-8B47-F8D605A8AFE0}" +zu = "{E317CFA7-4C92-4B3E-8528-8D44B2081C00}" multiwestern = "{157A7FB6-A116-455C-AF18-3A46D8273B8D}" multiiasia = "{E4C656E5-8F10-4A3A-B3A6-35C894DE637C}" diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 5468076d22d4..7fcb566af0e3 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -284,7 +284,7 @@ en-US = "< &Back" en-US = "Cancel" [OOO_CONTROL_124] -en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html" +en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html" [OOO_CONTROL_125] en-US = "&Next >" @@ -668,10 +668,10 @@ en-US = "Microsoft Po&werPoint Presentations" en-US = "&[ProductName] Writer/Web" [OOO_CONTROL_274] -en-US = "Set [DEFINEDPRODUCT] to be the default application for these file types." +en-US = "Set [DEFINEDPRODUCT] to be the default application for Microsoft Office file types." [OOO_CONTROL_275] -en-US = "[ProductName] can be set as the default application to open the following file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the progam that opens it now." +en-US = "[ProductName] can be set as the default application to open Microsoft Office file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the program that opens it now." [OOO_CONTROL_276] en-US = "File types" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp Binary files differindex 5078e379c37d..d7f7f635917e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp Binary files differindex e69b561f9165..515f8faecc7a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt index d3b7a6027356..f335fb6828e1 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt @@ -12,6 +12,12 @@ CustomerInformation SerialNumber Show SERIALNUMSHOW CustomSetup ChangeFolder Hide Installed CustomSetup Details Hide Installed CustomSetup InstallLabel Hide Installed +FileTypeDialog CheckBox1 Enable &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) +FileTypeDialog CheckBox1 Disable NOT ( &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) ) +FileTypeDialog CheckBox2 Enable &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) +FileTypeDialog CheckBox2 Disable NOT ( &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) ) +FileTypeDialog CheckBox3 Enable &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) +FileTypeDialog CheckBox3 Disable NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) ) InstallWelcome Copyright Hide SHOWCOPYRIGHT="No" InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes" LicenseAgreement Next Disable AgreeToLicense <> "Yes" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index 9aff71e515d9..2200f4d28a3a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -33,7 +33,7 @@ CustomSetup Details SelectionBrowse DiskSpaceRequirements 1 1 CustomSetup Help SpawnDialog CustomSetupTips 1 1 CustomSetup Next [_IsSetupTypeMin] Custom 1 0 CustomSetup Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0 -CustomSetup Next NewDialog ReadyToInstall OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1) 9 +CustomSetup Next NewDialog FileTypeDialog OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1) 9 CustomSetup Next DoAction ResetLanguageSelected 1 1 CustomSetup Next DoAction SetLanguageSelected (isMulti <> 1) Or Installed 3 CustomSetup Next DoAction SetLanguageSelected (isMulti = 1) And Not Installed And (LANGUAGECONDITIONINSTALL) 4 @@ -57,8 +57,7 @@ DiskSpaceRequirements OK EndDialog Return 1 0 FilesInUse Exit EndDialog Exit 1 0 FilesInUse Ignore EndDialog Ignore 1 0 FilesInUse Retry EndDialog Retry 1 0 -FileTypeDialog Back NewDialog CustomSetup Installed OR _IsSetupTypeMin = "Custom" 2 -FileTypeDialog Back NewDialog SetupType NOT Installed AND _IsSetupTypeMin <> "Custom" 1 +FileTypeDialog Back NewDialog CustomSetup 1 1 FileTypeDialog Cancel SpawnDialog CancelSetup 1 0 FileTypeDialog Next NewDialog ReadyToInstall 1 0 InstallChangeFolder Cancel EndDialog Return 1 2 @@ -102,7 +101,7 @@ PatchWelcome Cancel SpawnDialog CancelSetup 1 1 PatchWelcome Next EndDialog Return 1 3 PatchWelcome Next Reinstall ALL PATCH And REINSTALL="" 1 PatchWelcome Next ReinstallMode omus PATCH And REINSTALLMODE="" 2 -ReadyToInstall Back NewDialog CustomSetup Installed OR _IsSetupTypeMin = "Custom" 2 +ReadyToInstall Back NewDialog FileTypeDialog Installed OR _IsSetupTypeMin = "Custom" 2 ReadyToInstall Back NewDialog MaintenanceType Installed AND _IsMaintenance = "Reinstall" 3 ReadyToInstall Back NewDialog SetupType NOT Installed AND _IsSetupTypeMin <> "Custom" 1 ReadyToInstall Cancel SpawnDialog CancelSetup 1 0 @@ -148,6 +147,7 @@ SetupType Back NewDialog CustomerInformation 1 0 SetupType Cancel SpawnDialog CancelSetup 1 0 SetupType Next AddLocal ALL _IsSetupTypeMin = "Typical" 0 SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0 -SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0 +SetupType Next [FILETYPEDIALOGUSED] 0 _IsSetupTypeMin <> "Custom" 5 +SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 6 SplashBitmap Cancel SpawnDialog CancelSetup 1 0 SplashBitmap Next NewDialog InstallWelcome 1 0 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index e3bb73b9ed90..80514fd1904b 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -3,36 +3,121 @@ s72 i2 S64 S255 CustomAction Action ISInitAllUsers 307 ALLUSERS 1 DontRemoveProducts 51 OLDPRODUCTS {} -DontRemoveLpEnusProducts 51 O2LPENUS {} -DontRemoveLpptProducts 51 O2LPPT {} -DontRemoveLpruProducts 51 O2LPRU {} +DontRemoveLpafProducts 51 O2LPAF {} +DontRemoveLparProducts 51 O2LPAR {} +DontRemoveLpasinProducts 51 O2LPASIN {} +DontRemoveLpbebyProducts 51 O2LPBEBY {} +DontRemoveLpboProducts 51 O2LPBO {} +DontRemoveLpbgProducts 51 O2LPBG {} +DontRemoveLpbrProducts 51 O2LPBR {} +DontRemoveLpbrxProducts 51 O2LPBRX {} +DontRemoveLpbnProducts 51 O2LPBN {} +DontRemoveLpbnbdProducts 51 O2LPBNBD {} +DontRemoveLpbninProducts 51 O2LPBNIN {} +DontRemoveLpbsProducts 51 O2LPBS {} +DontRemoveLpbyProducts 51 O2LPBY {} +DontRemoveLpcaProducts 51 O2LPCA {} +DontRemoveLpcsProducts 51 O2LPCS {} +DontRemoveLpcyProducts 51 O2LPCY {} +DontRemoveLpdaProducts 51 O2LPDA {} +DontRemoveLpdeProducts 51 O2LPDE {} +DontRemoveLpdgoProducts 51 O2LPDGO {} +DontRemoveLpdzProducts 51 O2LPDZ {} DontRemoveLpelProducts 51 O2LPEL {} -DontRemoveLpnlProducts 51 O2LPNL {} -DontRemoveLpfrProducts 51 O2LPFR {} +DontRemoveLpengbProducts 51 O2LPENGB {} +DontRemoveLpenusProducts 51 O2LPENUS {} +DontRemoveLpenzaProducts 51 O2LPENZA {} +DontRemoveLpeoProducts 51 O2LPEO {} DontRemoveLpesProducts 51 O2LPES {} +DontRemoveLpetProducts 51 O2LPET {} +DontRemoveLpeuProducts 51 O2LPEU {} +DontRemoveLpfaProducts 51 O2LPFA {} DontRemoveLpfiProducts 51 O2LPFI {} +DontRemoveLpfrProducts 51 O2LPFR {} +DontRemoveLpgaProducts 51 O2LPGA {} +DontRemoveLpgdProducts 51 O2LPGD {} +DontRemoveLpglProducts 51 O2LPGL {} +DontRemoveLpguProducts 51 O2LPGU {} +DontRemoveLpguinProducts 51 O2LPGUIN {} +DontRemoveLpheProducts 51 O2LPHE {} +DontRemoveLphiProducts 51 O2LPHI {} +DontRemoveLphiinProducts 51 O2LPHIIN {} +DontRemoveLphrProducts 51 O2LPHR {} DontRemoveLphuProducts 51 O2LPHU {} -DontRemoveLpcaProducts 51 O2LPCA {} +DontRemoveLpisProducts 51 O2LPIS {} DontRemoveLpitProducts 51 O2LPIT {} -DontRemoveLpcsProducts 51 O2LPCS {} -DontRemoveLpskProducts 51 O2LPSK {} -DontRemoveLpengbProducts 51 O2LPENGB {} -DontRemoveLpdaProducts 51 O2LPDA {} -DontRemoveLpsvProducts 51 O2LPSV {} +DontRemoveLpjaProducts 51 O2LPJA {} +DontRemoveLpkidProducts 51 O2LPKID {} +DontRemoveLpkyProducts 51 O2LPKY {} +DontRemoveLpkaProducts 51 O2LPKA {} +DontRemoveLpkkProducts 51 O2LPKK {} +DontRemoveLpkmProducts 51 O2LPKM {} +DontRemoveLpknProducts 51 O2LPKN {} +DontRemoveLpkoProducts 51 O2LPKO {} +DontRemoveLpkokProducts 51 O2LPKOK {} +DontRemoveLpksProducts 51 O2LPKS {} +DontRemoveLpkuProducts 51 O2LPKU {} +DontRemoveLploProducts 51 O2LPLO {} +DontRemoveLpltProducts 51 O2LPLT {} +DontRemoveLplvProducts 51 O2LPLV {} +DontRemoveLpmaiProducts 51 O2LPMAI {} +DontRemoveLpmkProducts 51 O2LPMK {} +DontRemoveLpmnProducts 51 O2LPMN {} +DontRemoveLpmniProducts 51 O2LPMNI {} +DontRemoveLpmsProducts 51 O2LPMS {} +DontRemoveLpmlinProducts 51 O2LPMLIN {} +DontRemoveLpmrinProducts 51 O2LPMRIN {} +DontRemoveLpmyProducts 51 O2LPMY {} +DontRemoveLpneProducts 51 O2LPNE {} +DontRemoveLpnbProducts 51 O2LPNB {} +DontRemoveLpnlProducts 51 O2LPNL {} +DontRemoveLpnnProducts 51 O2LPNN {} DontRemoveLpnoProducts 51 O2LPNO {} +DontRemoveLpnrProducts 51 O2LPNR {} +DontRemoveLpnsProducts 51 O2LPNS {} +DontRemoveLpomProducts 51 O2LPOM {} +DontRemoveLpocProducts 51 O2LPOC {} +DontRemoveLporinProducts 51 O2LPORIN {} +DontRemoveLppapProducts 51 O2LPPAP {} +DontRemoveLppainProducts 51 O2LPPAIN {} DontRemoveLpplProducts 51 O2LPPL {} -DontRemoveLpdeProducts 51 O2LPDE {} +DontRemoveLppsProducts 51 O2LPPS {} +DontRemoveLpptProducts 51 O2LPPT {} DontRemoveLpptbrProducts 51 O2LPPTBR {} +DontRemoveLpruProducts 51 O2LPRU {} +DontRemoveLprwProducts 51 O2LPRW {} +DontRemoveLpsatProducts 51 O2LPSAT {} +DontRemoveLpsainProducts 51 O2LPSAIN {} +DontRemoveLpsiProducts 51 O2LPSI {} +DontRemoveLpscProducts 51 O2LPSC {} +DontRemoveLpsdProducts 51 O2LPSD {} +DontRemoveLpskProducts 51 O2LPSK {} +DontRemoveLpslProducts 51 O2LPSL {} +DontRemoveLpshProducts 51 O2LPSH {} +DontRemoveLpsrProducts 51 O2LPSR {} +DontRemoveLpssProducts 51 O2LPSS {} +DontRemoveLpstProducts 51 O2LPST {} +DontRemoveLpsvProducts 51 O2LPSV {} +DontRemoveLpswProducts 51 O2LPSW {} +DontRemoveLpswtzProducts 51 O2LPSWTZ {} +DontRemoveLpteinProducts 51 O2LPTEIN {} +DontRemoveLptierProducts 51 O2LPTIER {} +DontRemoveLptainProducts 51 O2LPTAIN {} DontRemoveLpthProducts 51 O2LPTH {} -DontRemoveLpetProducts 51 O2LPET {} -DontRemoveLpjaProducts 51 O2LPJA {} -DontRemoveLpkoProducts 51 O2LPKO {} +DontRemoveLptnProducts 51 O2LPTN {} +DontRemoveLptrProducts 51 O2LPTR {} +DontRemoveLptsProducts 51 O2LPTS {} +DontRemoveLptgProducts 51 O2LPTG {} +DontRemoveLpugProducts 51 O2LPUG {} +DontRemoveLpurinProducts 51 O2LPURIN {} +DontRemoveLpukProducts 51 O2LPUK {} +DontRemoveLpuzProducts 51 O2LPUZ {} +DontRemoveLpveProducts 51 O2LPVE {} +DontRemoveLpviProducts 51 O2LPVI {} +DontRemoveLpxhProducts 51 O2LPXH {} DontRemoveLpzhcnProducts 51 O2LPZHCN {} DontRemoveLpzhtwProducts 51 O2LPZHTW {} -DontRemoveLptrProducts 51 O2LPTR {} -DontRemoveLphiProducts 51 O2LPHI {} -DontRemoveLparProducts 51 O2LPAR {} -DontRemoveLpheProducts 51 O2LPHE {} +DontRemoveLpzuProducts 51 O2LPZU {} setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE] SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users setUserProfileNT 51 USERPROFILE [%USERPROFILE] diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 9459e79e283d..11f97a0bb797 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -11,36 +11,121 @@ CreateFolders 1850 CreateShortcuts 2150 DeleteServices VersionNT 1000 DontRemoveProducts REMOVEOLDPRODUCTS<>"1" 155 -DontRemoveLpEnusProducts REMOVEOLDPRODUCTS<>"1" 157 -DontRemoveLpptProducts REMOVEOLDPRODUCTS<>"1" 158 -DontRemoveLpruProducts REMOVEOLDPRODUCTS<>"1" 159 +DontRemoveLpafProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLparProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpasinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbebyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpboProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbgProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbrxProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbnbdProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbninProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpcaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpcsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpcyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdeProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdgoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdzProducts REMOVEOLDPRODUCTS<>"1" 160 DontRemoveLpelProducts REMOVEOLDPRODUCTS<>"1" 160 -DontRemoveLpnlProducts REMOVEOLDPRODUCTS<>"1" 161 -DontRemoveLpfrProducts REMOVEOLDPRODUCTS<>"1" 162 -DontRemoveLpesProducts REMOVEOLDPRODUCTS<>"1" 163 -DontRemoveLpfiProducts REMOVEOLDPRODUCTS<>"1" 164 -DontRemoveLphuProducts REMOVEOLDPRODUCTS<>"1" 165 -DontRemoveLpcaProducts REMOVEOLDPRODUCTS<>"1" 166 -DontRemoveLpitProducts REMOVEOLDPRODUCTS<>"1" 167 -DontRemoveLpcsProducts REMOVEOLDPRODUCTS<>"1" 168 -DontRemoveLpskProducts REMOVEOLDPRODUCTS<>"1" 169 -DontRemoveLpengbProducts REMOVEOLDPRODUCTS<>"1" 170 -DontRemoveLpdaProducts REMOVEOLDPRODUCTS<>"1" 171 -DontRemoveLpsvProducts REMOVEOLDPRODUCTS<>"1" 172 -DontRemoveLpnoProducts REMOVEOLDPRODUCTS<>"1" 173 -DontRemoveLpplProducts REMOVEOLDPRODUCTS<>"1" 174 -DontRemoveLpdeProducts REMOVEOLDPRODUCTS<>"1" 175 -DontRemoveLpptbrProducts REMOVEOLDPRODUCTS<>"1" 176 -DontRemoveLpthProducts REMOVEOLDPRODUCTS<>"1" 177 -DontRemoveLpetProducts REMOVEOLDPRODUCTS<>"1" 178 -DontRemoveLpjaProducts REMOVEOLDPRODUCTS<>"1" 179 -DontRemoveLpkoProducts REMOVEOLDPRODUCTS<>"1" 180 -DontRemoveLpzhcnProducts REMOVEOLDPRODUCTS<>"1" 181 -DontRemoveLpzhtwProducts REMOVEOLDPRODUCTS<>"1" 182 -DontRemoveLptrProducts REMOVEOLDPRODUCTS<>"1" 183 -DontRemoveLphiProducts REMOVEOLDPRODUCTS<>"1" 184 -DontRemoveLparProducts REMOVEOLDPRODUCTS<>"1" 185 -DontRemoveLpheProducts REMOVEOLDPRODUCTS<>"1" 186 +DontRemoveLpengbProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpenusProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpenzaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpeoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpesProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpetProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpeuProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpfaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpfiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpfrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpgaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpgdProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpglProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpguProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpguinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpheProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphiinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphuProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpisProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpitProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpjaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkidProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkkProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkmProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpknProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkokProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpksProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkuProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLploProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpltProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLplvProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmaiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmkProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmniProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmlinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmrinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpneProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnbProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnlProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpomProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpocProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLporinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLppapProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLppainProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpplProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLppsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpptProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpptbrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpruProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLprwProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsatProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsainProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpscProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsdProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpskProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpslProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpshProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpssProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpstProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsvProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpswProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpswtzProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpteinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptierProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptainProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpthProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptgProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpugProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpurinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpukProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpuzProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpveProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpviProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpxhProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpzhcnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpzhtwProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpzuProducts REMOVEOLDPRODUCTS<>"1" 160 DuplicateFiles 2050 FileCost 400 FindRelatedProducts NOT ISSETUPDRIVEN 100 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index c53ccda8d736..3fe0c2062177 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -2,4 +2,4 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition Privileged OOO_LAUNCH_1 -SETUP_USED=1 Or Installed OOO_LAUNCH_2 +(VersionNT < 600) or (SETUP_USED=1) or Installed OOO_LAUNCH_2
\ No newline at end of file diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index c9f672b2548e..6009edf00041 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -21,6 +21,7 @@ DisplayNameMinimal IDPROP_SETUPTYPE_COMPACT DisplayNameTypical IDPROP_SETUPTYPE_TYPICAL DWUSINTERVAL 30 ErrorDialog SetupError +FILETYPEDIALOGUSED 0 InstallChoice AR INSTALLLEVEL INSTALLLEVELTEMPLATE ISCHECKFORPRODUCTUPDATES ISCHECKFORPRODUCTUPDATESTEMPLATE @@ -45,6 +46,9 @@ ReinstallModeText omus REMOVEOLDPRODUCTS 1 SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS;O2LPENUS;O2LPPT;O2LPRU;O2LPEL;O2LPNL;O2LPFR;O2LPES;O2LPFI;O2LPHU;O2LPCA;O2LPIT;O2LPCS;O2LPSK;O2LPENGB;O2LPDA;O2LPSV;O2LPNO;O2LPPL;O2LPDE;O2LPPTBR;O2LPTH;O2LPET;O2LPJA;O2LPKO;O2LPZHCN;O2LPZHTW;O2LPTR;O2LPHI;O2LPAR;O2LPHE SetupType Typical +SELECT_WORD 0 +SELECT_EXCEL 0 +SELECT_POWERPOINT 0 STR_NEW_DISPLAY_NAME OOO_STR_NEW_DISPLAY_NAME STR_EDIT OOO_STR_EDIT STR_MS_WORD_DOCUMENT OOO_STR_MS_WORD_DOCUMENT diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt index dfa79a346674..5f26cbd5d04c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt @@ -4,33 +4,118 @@ # s38 S20 S20 S255 i4 S255 s72 # Upgrade UpgradeCode VersionMin VersionMax Language Attributes -{8B909084-2220-49AC-A421-142180519088} 3.0.0 0 O2LPENUS -{CBFA6A61-D310-4A90-8F49-C7BE2735D58D} 3.0.0 0 O2LPPT -{DF67ADAA-4755-4184-9E32-1020F40DDA81} 3.0.0 0 O2LPRU +{3E85B9F2-0AC3-4E57-8072-260A6FE05D02} 3.0.0 0 O2LPAF +{DF297699-3040-48E0-B0E6-B54385D76018} 3.0.0 0 O2LPAR +{62E2F6A6-4521-4E36-A751-46E91A58CFB5} 3.0.0 0 O2LPASIN +{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974} 3.0.0 0 O2LPBEBY +{5F9461CD-2937-4EE0-AF03-24E72987244E} 3.0.0 0 O2LPBO +{29FF0FAA-B831-4398-BE3F-FC13949D1CAE} 3.0.0 0 O2LPBG +{6E4658DD-79B0-4707-93C2-B022D66157A1} 3.0.0 0 O2LPBR +{6DD492EA-45CD-483E-8563-23355FD37E28} 3.0.0 0 O2LPBRX +{4D1449E7-D10B-44D8-AAB0-257D6930B0C2} 3.0.0 0 O2LPBN +{3195C77E-8462-45DA-BEFC-37F1299D889E} 3.0.0 0 O2LPBNBD +{763F5343-47FC-4909-8C18-D9E0CEED533A} 3.0.0 0 O2LPBNIN +{DCC737A4-531E-4DCD-A3C4-376DA4C76D00} 3.0.0 0 O2LPBS +{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E} 3.0.0 0 O2LPBY +{8EEC9A45-3BD3-431F-81D0-394F41185BD9} 3.0.0 0 O2LPCA +{DBA607B3-0805-4A18-A45D-769C70D90AB7} 3.0.0 0 O2LPCS +{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3} 3.0.0 0 O2LPCY +{4E7025EF-909F-4609-97BA-304684C4833D} 3.0.0 0 O2LPDA +{481E648E-D8AD-478A-A3F6-68FC563FFD8F} 3.0.0 0 O2LPDE +{205ADC32-F775-476A-B68E-949F85D0B0E3} 3.0.0 0 O2LPDGO +{3D391D0A-66D3-4141-8554-65DECA138208} 3.0.0 0 O2LPDZ {39772F91-1D37-4866-BBA4-900AB53590B0} 3.0.0 0 O2LPEL -{7D14314D-DAF7-4A97-A6EE-97C475080A73} 3.0.0 0 O2LPNL -{B0FDE9B8-D066-4FB2-885D-615A6D58E02F} 3.0.0 0 O2LPFR +{E60BC5AC-2513-40AF-A41B-64118A287662} 3.0.0 0 O2LPENGB +{8B909084-2220-49AC-A421-142180519088} 3.0.0 0 O2LPENUS +{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93} 3.0.0 0 O2LPENZA +{A256340D-4065-4B6F-AC1D-EB0D5127EBCE} 3.0.0 0 O2LPEO {01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A} 3.0.0 0 O2LPES +{34FBD5D3-3F88-4C91-8B9B-A10AE833250F} 3.0.0 0 O2LPET +{A73CB85E-760B-4E5D-AB26-7DF091C25F16} 3.0.0 0 O2LPEU +{12D1FE4A-95E1-4BED-B377-2E8EA93B2461} 3.0.0 0 O2LPFA {481B0FE0-8313-442E-8A53-7C5139ADA3DC} 3.0.0 0 O2LPFI +{B0FDE9B8-D066-4FB2-885D-615A6D58E02F} 3.0.0 0 O2LPFR +{39B343FE-EC1F-451E-930A-47D85E96DE67} 3.0.0 0 O2LPGA +{DE408221-68E9-418D-9B20-10BE458268F2} 3.0.0 0 O2LPGD +{38616841-D0DB-4768-B9B8-27D61A91FB47} 3.0.0 0 O2LPGL +{382A0F08-CF86-45C4-8119-67C87E275EFE} 3.0.0 0 O2LPGU +{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B} 3.0.0 0 O2LPGUIN +{13484272-CE60-4867-B494-D56F9049B95A} 3.0.0 0 O2LPHE +{2C70F320-6771-42D6-B3F5-97678C822B20} 3.0.0 0 O2LPHI +{DDAB0849-CC63-475C-AC87-388B93579A28} 3.0.0 0 O2LPHIIN +{0750A25E-7492-4681-8DFD-E04E89E45C0A} 3.0.0 0 O2LPHR {5981EE94-6763-40AD-A8A0-EEB01CCA153C} 3.0.0 0 O2LPHU -{8EEC9A45-3BD3-431F-81D0-394F41185BD9} 3.0.0 0 O2LPCA +{ED6D0C4C-2746-40A9-A672-4D9950C421C0} 3.0.0 0 O2LPIS {50087605-A504-441B-B514-67F13A284C10} 3.0.0 0 O2LPIT -{DBA607B3-0805-4A18-A45D-769C70D90AB7} 3.0.0 0 O2LPCS -{19B49960-B58C-48A7-9761-F0B325E00C31} 3.0.0 0 O2LPSK -{E60BC5AC-2513-40AF-A41B-64118A287662} 3.0.0 0 O2LPENGB -{4E7025EF-909F-4609-97BA-304684C4833D} 3.0.0 0 O2LPDA -{5E751B0D-FE96-4D0E-BAC1-5E7501294940} 3.0.0 0 O2LPSV +{74F683CC-8356-4BF7-9098-B85AAB7C1A0C} 3.0.0 0 O2LPJA +{1A4DA798-78EB-46B8-A5CE-4E32F883314C} 3.0.0 0 O2LPKID +{3110031F-1B5D-4457-BB5C-F6A330F15419} 3.0.0 0 O2LPKY +{08E10841-B5EF-4BF9-9688-AE25573E6DA7} 3.0.0 0 O2LPKA +{1527983C-2953-45B4-87A5-C7D67A1F6C60} 3.0.0 0 O2LPKK +{B4E6E1AC-C45E-48BB-A038-073C32693B65} 3.0.0 0 O2LPKM +{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11} 3.0.0 0 O2LPKN +{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB} 3.0.0 0 O2LPKO +{CC3129BA-331A-42CC-8569-93F9E05B6400} 3.0.0 0 O2LPKOK +{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC} 3.0.0 0 O2LPKS +{2C5FB742-9A33-410D-AC5C-A376D4967D69} 3.0.0 0 O2LPKU +{3968BFB2-35F7-4BBC-9E3E-C640BF09587D} 3.0.0 0 O2LPLO +{3526DA6A-7EA6-471C-973E-C0461DE85909} 3.0.0 0 O2LPLT +{BC085A1A-38A6-462A-889F-6E7CA442D9D8} 3.0.0 0 O2LPLV +{BE522738-E05A-431A-B535-29349EBF86AE} 3.0.0 0 O2LPMAI +{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8} 3.0.0 0 O2LPMK +{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E} 3.0.0 0 O2LPMN +{3CBD068D-E6AE-4C02-8091-DD4F2866336A} 3.0.0 0 O2LPMNI +{F300CABB-ED67-468E-A336-87DEC6E22CFC} 3.0.0 0 O2LPMS +{F2F04B66-9996-425D-A026-0AE99F5DB878} 3.0.0 0 O2LPMLIN +{4B87A651-94B3-48DF-800C-9458C3A93179} 3.0.0 0 O2LPMRIN +{E1C174A0-8126-43A8-B696-9F9DE676E1ED} 3.0.0 0 O2LPMY +{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C} 3.0.0 0 O2LPNE +{6E732530-FCDD-484C-A575-1289731020FD} 3.0.0 0 O2LPNB +{7D14314D-DAF7-4A97-A6EE-97C475080A73} 3.0.0 0 O2LPNL +{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5} 3.0.0 0 O2LPNN {00C1656C-6386-42ED-BE8C-5D6C553EF125} 3.0.0 0 O2LPNO +{0E64C806-9EB2-4651-BB94-B8D9814FD9E5} 3.0.0 0 O2LPNR +{5142883F-6084-4723-907B-EFD4A5097817} 3.0.0 0 O2LPNS +{8D6EE539-9E74-41C0-8DED-807F91D68467} 3.0.0 0 O2LPOM +{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB} 3.0.0 0 O2LPOC +{11771BE2-44D3-4ACD-882B-26C4947237C5} 3.0.0 0 O2LPORIN +{C4AC769D-F356-4D1A-A3A4-62E6729CF403} 3.0.0 0 O2LPPAP +{1869854A-30BE-40EF-B72C-AF0CCA1A5A91} 3.0.0 0 O2LPPAIN {9C92258E-9A41-4A03-AA5C-FD8EF15189BA} 3.0.0 0 O2LPPL -{481E648E-D8AD-478A-A3F6-68FC563FFD8F} 3.0.0 0 O2LPDE +{277B630B-64D9-4105-A542-6F279A31A72C} 3.0.0 0 O2LPPS +{CBFA6A61-D310-4A90-8F49-C7BE2735D58D} 3.0.0 0 O2LPPT {7364F154-089D-400B-B275-751AAB9A6122} 3.0.0 0 O2LPPTBR +{DF67ADAA-4755-4184-9E32-1020F40DDA81} 3.0.0 0 O2LPRU +{D1D013B7-9570-4165-8421-BBDC97842260} 3.0.0 0 O2LPRW +{233A2442-D417-458E-A67F-4C3E58B54387} 3.0.0 0 O2LPSAT +{180CEB68-8F15-4533-B2C2-43D47DED7ABB} 3.0.0 0 O2LPSAIN +{6CFE884D-10C2-42F7-A60F-52A8284E8D45} 3.0.0 0 O2LPSI +{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183} 3.0.0 0 O2LPSC +{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75} 3.0.0 0 O2LPSD +{19B49960-B58C-48A7-9761-F0B325E00C31} 3.0.0 0 O2LPSK +{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD} 3.0.0 0 O2LPSL +{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4} 3.0.0 0 O2LPSH +{49A004A2-3B8B-4029-B403-89919CB52355} 3.0.0 0 O2LPSR +{5B0E4353-AB4E-497E-B38F-2E784C7B1F35} 3.0.0 0 O2LPSS +{FC92FF2C-0E4B-4EB1-A962-682861EE4C33} 3.0.0 0 O2LPST +{5E751B0D-FE96-4D0E-BAC1-5E7501294940} 3.0.0 0 O2LPSV +{90672FAA-14CA-4F63-8FE9-40E572A3969A} 3.0.0 0 O2LPSW +{905F971E-91FC-4F85-90D6-F6217A4FF01A} 3.0.0 0 O2LPSWTZ +{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7} 3.0.0 0 O2LPTEIN +{1FEF45BC-1315-46F4-B89B-6660226758DE} 3.0.0 0 O2LPTIER +{76D5C227-D097-4B4E-B4C7-B2370B4F7932} 3.0.0 0 O2LPTAIN {1F9BC074-55AA-496A-9EC5-05E65CF64AE6} 3.0.0 0 O2LPTH -{34FBD5D3-3F88-4C91-8B9B-A10AE833250F} 3.0.0 0 O2LPET -{74F683CC-8356-4BF7-9098-B85AAB7C1A0C} 3.0.0 0 O2LPJA -{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB} 3.0.0 0 O2LPKO +{685C3085-DCD2-40F6-85C9-5084402D7E0F} 3.0.0 0 O2LPTN +{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D} 3.0.0 0 O2LPTR +{AC285965-9D0F-4D55-8885-0F0A9B9888B1} 3.0.0 0 O2LPTS +{6C238E70-72FA-45FA-BC58-C508CD3AF6FC} 3.0.0 0 O2LPTG +{57836D3D-879A-4288-8C47-691ECC4EECBE} 3.0.0 0 O2LPUG +{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD} 3.0.0 0 O2LPURIN +{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0} 3.0.0 0 O2LPUK +{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D} 3.0.0 0 O2LPUZ +{95AD70B2-CE4A-4362-975E-6C48DC70179C} 3.0.0 0 O2LPVE +{9B664C3A-CD48-4717-A40D-3B02475D7E20} 3.0.0 0 O2LPVI +{1BCF7835-9CD6-454E-9530-64222CCF29E7} 3.0.0 0 O2LPXH {5B45DC72-0755-4EC2-BB12-65A1FEADDDE7} 3.0.0 0 O2LPZHCN {08B2CED3-CFB5-491F-ADC4-FD0CD2366C60} 3.0.0 0 O2LPZHTW -{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D} 3.0.0 0 O2LPTR -{2C70F320-6771-42D6-B3F5-97678C822B20} 3.0.0 0 O2LPHI -{DF297699-3040-48E0-B0E6-B54385D76018} 3.0.0 0 O2LPAR -{13484272-CE60-4867-B494-D56F9049B95A} 3.0.0 0 O2LPHE +{924D7527-25C6-4B95-95C7-7B68DABEC93E} 3.0.0 0 O2LPZU diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp Binary files differindex 5078e379c37d..d7f7f635917e 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst index 2c5e38571b41..b417858098cc 100644 --- a/instsetoo_native/prj/d.lst +++ b/instsetoo_native/prj/d.lst @@ -1,4 +1,4 @@ -mkdir: %COMMON_DEST%\pus%_EXT% +mkdir: %_DEST%\pus%_EXT% ..\%COMMON_OUTDIR%\bin\hid.lst %COMMON_DEST%\bin%_EXT%\hid.lst ..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin%_EXT%\userfeedback_VCL_names.csv -..\%__SRC%\misc\*.update.xml %COMMON_DEST%\pus%_EXT%\*.update.xml
\ No newline at end of file +..\%__SRC%\misc\*.update.xml %_DEST%\pus%_EXT%\*.update.xml diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store Binary files differindex 3b7c9f7794b9..632e6aff95be 100644 --- a/instsetoo_native/res/DS_Store +++ b/instsetoo_native/res/DS_Store diff --git a/instsetoo_native/res/osxdndinstall.png b/instsetoo_native/res/osxdndinstall.png Binary files differindex 6d6e7dc596b0..1d981820b8b2 100644 --- a/instsetoo_native/res/osxdndinstall.png +++ b/instsetoo_native/res/osxdndinstall.png diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 2ef67e564fd5..09334fdc98c0 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -76,21 +76,6 @@ LOCALPYFILES= \ $(BIN)$/officehelper.py \ $(BIN)$/mailmerge.py -# PKGFORMAT taken from environment. See possible -# values below. -# -# epm supports the following formats: -# aix - AIX software distribution -# bsd - FreeBSD, NetBSD, or OpenBSD software distribution -# depot or swinstall - HP-UX software distribution -# deb - Debian software distribution -# inst or tardist - IRIX software distribution -# osx - MacOS X software distribution -# pkg - Solaris software distribution -# rpm - RedHat software distribution -# setld - Tru64 (setld) software distribution -# native - "Native" software distribution for the platform -# portable - Portable software distribution xxxx: echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml @@ -109,17 +94,18 @@ ALLTAR : updatepack .ENDIF # "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" .ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" +.IF "$(FORCE2ARCHIVE)" == "TRUE" +PKGFORMAT = archive +.END + .IF "$(MAKETARGETS:e)"!="" PKGFORMAT+=$(MAKETARGETS:e:s/.//) .ENDIF # "$(MAKETARGETS:e)"!="" -.IF "$(PKGFORMAT)"!="" -.IF "$(FORCE2ARCHIVE)"!="" -PKGFORMATSWITCH=-format archive -.ELSE # "$(FORCE2ARCHIVE)"!="" -PKGFORMATSWITCH=-format xxx -.ENDIF # "$(FORCE2ARCHIVE)"!="" -.ENDIF # "$(PKGFORMAT)"!="" +# Independent of PKGFORMAT, always build a default-language openoffice product +# also in archive format, so that tests that require an OOo installation (like +# smoketestoo_native) have one available: +openoffice_$(defaultlangiso) : $$@.archive .IF "$(VERBOSE)"=="TRUE" VERBOSESWITCH=-verbose @@ -217,124 +203,76 @@ DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} $(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre ooolanguagepack broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS) .ENDIF # "$(OS)" == "MACOSX" -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")} -.IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!="" +.IF "$(MAKETARGETS)"!="" .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")} $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) .ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" -.ENDIF # "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!="" -openoffice_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -openoffice_% : -.ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) +.ENDIF # "$(MAKETARGETS)"!="" +openoffice_%{$(PKGFORMAT:^".") .archive} : + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")} openofficewithjre_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -openofficewithjre_% : -.ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")} openofficedev_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -openofficedev_% : -.ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")} ooolanguagepack_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -ooolanguagepack_% : -.ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")} ooodevlanguagepack_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -ooodevlanguagepack_% : -.ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")} sdkoo_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -sdkoo_% : -.ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")} sdkoodev_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -sdkoodev_% : -.ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")} ure_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -ure_% : -.ENDIF # "$(PKGFORMAT)"!="" .IF "$(OS)" == "MACOSX" @echo 'for now, there is no standalone URE for Mac OS X' .ELSE $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \ - -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) \ + -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \ -msitemplate $(MSIURETEMPLATEDIR) \ -msilanguage $(COMMONMISC)$/win_ulffiles .ENDIF -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) broffice_$i) : $$@{$(PKGFORMAT:^".")} -.IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!="" +.IF "$(MAKETARGETS)"!="" .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")} $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) .ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" -.ENDIF # "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!="" +.ENDIF # "$(MAKETARGETS)"!="" broffice_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -broffice_% : -.ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")} brofficewithjre_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -brofficewithjre_% : -.ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")} brofficedev_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -brofficedev_% : -.ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml -.IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")} broolanguagepack_%{$(PKGFORMAT:^".")} : -.ELSE # "$(PKGFORMAT)"!="" -broolanguagepack_% : -.ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) + +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) .ELSE # "$(alllangiso)"!="" openoffice: @@ -343,11 +281,7 @@ openoffice: .ENDIF # "$(alllangiso)"!="" .IF "$(LOCALPYFILES)"!="" -.IF "$(PKGFORMAT)"=="" -$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py -.ELSE # "$(PKGFORMAT)"=="" -$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py -.ENDIF # "$(PKGFORMAT)"=="" +$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py .ENDIF # "$(LOCALPYFILES)"!="" $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index f316b44d3b4d..1dfdeb95321e 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -25,10 +25,11 @@ Globals POOLPRODUCT 1 REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb REGISTRATIONURL http://survey.services.openoffice.org/user/index.php - PROGRESSBARCOLOR 4,68,155 - PROGRESSSIZE 412,7 - PROGRESSPOSITION 14,230 - PROGRESSFRAMECOLOR 58,159,232 + PROGRESSBARCOLOR 14,133,205 + PROGRESSSIZE 320,7 + PROGRESSPOSITION 185,206 + PROGRESSFRAMECOLOR 207,208,211 + NATIVEPROGRESS true REGISTRYLAYERNAME Layers SERVICEPACK 1 UPDATE_DATABASE 1 @@ -36,6 +37,9 @@ Globals UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL 6 + OPENSOURCE 1 + OOODOWNLOADNAME 1 + STARTCENTER_LAYOUT_STYLE 0 } } } @@ -92,6 +96,7 @@ OpenOffice STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -134,6 +139,7 @@ OpenOffice_wJRE PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 + WITHJREPRODUCT 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt @@ -156,6 +162,7 @@ OpenOffice_wJRE STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -227,6 +234,7 @@ OpenOffice_Dev STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -270,6 +278,7 @@ URE STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk PACKAGEMAP package_names_ext.txt } @@ -300,7 +309,7 @@ OpenOffice_SDK PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK - DATABASENAME openofficeorg32sdk + DATABASENAME openofficeorg33sdk NO_README_IN_ROOTDIR 1 LICENSENAME LGPL IGNOREDIRECTORYLAYER 1 @@ -315,6 +324,7 @@ OpenOffice_SDK STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 } active 1 compression 5 @@ -346,10 +356,11 @@ OpenOffice_Dev_SDK UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDev + DEVELOPMENTPRODUCT 1 PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK - DATABASENAME openofficeorg32devsdk + DATABASENAME openofficeorg33devsdk NO_README_IN_ROOTDIR 1 LICENSENAME LGPL IGNOREDIRECTORYLAYER 1 @@ -364,6 +375,7 @@ OpenOffice_Dev_SDK STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 } active 1 compression 5 @@ -392,6 +404,7 @@ BrOffice PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR + NATIVEPROGRESS UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt @@ -427,6 +440,7 @@ BrOffice STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -459,6 +473,7 @@ BrOffice_wJRE PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR + NATIVEPROGRESS UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt @@ -472,6 +487,7 @@ BrOffice_wJRE PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 + WITHJREPRODUCT 1 SETSTATICPATH 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles @@ -495,6 +511,7 @@ BrOffice_wJRE STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -529,6 +546,7 @@ BrOffice_Dev PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR + NATIVEPROGRESS BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev @@ -569,6 +587,7 @@ BrOffice_Dev STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index 9f5fbfd93246..c19039118909 100755 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -19,6 +19,6 @@ OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci1 #URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de ooolanguagepack OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack -OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|fr|ja|ar ooodevlanguagepack +OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|fr|ja|ar|ru ooodevlanguagepack #BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack |
