Oliver Bolte
cfa95b9550
INTEGRATION: CWS obo25 (1.281.4); FILE MERGED
...
2008/03/20 11:23:23 obo 1.281.4.1: #i87279# remove DISABLE_ADO switch
2008-03-26 11:39:43 +00:00
Oliver Bolte
0b251cdd4c
INTEGRATION: CWS tl41_DEV300 (1.82.2); FILE MERGED
...
2008/02/15 10:12:06 tl 1.82.2.2: RESYNC: (1.82-1.85); FILE MERGED
2008/02/07 12:09:39 tl 1.82.2.1: #i80287#, #i81365# changes to linguistic.xcu and for dictionaries as extensions
2008-03-25 15:59:18 +00:00
Oliver Bolte
721813e3cc
INTEGRATION: CWS tl41_DEV300 (1.226.8); FILE MERGED
...
2008/02/26 14:31:08 tl 1.226.8.3: #i80287# fixed destination directory for xcu files
2008/02/15 10:12:02 tl 1.226.8.2: RESYNC: (1.226-1.228); FILE MERGED
2008/02/07 12:09:39 tl 1.226.8.1: #i80287#, #i81365# changes to linguistic.xcu and for dictionaries as extensions
2008-03-25 15:58:10 +00:00
Rüdiger Timm
c97a878df0
#i10000# 'gid_File_Bin_Soffice' and 'gid_File_Desktophelper_Txt' moved to brand layer.
2008-03-20 08:20:59 +00:00
Rüdiger Timm
08e750a63e
#i10000# CWS sb83 changed 'PKGCONFIG' into 'PKG_CONFIG' (in solenv/inc/pkg_config.mk).
2008-03-19 09:25:09 +00:00
Vladimir Glazounov
ac99b4b4ed
INTEGRATION: CWS sb83 (1.42.22); FILE MERGED
...
2008/03/17 09:02:01 sb 1.42.22.8: RESYNC: (1.43-1.44); FILE MERGED
2008/02/14 11:05:31 is 1.42.22.7: '#i86068#_readmes_into_brand_language_pack'
2008/02/06 14:06:50 sb 1.42.22.6: #i84200# moved image sets to brand layer
2008/01/30 12:02:25 sb 1.42.22.5: #i84200# changes for MACOSX; additions to SCP1FILES missing from SCP2FILES
2008/01/30 09:39:44 sb 1.42.22.4: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:28 sb 1.42.22.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:32 sb 1.42.22.2: RESYNC: (1.42-1.43); FILE MERGED
2007/12/10 14:49:25 sb 1.42.22.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:41:43 +00:00
Vladimir Glazounov
83248c9c64
INTEGRATION: CWS sb83 (1.20.2); FILE MERGED
...
2008/03/17 09:01:58 sb 1.20.2.6: RESYNC: (1.21-1.22); FILE MERGED
2008/02/22 08:50:51 sb 1.20.2.5: RESYNC: (1.20-1.21); FILE MERGED
2008/02/19 15:41:14 is 1.20.2.4: #i85112# new ure module structure
2008/02/13 16:00:56 is 1.20.2.3: #i86068# brand application modules
2008/01/29 17:08:25 sb 1.20.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:27 sb 1.20.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:41:07 +00:00
Vladimir Glazounov
eab5c19b90
INTEGRATION: CWS sb83 (1.34.18); FILE MERGED
...
2008/02/13 17:04:22 is 1.34.18.2: '#i86068#'
2008/01/29 17:08:25 sb 1.34.18.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008-03-18 12:40:49 +00:00
Vladimir Glazounov
45ee3ee247
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:02:00 sb 1.1.4.1: file module_langpack_writer.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:47 +00:00
Vladimir Glazounov
202dc9ad19
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/02/13 12:49:07 is 1.1.4.5: #i86068# language specific files in brand package
2008/01/31 09:41:41 is 1.1.4.4: #i85112# language modules with names and descriptions
2008/01/30 09:29:31 sb 1.1.4.3: #i85112# merged in cws_src680_native121
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:01:48 sb 1.1.4.1: file module_langpack_root.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:37 +00:00
Vladimir Glazounov
ddb5e5a445
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:01:35 sb 1.1.4.1: file module_langpack_onlineupdate.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:27 +00:00
Vladimir Glazounov
4ab63e68d2
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:01:22 sb 1.1.4.1: file module_langpack_math.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:17 +00:00
Vladimir Glazounov
2602e72040
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:01:11 sb 1.1.4.1: file module_langpack_impress.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:07 +00:00
Vladimir Glazounov
caa311e1f6
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/01/29 16:00:26 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:00:59 sb 1.1.4.1: file module_langpack_draw.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:26 +0000
2008-03-18 12:38:57 +00:00
Vladimir Glazounov
b5e1ecb133
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/01/29 16:00:26 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:00:05 sb 1.1.4.1: file module_langpack_calc.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:26 +0000
2008-03-18 12:38:47 +00:00
Vladimir Glazounov
37f1ae3300
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/01/29 16:00:26 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 14:59:47 sb 1.1.4.1: file module_langpack_base.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:26 +0000
2008-03-18 12:38:37 +00:00
Vladimir Glazounov
3a2f2f4f9a
INTEGRATION: CWS sb83 (1.2.2); FILE MERGED
...
2008/02/22 08:50:47 sb 1.2.2.4: RESYNC: (1.2-1.3); FILE MERGED
2008/01/31 09:41:41 is 1.2.2.3: #i85112# language modules with names and descriptions
2008/01/30 09:29:31 sb 1.2.2.2: #i85112# merged in cws_src680_native121
2008/01/29 16:00:26 sb 1.2.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:38:27 +00:00
Vladimir Glazounov
feecbd0fb4
INTEGRATION: CWS sb83 (1.2.2); FILE MERGED
...
2008/02/06 14:07:23 sb 1.2.2.4: #i84200# streamlined image set processing
2008/01/31 09:41:41 is 1.2.2.3: #i85112# language modules with names and descriptions
2008/01/30 09:29:31 sb 1.2.2.2: #i85112# merged in cws_src680_native121
2008/01/29 16:00:26 sb 1.2.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:38:09 +00:00
Vladimir Glazounov
d997504de3
INTEGRATION: CWS sb83 (1.4.86); FILE MERGED
...
2008/01/29 16:00:25 sb 1.4.86.2: #i85112# merged in cws_src680_native121
2007/12/10 14:48:11 sb 1.4.86.1: #152274# Include PyUno in StarOffice.
2008-03-18 12:37:37 +00:00
Vladimir Glazounov
f4c4bef094
INTEGRATION: CWS sb83 (1.16.644); FILE MERGED
...
2007/12/10 14:48:11 sb 1.16.644.1: #152274# Include PyUno in StarOffice.
2008-03-18 12:37:16 +00:00
Vladimir Glazounov
3801704532
INTEGRATION: CWS sb83 (1.19.22); FILE MERGED
...
2008/02/11 13:44:14 is 1.19.22.4: #i85916# language pack in multilayered office
2008/02/01 15:51:32 sb 1.19.22.3: #i85112# windows-specific stuff (is)
2008/01/31 11:05:05 is 1.19.22.2: #i85112# using ooo package versions for SO
2008/01/29 16:00:25 sb 1.19.22.1: #i85112# merged in cws_src680_native121
2008-03-18 12:36:32 +00:00
Vladimir Glazounov
e87e15fa59
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/02/19 17:25:42 is 1.1.4.7: #i85112# defining pathes in scp2 also for Unix
2008/02/19 15:41:14 is 1.1.4.6: #i85112# new ure module structure
2008/02/19 14:58:47 is 1.1.4.5: #i85112#_changing_windows_directory_structure
2008/02/14 13:19:16 is 1.1.4.4: #i86068# thirdparty license also in brand layer
2008/02/08 11:19:29 is 1.1.4.3: #i85916# new installlocation
2008/01/29 16:00:24 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/09 16:36:55 sb 1.1.4.1: file ure_standalone.scp was added on branch cws_src680_sb83 on 2008-01-29 16:00:24 +0000
2008-03-18 12:35:46 +00:00
Vladimir Glazounov
ae15402548
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/02/19 17:25:42 is 1.1.4.10: #i85112# defining pathes in scp2 also for Unix
2008/02/19 15:09:10 is 1.1.4.9: #i85112#_changing_windows_directory_structure
2008/02/19 14:58:47 is 1.1.4.8: #i85112#_changing_windows_directory_structure
2008/02/04 16:59:00 sb 1.1.4.7: #i84200# fixed ure-link symlink
2008/02/01 15:51:32 sb 1.1.4.6: #i85112# windows-specific stuff (is)
2008/01/30 12:02:40 sb 1.1.4.5: #i84200# changes for MACOSX
2008/01/30 07:42:29 sb 1.1.4.4: #i85112# after-merge adjustments
2008/01/29 17:08:25 sb 1.1.4.3: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:24 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/09 16:37:05 sb 1.1.4.1: file ure_into_ooo.scp was added on branch cws_src680_sb83 on 2008-01-29 16:00:24 +0000
2008-03-18 12:35:36 +00:00
Vladimir Glazounov
a08a8c2a3a
INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
...
2008/03/17 09:31:21 sb 1.1.4.12: merge conflicts
2008/02/20 16:35:12 is 1.1.4.11: #i86278# msvc libraries into all layers
2008/02/19 15:09:10 is 1.1.4.10: #i85112#_changing_windows_directory_structure
2008/02/14 13:19:15 is 1.1.4.9: #i86068# thirdparty license also in brand layer
2008/02/06 13:51:20 is 1.1.4.8: #i85916# INSTALLLOCATION no longer only valid path
2008/02/01 15:51:31 sb 1.1.4.7: #i85112# windows-specific stuff (is)
2008/02/01 14:28:15 sb 1.1.4.6: fixes after resync to SRC680_m245
2008/02/01 11:05:01 sb 1.1.4.5: #i84200# on MACOSX, cleanup soffice/unopkg executables and add urelibs links to let libs in extensions find the URE libs
2008/01/30 12:02:40 sb 1.1.4.4: #i84200# changes for MACOSX
2008/01/30 07:40:38 sb 1.1.4.3: #i85112# typo
2008/01/29 16:00:24 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/09 16:36:44 sb 1.1.4.1: file ure.scp was added on branch cws_src680_sb83 on 2008-01-29 16:00:24 +0000
2008-03-18 12:35:26 +00:00
Vladimir Glazounov
7a4e729e4a
INTEGRATION: CWS sb83 (1.25.98); FILE MERGED
...
2008/02/25 15:50:13 is 1.25.98.3: #i85112# spadmin link into brand package
2008/01/29 16:00:24 sb 1.25.98.2: #i85112# merged in cws_src680_native121
2007/12/10 14:53:15 sb 1.25.98.1: #i84309# Completely removed deprecated pkgchk tool.
2008-03-18 12:34:37 +00:00
Vladimir Glazounov
82dcfc12ca
INTEGRATION: CWS sb83 (1.10.26); FILE MERGED
...
2008/01/30 09:47:34 is 1.10.26.2: #i85112# no language selection dialog
2008/01/29 16:00:23 sb 1.10.26.1: #i85112# merged in cws_src680_native121
2008-03-18 12:34:17 +00:00
Vladimir Glazounov
108af321aa
INTEGRATION: CWS sb83 (1.22.54); FILE MERGED
...
2008/02/11 13:44:14 is 1.22.54.2: #i85916# language pack in multilayered office
2008/02/06 13:51:20 is 1.22.54.1: #i85916# INSTALLLOCATION no longer only valid path
2008-03-18 12:33:58 +00:00
Vladimir Glazounov
fdbd413f13
INTEGRATION: CWS sb83 (1.53.20); FILE MERGED
...
2008/02/11 13:44:14 is 1.53.20.6: #i85916# language pack in multilayered office
2008/01/29 17:08:24 sb 1.53.20.5: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:23 sb 1.53.20.4: #i85112# merged in cws_src680_native121
2008/01/23 15:21:32 sb 1.53.20.3: #i84200# for code simplification, have all of URE_BIN_DIR, OOO_BASE_DIR, BRAND_BASE_DIR also available in good-old monolithic OOo
2007/12/03 14:01:14 sb 1.53.20.2: RESYNC: (1.53-1.54); FILE MERGED
2007/11/22 09:44:10 sb 1.53.20.1: Merged in CWS sb80.
2008-03-18 12:33:06 +00:00
Vladimir Glazounov
39087ce21d
INTEGRATION: CWS sb83 (1.9.818); FILE MERGED
...
2008/01/29 17:08:24 sb 1.9.818.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:23 sb 1.9.818.1: #i85112# merged in cws_src680_native121
2008-03-18 12:32:20 +00:00
Vladimir Glazounov
30f9bd5574
INTEGRATION: CWS sb83 (1.1.2); FILE ADDED
...
2008/02/19 14:58:47 is 1.1.2.11: #i85112#_changing_windows_directory_structure
2008/02/18 14:13:28 sb 1.1.2.10: #i84200# reverted last change again
2008/02/15 16:04:46 sb 1.1.2.9: #i84200# URE_MORE_TYPES is brand specific
2008/02/13 12:49:07 is 1.1.2.8: #i86068# language specific files in brand package
2008/02/08 14:06:20 is 1.1.2.7: #i85916# supporting also broffice
2008/02/06 14:08:42 sb 1.1.2.6: #i84200# moved image sets to brand layer
2008/02/06 13:51:20 is 1.1.2.5: #i85916# INSTALLLOCATION no longer only valid path
2008/02/01 15:51:31 sb 1.1.2.4: #i85112# windows-specific stuff (is)
2008/01/30 09:39:43 sb 1.1.2.3: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2007/12/12 08:56:53 sb 1.1.2.2: #i84200# All of share/xdg/ goes into the brand layer.
2007/12/10 14:51:23 sb 1.1.2.1: #i84200# First step of basis/brand split.
2008-03-18 12:32:06 +00:00
Vladimir Glazounov
f588960bbc
INTEGRATION: CWS sb83 (1.8.2); FILE MERGED
...
2008/02/22 08:50:44 sb 1.8.2.4: RESYNC: (1.8-1.9); FILE MERGED
2008/01/31 09:41:41 is 1.8.2.3: #i85112# language modules with names and descriptions
2008/01/30 09:30:51 sb 1.8.2.2: #i85112# merged in cws_src680_native121
2008/01/29 16:00:23 sb 1.8.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:31:44 +00:00
Vladimir Glazounov
94f39729c9
INTEGRATION: CWS sb83 (1.3.2); FILE MERGED
...
2008/03/17 09:01:54 sb 1.3.2.4: RESYNC: (1.4-1.8); FILE MERGED
2008/02/13 16:00:55 is 1.3.2.3: #i86068# brand application modules
2008/02/13 12:49:07 is 1.3.2.2: #i86068# language specific files in brand package
2008/01/30 09:30:51 sb 1.3.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:31:30 +00:00
Vladimir Glazounov
6d2d7f10ce
INTEGRATION: CWS sb83 (1.81.14); FILE MERGED
...
2008/03/17 09:01:51 sb 1.81.14.16: RESYNC: (1.85-1.89); FILE MERGED
2008/02/15 09:54:09 sb 1.81.14.15: #154657# drop apoc integration
2008/02/14 13:19:15 is 1.81.14.14: #i86068# thirdparty license also in brand layer
2008/02/14 13:06:15 sb 1.81.14.13: #i84200# for now, move crash reporter to brand layer
2008/02/08 09:19:25 sb 1.81.14.12: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/07 16:20:15 sb 1.81.14.11: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
2008/02/07 12:47:05 sb 1.81.14.10: #i84200# removed apparently unused viewdoc script
2008/02/06 14:08:42 sb 1.81.14.9: #i84200# moved image sets to brand layer
2008/02/05 10:55:29 is 1.81.14.8: #i85112# ooo repackaging
2008/02/01 13:29:04 sb 1.81.14.7: RESYNC: (1.82-1.85); FILE MERGED
2008/01/29 17:08:24 sb 1.81.14.6: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:23 sb 1.81.14.5: #i85112# merged in cws_src680_native121
2008/01/21 15:14:31 sb 1.81.14.4: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/11 14:11:31 sb 1.81.14.3: #i84200# For now, include a fake ure-link/lib in traditional OOo on Mac OS X to make it still work with new dylib install_names.
2008/01/09 10:52:29 sb 1.81.14.2: RESYNC: (1.81-1.82); FILE MERGED
2007/12/10 14:52:47 sb 1.81.14.1: #i84200# First step of basis/brand split. #i84309# Completely removed deprecated pkgchk tool.
2008-03-18 12:31:06 +00:00
Vladimir Glazounov
c085988ef2
INTEGRATION: CWS sb83 (1.58.10); FILE MERGED
...
2008/02/14 11:05:30 is 1.58.10.6: '#i86068#_readmes_into_brand_language_pack'
2008/02/06 14:08:42 sb 1.58.10.5: #i84200# moved image sets to brand layer
2008/02/01 13:29:00 sb 1.58.10.4: RESYNC: (1.61-1.62); FILE MERGED
2008/01/29 16:00:22 sb 1.58.10.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:27 sb 1.58.10.2: RESYNC: (1.58-1.61); FILE MERGED
2007/12/10 14:52:00 sb 1.58.10.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:30:07 +00:00
Vladimir Glazounov
0bf46053cc
INTEGRATION: CWS sb83 (1.9.90); FILE MERGED
...
2008/01/29 16:00:22 sb 1.9.90.1: #i85112# merged in cws_src680_native121
2008-03-18 12:29:48 +00:00
Vladimir Glazounov
8eac47c313
INTEGRATION: CWS sb83 (1.58.80); FILE MERGED
...
2008/03/17 09:01:48 sb 1.58.80.2: RESYNC: (1.58-1.61); FILE MERGED
2008/02/13 16:00:55 is 1.58.80.1: #i86068# brand application modules
2008-03-18 12:29:35 +00:00
Vladimir Glazounov
37e82d58b2
INTEGRATION: CWS sb83 (1.226.14); FILE MERGED
...
2008/03/18 08:14:05 sb 1.226.14.21: work around vbaobj on Mac OS X problem
2008/03/17 09:01:45 sb 1.226.14.20: RESYNC: (1.229-1.233); FILE MERGED
2008/02/22 08:59:20 sb 1.226.14.19: resync aftermath
2008/02/22 08:50:41 sb 1.226.14.18: RESYNC: (1.227-1.229); FILE MERGED
2008/02/14 13:19:14 is 1.226.14.17: #i86068# thirdparty license also in brand layer
2008/02/14 11:05:08 sb 1.226.14.16: #i84200# just put THIRDPARTYLICENSEREADME.html somewhere for now on MACOSX
2008/02/13 12:49:07 is 1.226.14.15: #i86068# language specific files in brand package
2008/02/08 09:19:24 sb 1.226.14.14: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/07 16:20:14 sb 1.226.14.13: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
2008/02/07 12:47:05 sb 1.226.14.12: #i84200# removed apparently unused viewdoc script
2008/02/06 14:09:09 sb 1.226.14.11: #i84200# moved image sets to brand layer
2008/02/01 15:51:31 sb 1.226.14.10: #i85112# windows-specific stuff (is)
2008/02/01 13:28:57 sb 1.226.14.9: RESYNC: (1.226-1.227); FILE MERGED
2008/02/01 11:05:00 sb 1.226.14.8: #i84200# on MACOSX, cleanup soffice/unopkg executables and add urelibs links to let libs in extensions find the URE libs
2008/01/29 17:08:24 sb 1.226.14.7: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:22 sb 1.226.14.6: #i85112# merged in cws_src680_native121
2008/01/23 15:21:32 sb 1.226.14.5: #i84200# for code simplification, have all of URE_BIN_DIR, OOO_BASE_DIR, BRAND_BASE_DIR also available in good-old monolithic OOo
2008/01/21 15:14:30 sb 1.226.14.4: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/11 14:11:31 sb 1.226.14.3: #i84200# For now, include a fake ure-link/lib in traditional OOo on Mac OS X to make it still work with new dylib install_names.
2007/12/27 12:31:41 sb 1.226.14.2: #i84200# Provide a (nonfunctional) ure-link and a fake basis-link for good old monolithic OOo, to keep it running for now.
2007/12/10 14:46:58 sb 1.226.14.1: #i84200# First step of basis/brand split. #i84309# Completely removed deprecated pkgchk tool.
2008-03-18 12:29:21 +00:00
Vladimir Glazounov
ae2c867b02
INTEGRATION: CWS sb83 (1.270.2); FILE MERGED
...
2008/03/18 08:29:53 sb 1.270.2.5: work around vbaobj on Mac OS X problem
2008/03/17 09:01:42 sb 1.270.2.4: RESYNC: (1.273-1.281); FILE MERGED
2008/02/07 16:20:14 sb 1.270.2.3: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
2008/02/01 13:28:53 sb 1.270.2.2: RESYNC: (1.270-1.273); FILE MERGED
2008/01/29 16:00:21 sb 1.270.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:29:04 +00:00
Vladimir Glazounov
b635924391
INTEGRATION: CWS sb83 (1.9.90); FILE MERGED
...
2008/02/06 17:10:49 is 1.9.90.1: #154180# removing adabas
2008-03-18 12:28:49 +00:00
Vladimir Glazounov
3321c93139
INTEGRATION: CWS sb83 (1.42.14); FILE MERGED
...
2008/02/25 12:57:58 is 1.42.14.11: #i85112# directories to packages
2008/02/22 08:50:38 sb 1.42.14.10: RESYNC: (1.42-1.43); FILE MERGED
2008/02/19 17:25:42 is 1.42.14.9: #i85112# defining pathes in scp2 also for Unix
2008/02/19 16:16:20 is 1.42.14.8: #i85112# new ure module structure
2008/02/19 14:58:47 is 1.42.14.7: #i85112#_changing_windows_directory_structure
2008/02/13 12:49:07 is 1.42.14.6: #i86068# language specific files in brand package
2008/02/06 13:51:20 is 1.42.14.5: #i85916# INSTALLLOCATION no longer only valid path
2008/02/01 15:51:31 sb 1.42.14.4: #i85112# windows-specific stuff (is)
2008/01/30 12:02:40 sb 1.42.14.3: #i84200# changes for MACOSX
2008/01/29 17:08:24 sb 1.42.14.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2007/12/10 14:53:48 sb 1.42.14.1: #i84200# Dead gid_Dir_Share_Uno_Packages_Office.
2008-03-18 12:28:18 +00:00
Vladimir Glazounov
b94d4ef042
INTEGRATION: CWS sb83 (1.1.2); FILE ADDED
...
2008/02/14 11:06:26 is 1.1.2.1: '#i86068#_readmes_into_brand_language_pack'
2008-03-18 12:28:05 +00:00
Vladimir Glazounov
5294d02dc3
INTEGRATION: CWS sb83 (1.1.2); FILE ADDED
...
2008/03/17 09:31:21 sb 1.1.2.35: merge conflicts
2008/03/05 16:07:42 sb 1.1.2.34: #i86723# dedicated spadmin start script needed
2008/02/25 15:50:13 is 1.1.2.33: #i85112# spadmin link into brand package
2008/02/25 15:22:44 is 1.1.2.32: #i85112# install-me into brand package
2008/02/22 08:59:20 sb 1.1.2.31: resync aftermath
2008/02/20 16:35:12 is 1.1.2.30: #i86278# msvc libraries into all layers
2008/02/19 17:25:42 is 1.1.2.29: #i85112# defining pathes in scp2 also for Unix
2008/02/18 16:55:37 is 1.1.2.28: #i85112# repackaging
2008/02/18 14:13:28 sb 1.1.2.27: #i84200# reverted last change again
2008/02/15 16:04:46 sb 1.1.2.26: #i84200# URE_MORE_TYPES is brand specific
2008/02/14 13:19:14 is 1.1.2.25: #i86068# thirdparty license also in brand layer
2008/02/14 13:06:15 sb 1.1.2.24: #i84200# for now, move crash reporter to brand layer
2008/02/14 11:05:30 is 1.1.2.23: '#i86068#_readmes_into_brand_language_pack'
2008/02/13 17:31:47 is 1.1.2.22: #i86068#
2008/02/13 13:27:46 is 1.1.2.21: #i86068# language specific brand files
2008/02/13 12:49:07 is 1.1.2.20: #i86068# language specific files in brand package
2008/02/08 09:19:24 sb 1.1.2.19: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/07 16:20:14 sb 1.1.2.18: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
2008/02/06 14:10:45 sb 1.1.2.17: #i84200# moved image sets to brand layer; added items available in only some brand layers to gid_Module_Root_Brand nonetheless
2008/02/05 10:55:29 is 1.1.2.16: #i85112# ooo repackaging
2008/02/01 15:51:31 sb 1.1.2.15: #i85112# windows-specific stuff (is)
2008/02/01 14:28:15 sb 1.1.2.14: fixes after resync to SRC680_m245
2008/02/01 11:05:00 sb 1.1.2.13: #i84200# on MACOSX, cleanup soffice/unopkg executables and add urelibs links to let libs in extensions find the URE libs
2008/01/31 17:02:56 is 1.1.2.12: #i85112# basis dir below ooo dir
2008/01/31 17:01:02 is 1.1.2.11: #i85112# new basis link
2008/01/30 13:37:50 sb 1.1.2.10: #i84200# redirect(rc|.ini) on all platforms but MACOSX
2008/01/30 13:03:19 is 1.1.2.9: #i85112# additional flags for brand module
2008/01/30 12:02:40 sb 1.1.2.8: #i84200# changes for MACOSX
2008/01/30 09:39:43 sb 1.1.2.7: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/23 15:23:01 sb 1.1.2.6: #i84200# moved executables from brand layer to basis layer
2008/01/07 15:25:34 sb 1.1.2.5: #i84985# added URE_OVERRIDE_JAVA_JFW_SHARED|USER_DATA
2007/12/21 15:00:21 sb 1.1.2.4: #i84200# Windows-specific fixes.
2007/12/18 08:57:14 sb 1.1.2.3: #i84200# dropped Mac OS X specifics for now
2007/12/12 08:56:53 sb 1.1.2.2: #i84200# All of share/xdg/ goes into the brand layer.
2007/12/10 14:51:12 sb 1.1.2.1: #i84200# First step of basis/brand split.
2008-03-18 12:27:55 +00:00
Vladimir Glazounov
83c0a8436d
INTEGRATION: CWS sb83 (1.6.2); FILE MERGED
...
2008/01/29 16:00:21 sb 1.6.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:27:29 +00:00
Vladimir Glazounov
3329a03742
INTEGRATION: CWS sb83 (1.15.2); FILE MERGED
...
2008/02/22 08:50:34 sb 1.15.2.4: RESYNC: (1.15-1.16); FILE MERGED
2008/02/13 16:00:55 is 1.15.2.3: #i86068# brand application modules
2008/01/29 17:08:24 sb 1.15.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:21 sb 1.15.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:27:16 +00:00
Vladimir Glazounov
d208deca2d
INTEGRATION: CWS sb83 (1.34.154); FILE MERGED
...
2008/02/13 17:04:22 is 1.34.154.2: '#i86068#'
2008/01/29 17:08:23 sb 1.34.154.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008-03-18 12:27:02 +00:00
Vladimir Glazounov
ec4d7c75e2
INTEGRATION: CWS sb83 (1.15.2); FILE MERGED
...
2008/02/22 08:50:31 sb 1.15.2.4: RESYNC: (1.15-1.16); FILE MERGED
2008/02/13 16:00:55 is 1.15.2.3: #i86068# brand application modules
2008/01/29 17:08:23 sb 1.15.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:19 sb 1.15.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:26:25 +00:00
Vladimir Glazounov
b79ff5c94a
INTEGRATION: CWS sb83 (1.30.154); FILE MERGED
...
2008/03/17 09:01:39 sb 1.30.154.3: RESYNC: (1.30-1.31); FILE MERGED
2008/02/13 17:04:22 is 1.30.154.2: '#i86068#'
2008/01/29 17:08:23 sb 1.30.154.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008-03-18 12:26:12 +00:00
Vladimir Glazounov
e28ad954f5
INTEGRATION: CWS sb83 (1.14.2); FILE MERGED
...
2008/02/22 08:50:28 sb 1.14.2.4: RESYNC: (1.14-1.15); FILE MERGED
2008/02/13 16:00:55 is 1.14.2.3: #i86068# brand application modules
2008/01/29 17:08:23 sb 1.14.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:18 sb 1.14.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:25:44 +00:00
Vladimir Glazounov
1455d721f6
INTEGRATION: CWS sb83 (1.25.154); FILE MERGED
...
2008/02/13 17:04:22 is 1.25.154.2: '#i86068#'
2008/01/29 17:08:23 sb 1.25.154.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008-03-18 12:25:30 +00:00
Vladimir Glazounov
d0edbca379
INTEGRATION: CWS sb83 (1.4.820); FILE MERGED
...
2008/02/14 13:06:14 sb 1.4.820.1: #i84200# for now, move crash reporter to brand layer
2008-03-18 12:25:17 +00:00
Vladimir Glazounov
04434cc38b
INTEGRATION: CWS sb83 (1.17.2); FILE MERGED
...
2008/02/22 08:59:19 sb 1.17.2.5: resync aftermath
2008/02/22 08:50:25 sb 1.17.2.4: RESYNC: (1.17-1.20); FILE MERGED
2008/02/13 16:00:55 is 1.17.2.3: #i86068# brand application modules
2008/01/29 17:08:23 sb 1.17.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:17 sb 1.17.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:25:04 +00:00
Vladimir Glazounov
087f2f1535
INTEGRATION: CWS sb83 (1.37.154); FILE MERGED
...
2008/02/22 08:50:22 sb 1.37.154.3: RESYNC: (1.37-1.38); FILE MERGED
2008/02/13 17:04:21 is 1.37.154.2: '#i86068#'
2008/01/29 17:08:22 sb 1.37.154.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008-03-18 12:24:50 +00:00
Vladimir Glazounov
1e2d776701
INTEGRATION: CWS sb83 (1.11.2); FILE MERGED
...
2008/03/17 09:31:21 sb 1.11.2.6: merge conflicts
2008/03/17 09:01:35 sb 1.11.2.5: RESYNC: (1.12-1.13); FILE MERGED
2008/02/22 08:50:19 sb 1.11.2.4: RESYNC: (1.11-1.12); FILE MERGED
2008/02/13 16:00:54 is 1.11.2.3: #i86068# brand application modules
2008/01/29 17:08:22 sb 1.11.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:17 sb 1.11.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:24:37 +00:00
Vladimir Glazounov
24e307f1ea
INTEGRATION: CWS sb83 (1.23.18); FILE MERGED
...
2008/03/17 09:01:32 sb 1.23.18.3: RESYNC: (1.23-1.24); FILE MERGED
2008/02/13 17:04:21 is 1.23.18.2: '#i86068#'
2008/01/29 17:08:22 sb 1.23.18.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008-03-18 12:24:24 +00:00
Vladimir Glazounov
89f0d683db
INTEGRATION: CWS sb83 (1.7.54); FILE MERGED
...
2008/01/29 16:00:17 sb 1.7.54.2: #i85112# merged in cws_src680_native121
2007/12/10 14:54:28 sb 1.7.54.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:24:02 +00:00
Vladimir Glazounov
1b498bea27
INTEGRATION: CWS sb83 (1.24.54); FILE MERGED
...
2008/03/17 09:01:29 sb 1.24.54.4: RESYNC: (1.25-1.26); FILE MERGED
2008/01/29 16:00:17 sb 1.24.54.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:23 sb 1.24.54.2: RESYNC: (1.24-1.25); FILE MERGED
2007/12/10 14:54:28 sb 1.24.54.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:23:47 +00:00
Vladimir Glazounov
65611adcb2
INTEGRATION: CWS sb83 (1.11.2); FILE MERGED
...
2008/02/06 14:06:05 sb 1.11.2.2: #i84200# streamlined image set processing
2008/01/29 16:00:16 sb 1.11.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:23:33 +00:00
Vladimir Glazounov
476ea8100e
INTEGRATION: CWS sb83 (1.16.100); FILE MERGED
...
2008/03/17 09:01:25 sb 1.16.100.4: RESYNC: (1.16-1.17); FILE MERGED
2008/02/13 12:49:06 is 1.16.100.3: #i86068# language specific files in brand package
2008/01/29 16:00:16 sb 1.16.100.2: #i85112# merged in cws_src680_native121
2007/12/03 13:44:04 sb 1.16.100.1: #i84200# Use new feature of automatically merged adjacent string literals.
2008-03-18 12:22:58 +00:00
Rüdiger Timm
9f3292c8ee
INTEGRATION: CWS impresstables2 (1.3.26); FILE MERGED
...
2008/03/11 18:21:00 cl 1.3.26.3: RESYNC: (1.4-1.7); FILE MERGED
2008/02/20 17:55:22 cl 1.3.26.2: RESYNC: (1.3-1.4); FILE MERGED
2008/02/13 14:33:30 cl 1.3.26.1: moved svtools into binfilter
2008-03-12 09:19:43 +00:00
Rüdiger Timm
a59170a982
INTEGRATION: CWS impresstables2 (1.85.26); FILE MERGED
...
2008/03/11 18:20:57 cl 1.85.26.2: RESYNC: (1.85-1.88); FILE MERGED
2008/02/13 14:33:30 cl 1.85.26.1: moved svtools into binfilter
2008-03-12 09:19:26 +00:00
Rüdiger Timm
4079572bf1
INTEGRATION: CWS impresstables2 (1.58.152); FILE MERGED
...
2008/03/11 18:21:04 cl 1.58.152.2: RESYNC: (1.58-1.60); FILE MERGED
2008/02/13 14:33:30 cl 1.58.152.1: moved svtools into binfilter
2008-03-12 09:19:07 +00:00
Rüdiger Timm
48a19b2963
INTEGRATION: CWS impresstables2 (1.272.20); FILE MERGED
...
2008/03/11 18:20:53 cl 1.272.20.3: RESYNC: (1.273-1.280); FILE MERGED
2008/02/20 17:55:27 cl 1.272.20.2: RESYNC: (1.272-1.273); FILE MERGED
2008/02/13 14:33:29 cl 1.272.20.1: moved svtools into binfilter
2008-03-12 09:18:48 +00:00
Kurt Zenker
1c93303ea9
INTEGRATION: CWS unifysound01_DEV300 (1.255.18); FILE MERGED
...
2008/01/15 15:59:02 cmc 1.255.18.5: RESYNC: (1.265-1.270); FILE MERGED
2007/12/03 10:15:31 cmc 1.255.18.4: RESYNC: (1.262-1.265); FILE MERGED
2007/10/30 15:15:01 cmc 1.255.18.3: RESYNC: (1.260-1.262); FILE MERGED
2007/10/04 10:45:49 cmc 1.255.18.2: RESYNC: (1.255-1.260); FILE MERGED
2007/08/10 11:16:01 cmc 1.255.18.1: #i80570# make avmedia into a uno service providing .so
2008-03-07 16:04:02 +00:00
Kurt Zenker
c5fe5bd64b
INTEGRATION: CWS odbmacros2 (1.3.36); FILE MERGED
...
2008/03/04 12:02:11 fs 1.3.36.2: RESYNC: (1.3-1.5); FILE MERGED
2008/02/06 16:13:58 fs 1.3.36.1: #i49133# add 'dbmm' lib/res
2008-03-06 17:47:48 +00:00
Kurt Zenker
863bd454e8
INTEGRATION: CWS odbmacros2 (1.85.20); FILE MERGED
...
2008/03/04 12:02:07 fs 1.85.20.2: RESYNC: (1.85-1.86); FILE MERGED
2008/02/06 16:13:58 fs 1.85.20.1: #i49133# add 'dbmm' lib/res
2008-03-06 17:47:32 +00:00
Kurt Zenker
273d6a40f0
INTEGRATION: CWS odbmacros2 (1.58.146); FILE MERGED
...
2008/02/06 16:13:58 fs 1.58.146.1: #i49133# add 'dbmm' lib/res
2008-03-06 17:47:13 +00:00
Kurt Zenker
8e4f99e7b9
INTEGRATION: CWS odbmacros2 (1.273.4); FILE MERGED
...
2008/03/04 12:01:57 fs 1.273.4.2: RESYNC: (1.273-1.276); FILE MERGED
2008/02/06 16:13:58 fs 1.273.4.1: #i49133# add 'dbmm' lib/res
2008-03-06 17:46:46 +00:00
Kurt Zenker
ae91ce9243
INTEGRATION: CWS ause084_DEV300 (1.228.10); FILE MERGED
...
2008/02/22 12:23:38 hjs 1.228.10.1: #i74563# change name for packing accordingly
2008-03-06 14:27:19 +00:00
Kurt Zenker
a8eeca4517
INTEGRATION: CWS layout_DEV300 (1.43.36); FILE MERGED
...
2008/02/12 11:48:34 jcn 1.43.36.1: Initial import of layout-dialogs-config_office-scp2.diff.
2008-03-06 11:47:26 +00:00
Kurt Zenker
fea3dfff1f
INTEGRATION: CWS layout_DEV300 (1.1.2); FILE ADDED
...
2008/02/12 11:49:32 jcn 1.1.2.1: Initial import of layout-dialogs-config_office-scp2.diff. Add source/layout.
2008-03-06 11:47:11 +00:00
Kurt Zenker
52c10a636e
INTEGRATION: CWS layout_DEV300 (1.1.2); FILE ADDED
...
2008/02/12 11:50:07 jcn 1.1.2.2: Use new tklayout lib name (WAS: layout).
2008/02/12 11:49:32 jcn 1.1.2.1: Initial import of layout-dialogs-config_office-scp2.diff. Add source/layout.
2008-03-06 11:47:00 +00:00
Kurt Zenker
14dc083e58
INTEGRATION: CWS layout_DEV300 (1.25.36); FILE MERGED
...
2008/02/12 11:48:34 jcn 1.25.36.1: Initial import of layout-dialogs-config_office-scp2.diff.
2008-03-06 11:46:49 +00:00
Kurt Zenker
958c1ad818
INTEGRATION: CWS t602import01 (1.17.110); FILE MERGED
...
2008/02/19 10:19:18 mba 1.17.110.4: RESYNC: (1.18-1.21); FILE MERGED
2007/10/13 18:43:47 pjanik 1.17.110.3: RESYNC: (1.17-1.18); FILE MERGED
2007/04/13 08:44:51 fridrich_strba 1.17.110.2: package t602 resource file + some fixes of names
2007/04/12 10:25:09 fridrich_strba 1.17.110.1: t602 importer initial commit
2008-03-06 10:42:07 +00:00
Kurt Zenker
aea0305e28
INTEGRATION: CWS t602import01 (1.4.12); FILE MERGED
...
2008/02/19 15:51:31 mba 1.4.12.1: #i78569#: adapt t602 filter to new language packs
2008-03-06 10:41:51 +00:00
Kurt Zenker
d62f99fa6b
INTEGRATION: CWS t602import01 (1.50.76); FILE MERGED
...
2007/10/13 18:43:44 pjanik 1.50.76.4: RESYNC: (1.57-1.58); FILE MERGED
2007/08/22 20:20:46 pjanik 1.50.76.3: RESYNC: (1.53-1.57); FILE MERGED
2007/06/13 11:31:52 pjanik 1.50.76.2: RESYNC: (1.50-1.53); FILE MERGED
2007/04/13 08:44:51 fridrich_strba 1.50.76.1: package t602 resource file + some fixes of names
2008-03-06 10:41:36 +00:00
Kurt Zenker
9463e92d02
INTEGRATION: CWS t602import01 (1.227.4); FILE MERGED
...
2008/02/19 10:19:15 mba 1.227.4.7: RESYNC: (1.262-1.273); FILE MERGED
2007/11/04 15:39:34 pjanik 1.227.4.6: RESYNC: (1.260-1.262); FILE MERGED
2007/10/13 18:43:42 pjanik 1.227.4.5: RESYNC: (1.255-1.260); FILE MERGED
2007/08/22 20:20:43 pjanik 1.227.4.4: RESYNC: (1.241-1.255); FILE MERGED
2007/06/13 11:31:39 pjanik 1.227.4.3: RESYNC: (1.227-1.241); FILE MERGED
2007/04/13 08:44:50 fridrich_strba 1.227.4.2: package t602 resource file + some fixes of names
2007/04/12 10:25:08 fridrich_strba 1.227.4.1: t602 importer initial commit
2008-03-06 10:41:19 +00:00
Kurt Zenker
692a733bcf
INTEGRATION: CWS aquavcl05_DEV300 (1.85.12); FILE MERGED
...
2008/03/03 17:31:04 is 1.85.12.3: #i86640# desktop link and startmenu link
2008/02/14 16:50:35 pl 1.85.12.2: #i85963# backing component for QUARTZ after all
2008/02/07 14:07:34 pl 1.85.12.1: #i67502# make StartModule optional
2008-03-05 16:46:49 +00:00
Kurt Zenker
cff0a6ec5d
INTEGRATION: CWS aquavcl05_DEV300 (1.6.354); FILE MERGED
...
2008/03/03 17:31:04 is 1.6.354.1: #i86640# desktop link and startmenu link
2008-03-05 16:46:30 +00:00
Kurt Zenker
c013d37a05
INTEGRATION: CWS aquavcl05_DEV300 (1.6.968); FILE MERGED
...
2008/03/03 17:31:03 is 1.6.968.1: #i86640# desktop link and startmenu link
2008-03-05 16:46:12 +00:00
Kurt Zenker
bc8a5d2b95
INTEGRATION: CWS aquavcl05_DEV300 (1.227.16); FILE MERGED
...
2008/03/03 17:31:03 is 1.227.16.5: #i86640# desktop link and startmenu link
2008/02/14 16:50:35 pl 1.227.16.4: #i85963# backing component for QUARTZ after all
2008/02/14 15:57:28 pl 1.227.16.3: RESYNC: (1.227-1.228); FILE MERGED
2008/02/07 14:07:34 pl 1.227.16.2: #i67502# make StartModule optional
2008/01/29 19:01:19 pl 1.227.16.1: #i79755# add macosx specific configuration
2008-03-05 16:45:56 +00:00
Kurt Zenker
4fd1c772c0
INTEGRATION: CWS aquavcl05_DEV300 (1.273.10); FILE MERGED
...
2008/02/14 18:16:55 pl 1.273.10.1: #i85739# remove nonexistant library
2008-03-05 16:45:35 +00:00
Kurt Zenker
24acb8c13c
INTEGRATION: CWS dba30a (1.227.26); FILE MERGED
...
2008/02/25 08:01:44 fs 1.227.26.2: RESYNC: (1.227-1.229); FILE MERGED
2008/02/05 21:02:23 fs 1.227.26.1: #i85879# DbTableDataWindowState
2008-03-05 16:11:30 +00:00
Kurt Zenker
b03f270bd0
INTEGRATION: CWS nativeprintdlg01_DEV300 (1.229.2); FILE MERGED
...
2008/02/23 10:54:46 pl 1.229.2.1: #i86329# mac specific common xcu
2008-03-05 16:01:53 +00:00
Oliver Bolte
d47bb54457
INTEGRATION: CWS eoladabas_DEV300 (1.3.16); FILE MERGED
...
2008/01/24 12:36:31 oj 1.3.16.2: #149980# moved some adabas features into OOo
2008/01/23 15:19:11 oj 1.3.16.1: #149980# moved some adabas features into OOo
2008-02-26 15:02:26 +00:00
Oliver Bolte
2e991783e6
INTEGRATION: CWS eoladabas_DEV300 (1.85.2); FILE MERGED
...
2008/01/24 12:36:31 oj 1.85.2.2: #149980# moved some adabas features into OOo
2008/01/23 13:42:08 oj 1.85.2.1: #149980# some changes for adabas
2008-02-26 15:02:11 +00:00
Oliver Bolte
82e664ba0f
INTEGRATION: CWS eoladabas_DEV300 (1.272.4); FILE MERGED
...
2008/01/23 13:42:08 oj 1.272.4.1: #149980# some changes for adabas
2008-02-26 15:01:57 +00:00
Oliver Bolte
73f8d12e9c
INTEGRATION: CWS eoladabas_DEV300 (1.11.12); FILE MERGED
...
2008/01/23 13:42:08 oj 1.11.12.1: #149980# some changes for adabas
2008-02-26 15:01:43 +00:00
Oliver Bolte
39990b313e
INTEGRATION: CWS eoladabas_DEV300 (1.23.38); FILE MERGED
...
2008/01/23 13:42:08 oj 1.23.38.1: #149980# some changes for adabas
2008-02-26 15:01:31 +00:00
Oliver Bolte
33baed717c
INTEGRATION: CWS supdremove02 (1.272.10); FILE MERGED
...
2008/02/05 08:28:59 rt 1.272.10.3: #i85482# Remove UPD from library and resource name
2008/01/31 16:11:09 rt 1.272.10.2: RESYNC: (1.272-1.273); FILE MERGED
2008/01/24 15:51:17 rt 1.272.10.1: #i85484# Unify naming: use 'OFFICEUPD' everywhere instead of 'SUPD'.
2008-02-25 15:46:14 +00:00
Oliver Bolte
940579ace9
INTEGRATION: CWS supdremove02 (1.30.206); FILE MERGED
...
2008/02/05 08:35:18 rt 1.30.206.1: #i85482# Without UPD there is no difference between LIBSHORTNAME and LIBNAME any more. Consolidate, i.e. remove macro LIBSHORTNAME.
2008-02-25 15:45:58 +00:00
Oliver Bolte
6c2027d3bf
INTEGRATION: CWS supdremove02 (1.16.150); FILE MERGED
...
2008/02/05 08:35:18 rt 1.16.150.2: #i85482# Without UPD there is no difference between LIBSHORTNAME and LIBNAME any more. Consolidate, i.e. remove macro LIBSHORTNAME.
2008/02/05 08:28:59 rt 1.16.150.1: #i85482# Remove UPD from library and resource name
2008-02-25 15:45:44 +00:00
Oliver Bolte
8d1e32362e
INTEGRATION: CWS obo22 (1.273.16); FILE MERGED
...
2008/02/19 10:04:49 obo 1.273.16.1: #i85885# wntmsci11/12: rename stlport_vc8 to stlport_vc71 because of UNO compatibility
2008-02-25 13:04:29 +00:00
Rüdiger Timm
1736fd631f
INTEGRATION: CWS native131_SRC680 (1.226.30.1.4); FILE MERGED
...
2008/02/04 17:08:08 is 1.226.30.1.4.1: #i79970# soffice.bin.manifest for OOo
2008-02-19 10:59:56 +00:00
Vladimir Glazounov
0142151857
INTEGRATION: CWS obr07 (1.227.8); FILE MERGED
...
2008/01/25 10:46:24 obr 1.227.8.2: moved Info.plist to sysui/desktop/macosx
2008/01/24 13:59:43 obr 1.227.8.1: moved MacOS X specific resources (cursor/nib) to vcl/aqua
2008-02-12 13:07:44 +00:00
Vladimir Glazounov
7ada6787fb
INTEGRATION: CWS obr07 (1.42.64); FILE MERGED
...
2008/02/05 09:27:15 obr 1.42.64.1: #i85858# moved version from bundle to disk image name
2008-02-12 13:07:30 +00:00
Rüdiger Timm
693d7c1abf
#i85927# Resource into language module.
2008-02-07 10:54:21 +00:00
Ivo Hinkelmann
9237486e9f
INTEGRATION: CWS calcsolver (1.16.106); FILE MERGED
...
2007/12/19 20:12:16 nn 1.16.106.1: #i8808# solver files
2008-02-05 14:54:24 +00:00
Ivo Hinkelmann
4f72afd353
INTEGRATION: CWS calcsolver (1.37.174); FILE MERGED
...
2007/12/19 20:12:16 nn 1.37.174.1: #i8808# solver files
2008-02-05 14:51:55 +00:00
Ivo Hinkelmann
3cbc31afdd
INTEGRATION: CWS native127 (1.20.16); FILE MERGED
...
2008/01/28 16:01:48 is 1.20.16.1: #i85474# avoid deselection of all application modules
2008-02-05 12:41:36 +00:00
Ivo Hinkelmann
1cf3edec26
INTEGRATION: CWS native127 (1.2.18); FILE MERGED
...
2008/01/25 10:02:39 is 1.2.18.1: #i85474# one and only language not selectable
2008-02-05 12:41:24 +00:00
Ivo Hinkelmann
fa0eb5c4f5
INTEGRATION: CWS native127 (1.8.16); FILE MERGED
...
2008/01/25 10:02:39 is 1.8.16.1: #i85474# one and only language not selectable
2008-02-05 12:41:11 +00:00
Ivo Hinkelmann
ce61f03686
INTEGRATION: CWS native127 (1.15.16); FILE MERGED
...
2008/01/28 16:01:48 is 1.15.16.1: #i85474# avoid deselection of all application modules
2008-02-05 12:41:00 +00:00
Ivo Hinkelmann
fbd1797e6c
INTEGRATION: CWS native127 (1.14.16); FILE MERGED
...
2008/01/28 16:01:47 is 1.14.16.1: #i85474# avoid deselection of all application modules
2008-02-05 12:40:34 +00:00
Ivo Hinkelmann
2e3cc087a3
INTEGRATION: CWS native127 (1.17.16); FILE MERGED
...
2008/01/28 16:01:47 is 1.17.16.1: #i85474# avoid deselection of all application modules
2008-02-05 12:40:20 +00:00
Ivo Hinkelmann
027ab2e2e9
INTEGRATION: CWS native127 (1.11.14); FILE MERGED
...
2008/01/28 16:01:47 is 1.11.14.1: #i85474# avoid deselection of all application modules
2008-02-05 12:40:03 +00:00
Rüdiger Timm
4e7d61a52c
INTEGRATION: CWS openssl02 (1.60.12); FILE MERGED
...
2008/01/08 07:33:52 tkr 1.60.12.1: #i84181# correct Windows packaging issue
2008-01-29 08:55:31 +00:00
Rüdiger Timm
315406af2a
INTEGRATION: CWS openssl02 (1.269.12); FILE MERGED
...
2008/01/08 07:34:10 tkr 1.269.12.1: #i84181# correct Windows packaging issue
2008-01-29 08:55:18 +00:00
Vladimir Glazounov
407276ec89
INTEGRATION: CWS onlineupdate6b (1.54.42); FILE MERGED
...
2008/01/09 05:02:47 obr 1.54.42.1: #i85050# removed pkgfmt parameter from UpdateURL for Windows as it expands to >native< instead of >msi<
2008-01-28 14:30:13 +00:00
Ivo Hinkelmann
6e51c366bc
INTEGRATION: CWS obo21 (1.81.20); FILE MERGED
...
2008/01/10 08:06:10 obo 1.81.20.1: #i84233# .Net 2008 include runtime librarys and manifest file
2008-01-15 12:32:17 +00:00
Ivo Hinkelmann
e08667c5ec
INTEGRATION: CWS obo21 (1.269.10); FILE MERGED
...
2008/01/10 14:45:01 obo 1.269.10.2: #i84233# .Net 2008 include stlport
2008/01/10 08:37:42 obo 1.269.10.1: #i84233# .Net 2008 include runtime librarys and manifest file
2008-01-15 12:32:04 +00:00
Ivo Hinkelmann
124c435d71
INTEGRATION: CWS obo21 (1.4.398); FILE MERGED
...
2007/12/12 12:41:37 obo 1.4.398.1: #i84233# Change for .Net 2008 / Vista SDK
2008-01-15 12:31:47 +00:00
Ivo Hinkelmann
7329178e49
INTEGRATION: CWS symex (1.78.14); FILE MERGED
...
2008/01/08 09:50:26 hdu 1.78.14.3: RESYNC: (1.78-1.81); FILE MERGED
2007/12/03 14:10:10 is 1.78.14.2: #i59853# name contains italic, not oblique
2007/11/27 09:37:58 is 1.78.14.1: #151427# font exchange
2008-01-15 11:16:53 +00:00
Ivo Hinkelmann
efe1756a45
INTEGRATION: CWS symex (1.3.104); FILE MERGED
...
2007/11/29 10:34:08 hdu 1.3.104.2: #i59853# #151427# correct font file names
2007/11/27 09:37:58 is 1.3.104.1: #151427# font exchange
2008-01-15 11:16:40 +00:00
Rüdiger Timm
ae4908f641
INTEGRATION: CWS so8s10u5_SRC680 (1.214.4.3.4); FILE MERGED
...
2008/01/09 13:34:03 is 1.214.4.3.4.1: #b6647223# configfile javasettings.xml
2008-01-15 09:34:47 +00:00
Oliver Bolte
7219130499
INTEGRATION: CWS xmlfilter02 (1.53.20); FILE MERGED
...
2007/12/12 10:11:15 dr 1.53.20.9: RESYNC: (1.74-1.81); FILE MERGED
2007/10/05 05:55:09 os 1.53.20.8: RESYNC: (1.70-1.74); FILE MERGED
2007/07/24 22:05:12 dr 1.53.20.7: RESYNC: (1.61-1.70); FILE MERGED
2007/05/29 16:08:54 dr 1.53.20.6: RESYNC: (1.57-1.61); FILE MERGED
2007/05/08 10:39:27 dr 1.53.20.5: RESYNC: (1.55-1.57); FILE MERGED
2007/03/14 18:47:08 dr 1.53.20.4: RESYNC: (1.53-1.55); FILE MERGED
2007/03/01 13:47:01 dr 1.53.20.3: missing lib
2007/02/27 12:04:09 dr 1.53.20.2: add oox lib
2007/02/20 14:17:00 dr 1.53.20.1: add fastsax lib
2008-01-10 12:26:22 +00:00
Oliver Bolte
7c83cfc0a3
INTEGRATION: CWS xmlfilter02 (1.222.58); FILE MERGED
...
2007/12/12 10:11:12 dr 1.222.58.11: RESYNC: (1.260-1.268); FILE MERGED
2007/10/05 05:54:00 os 1.222.58.10: RESYNC: (1.253-1.260); FILE MERGED
2007/10/01 12:05:51 os 1.222.58.9: integration of cws writerfilter3 into cws xmlfilter02
2007/07/24 22:04:08 dr 1.222.58.8: RESYNC: (1.234-1.253); FILE MERGED
2007/05/29 16:05:06 dr 1.222.58.7: RESYNC: (1.230-1.234); FILE MERGED
2007/05/08 10:38:22 dr 1.222.58.6: RESYNC: (1.223-1.230); FILE MERGED
2007/03/14 18:46:18 dr 1.222.58.5: RESYNC: (1.222-1.223); FILE MERGED
2007/03/01 15:00:54 dr 1.222.58.4: no uno
2007/03/01 13:47:01 dr 1.222.58.3: missing lib
2007/02/27 12:04:09 dr 1.222.58.2: add oox lib
2007/02/20 14:16:51 dr 1.222.58.1: add fastsax lib
2008-01-10 12:26:07 +00:00
Oliver Bolte
a5dd8b93d1
INTEGRATION: CWS native114 (1.8.54); FILE MERGED
...
2007/11/01 11:21:50 is 1.8.54.1: #150863# gnome dependency
2008-01-07 11:35:14 +00:00
Oliver Bolte
8ddd118163
#i10000# fix by IS for CWS native110
2008-01-07 11:29:15 +00:00
Oliver Bolte
cfe964f1ab
INTEGRATION: CWS native110 (1.4.14); FILE MERGED
...
2007/11/12 16:06:56 is 1.4.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:55 is 1.4.14.1: #i82251# repackaging, part 3
2008-01-07 11:24:56 +00:00
Oliver Bolte
d4d73edd6a
INTEGRATION: CWS native110 (1.9.12); FILE MERGED
...
2007/11/12 16:06:55 is 1.9.12.2: #i82248# module.pl into source directory
2007/10/04 11:04:53 is 1.9.12.1: #i82251# repackaging, part 3
2008-01-07 11:23:14 +00:00
Oliver Bolte
753bebdc4e
INTEGRATION: CWS sb80 (1.7.76); FILE MERGED
...
2007/11/20 14:56:09 sb 1.7.76.1: #i82064# On Windows, testtool must be loaded through the testtool.exe = guiloader.exe calls testtool.bin chain, so that OOo-wo-URE testtool has a correct PATH.
2008-01-07 08:55:22 +00:00
Oliver Bolte
5af5ef6620
INTEGRATION: CWS sb80 (1.5.498); FILE MERGED
...
2007/11/20 14:56:09 sb 1.5.498.1: #i82064# On Windows, testtool must be loaded through the testtool.exe = guiloader.exe calls testtool.bin chain, so that OOo-wo-URE testtool has a correct PATH.
2008-01-07 08:55:06 +00:00
Oliver Bolte
0572f2334b
INTEGRATION: CWS sb80 (1.53.10); FILE MERGED
...
2007/11/14 13:47:08 sb 1.53.10.1: #i82422# OOO_BASE_DIR from OOo-wo-URE now also needed in plain OOo.
2008-01-07 08:54:38 +00:00
Oliver Bolte
89c0316177
INTEGRATION: CWS supdremove (1.262.18); FILE MERGED
...
2007/11/16 10:23:48 vg 1.262.18.1: #i83674# cleanup: remove obsolete SUPD macro use
2008-01-07 07:43:30 +00:00
Oliver Bolte
e5e9670a70
INTEGRATION: CWS native110 (1.40.46); FILE MERGED
...
2007/11/28 15:14:56 is 1.40.46.3: RESYNC: (1.41-1.42); FILE MERGED
2007/10/24 12:58:02 is 1.40.46.2: RESYNC: (1.40-1.41); FILE MERGED
2007/10/04 11:04:58 is 1.40.46.1: #i82251# repackaging, part 3
2008-01-04 16:13:28 +00:00
Oliver Bolte
67f95e4349
INTEGRATION: CWS native110 (1.18.14); FILE MERGED
...
2007/11/28 15:14:50 is 1.18.14.3: RESYNC: (1.18-1.19); FILE MERGED
2007/11/12 16:08:34 is 1.18.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:57 is 1.18.14.1: #i82251# repackaging, part 3
2008-01-04 16:12:58 +00:00
Oliver Bolte
9207d7afe8
INTEGRATION: CWS native110 (1.1.2); FILE ADDED
...
2007/12/03 15:31:26 is 1.1.2.2: #i82248# creation of language modules
2007/11/12 16:04:05 is 1.1.2.1: #i82248# module.pl into source directory
2008-01-04 16:12:18 +00:00
Oliver Bolte
f3e05f7345
INTEGRATION: CWS native110 (1.1.2); FILE ADDED
...
2007/11/12 16:08:09 is 1.1.2.2: #i82248# module.pl into source directory
2007/10/04 11:08:55 is 1.1.2.1: #i82251# repackaging, part 3
2008-01-04 16:12:04 +00:00
Oliver Bolte
04858e0a6d
INTEGRATION: CWS native110 (1.1.2); FILE ADDED
...
2007/11/12 16:03:54 is 1.1.2.1: #i82248# module.pl into source directory
2008-01-04 16:11:50 +00:00
Oliver Bolte
70c8198fcb
INTEGRATION: CWS native110 (1.3.14); FILE MERGED
...
2007/12/03 15:31:26 is 1.3.14.2: #i82248# creation of language modules
2007/10/04 11:04:57 is 1.3.14.1: #i82251# repackaging, part 3
2008-01-04 16:11:28 +00:00
Oliver Bolte
d04807820b
INTEGRATION: CWS native110 (1.6.14); FILE MERGED
...
2007/11/28 15:14:47 is 1.6.14.3: RESYNC: (1.6-1.7); FILE MERGED
2007/11/12 16:08:09 is 1.6.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:56 is 1.6.14.1: #i82251# repackaging, part 3
2008-01-04 16:10:36 +00:00
Oliver Bolte
d7a8e21429
INTEGRATION: CWS native110 (1.1.2); FILE ADDED
...
2007/11/12 16:08:08 is 1.1.2.2: #i82248# module.pl into source directory
2007/10/04 11:10:59 is 1.1.2.1: #i82251# repackaging, part 3
2008-01-04 16:10:22 +00:00
Oliver Bolte
a30c866037
INTEGRATION: CWS native110 (1.74.6); FILE MERGED
...
2007/11/28 15:14:44 is 1.74.6.4: RESYNC: (1.75-1.79); FILE MERGED
2007/11/12 16:08:08 is 1.74.6.3: #i82248# module.pl into source directory
2007/10/24 12:57:55 is 1.74.6.2: RESYNC: (1.74-1.75); FILE MERGED
2007/10/04 11:04:56 is 1.74.6.1: #i82251# repackaging, part 3
2008-01-04 16:10:02 +00:00
Oliver Bolte
7c10f337fa
INTEGRATION: CWS native110 (1.57.48); FILE MERGED
...
2007/11/28 15:14:41 is 1.57.48.2: RESYNC: (1.57-1.58); FILE MERGED
2007/10/04 11:04:56 is 1.57.48.1: #i82251# repackaging, part 3
2008-01-04 16:09:37 +00:00
Oliver Bolte
393019b07d
INTEGRATION: CWS native110 (1.14.14); FILE MERGED
...
2007/11/12 16:06:56 is 1.14.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:55 is 1.14.14.1: #i82251# repackaging, part 3
2008-01-04 16:08:26 +00:00
Oliver Bolte
90322a9bdb
INTEGRATION: CWS native110 (1.14.14); FILE MERGED
...
2007/11/12 16:08:08 is 1.14.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:54 is 1.14.14.1: #i82251# repackaging, part 3
2008-01-04 16:07:44 +00:00
Oliver Bolte
1d0c70b0b1
INTEGRATION: CWS native110 (1.13.14); FILE MERGED
...
2007/11/12 16:06:56 is 1.13.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:53 is 1.13.14.1: #i82251# repackaging, part 3
2008-01-04 16:07:14 +00:00
Oliver Bolte
1228860bfa
INTEGRATION: CWS native110 (1.16.14); FILE MERGED
...
2007/12/06 17:13:28 is 1.16.14.3: #i82248# file test should not be committed
2007/11/12 16:06:56 is 1.16.14.2: #i82248# module.pl into source directory
2007/10/04 11:04:53 is 1.16.14.1: #i82251# repackaging, part 3
2008-01-04 16:07:01 +00:00
Oliver Bolte
04044e4a83
INTEGRATION: CWS native110 (1.24.6); FILE MERGED
...
2007/11/12 16:05:18 is 1.24.6.1: #i82248# module.pl into source directory
2008-01-04 16:06:26 +00:00
Oliver Bolte
90a81dec9d
INTEGRATION: CWS native110 (1.10.240); FILE MERGED
...
2007/11/12 16:02:42 is 1.10.240.2: #i82248# module.pl into source directory
2007/10/04 11:04:53 is 1.10.240.1: #i82251# repackaging, part 3
2008-01-04 16:06:09 +00:00
Oliver Bolte
6b75cfd599
INTEGRATION: CWS native110 (1.7.308); FILE MERGED
...
2007/10/04 11:04:47 is 1.7.308.1: #i82251# repackaging, part 3
2008-01-04 16:05:55 +00:00
Kurt Zenker
03cf5d81bc
INTEGRATION: CWS cmcfixes39 (1.33.18); FILE MERGED
...
2007/11/19 14:37:07 cmc 1.33.18.1: #i83751 --without-writer2latex
2007-12-12 14:03:50 +00:00
Kurt Zenker
4c61db6722
INTEGRATION: CWS configure22 (1.58.14); FILE MERGED
...
2007/12/02 23:21:56 rene 1.58.14.1: #i84181# openssl only needed when neon used
2007-12-12 12:29:25 +00:00
Kurt Zenker
ed56fbbd94
INTEGRATION: CWS configure22 (1.265.4); FILE MERGED
...
2007/12/02 23:21:56 rene 1.265.4.1: #i84181# openssl only needed when neon used
2007-12-12 12:29:11 +00:00
Kurt Zenker
1806c333eb
INTEGRATION: CWS configure22 (1.5.820); FILE MERGED
...
2007/12/04 20:59:44 rene 1.5.820.2: more typos
2007/12/02 12:34:16 rene 1.5.820.1: #i84165# --enable-sdext, --disable-reportdesign and --with-system-jfreereport
2007-12-12 12:28:57 +00:00
Kurt Zenker
4c81c51a96
INTEGRATION: CWS configure22 (1.22.4); FILE MERGED
...
2007/12/02 12:34:16 rene 1.22.4.1: #i84165# --enable-sdext, --disable-reportdesign and --with-system-jfreereport
2007-12-12 12:28:45 +00:00
Vladimir Glazounov
959f26ca9d
#i84162#
2007-12-07 14:59:34 +00:00
Vladimir Glazounov
e5a94a2954
INTEGRATION: CWS macosxquicktime01 (1.260.14); FILE MERGED
...
2007/10/05 03:13:48 msicotte 1.260.14.1: #i82234# inital commit of new files and changes for Mac Os X QuickTime integration
2007-12-07 10:51:44 +00:00
Vladimir Glazounov
a2c6428770
INTEGRATION: CWS jl77 (1.263.8); FILE MERGED
...
2007/11/21 10:41:02 jl 1.263.8.1: #i80335# do not use the berkeley db java libs anymore
2007-12-06 16:45:10 +00:00
Vladimir Glazounov
60cefbebb2
INTEGRATION: CWS obo20 (1.58.22); FILE MERGED
...
2007/12/03 14:30:55 obo 1.58.22.1: #i84191# Pack .Net 2005 runtime librarys for Professional Edition only
2007-12-05 15:16:00 +00:00