Commit graph

66 commits

Author SHA1 Message Date
Vladimir Glazounov
5c7f229a8f INTEGRATION: CWS sb90 (1.65.6); FILE MERGED
2008/06/26 08:54:48 sb 1.65.6.1: configuration CustomLayer has been replaced by BrandLayer (no longer parameterized by CustomDataUrl)
2008-07-02 08:45:57 +00:00
Rüdiger Timm
67e862f3b1 INTEGRATION: CWS sb88 (1.60.10); FILE MERGED
2008/06/11 10:49:18 sb 1.60.10.3: RESYNC: (1.60-1.64); FILE MERGED
2008/06/11 09:04:05 sb 1.60.10.2: #i90601# fixed relative order of Brand Layer CFG_Strata
2008/05/15 11:07:54 sb 1.60.10.1: #88739# VBA types were missing (fix by npower)
2008-06-16 13:15:05 +00:00
Oliver Bolte
00de796b02 INTEGRATION: CWS odfversion241_DEV300 (1.54.28.2.12); FILE MERGED
2008/05/21 14:44:51 pb 1.54.28.2.12.2: fix: #i89096# value gid_Profileitem_Version_Odfnotifyurl now a variable
2008/05/21 07:56:10 pb 1.54.28.2.12.1: fix: #i89096# new: gid_Profileitem_Version_Odfnotifyurl
2008-05-28 12:10:06 +00:00
Oliver Bolte
c606fb23b8 INTEGRATION: CWS native155 (1.62.6); FILE MERGED
2008/05/26 15:08:43 is 1.62.6.1: #i89911# productcode not in basis layer
2008-05-28 10:58:39 +00:00
Vladimir Glazounov
170b5c95d7 INTEGRATION: CWS native149 (1.59.8); FILE MERGED
2008/04/28 14:03:23 is 1.59.8.1: #i88689# one version file for each layer
2008-05-14 12:19:46 +00:00
Vladimir Glazounov
89161c7f80 INTEGRATION: CWS fwk86 (1.56.52); FILE MERGED
2008/04/30 15:49:25 pb 1.56.52.4: RESYNC: (1.57-1.59); FILE MERGED
2008/03/26 07:35:34 pb 1.56.52.3: RESYNC: (1.56-1.57); FILE MERGED
2008/03/26 06:00:21 pb 1.56.52.2: fix: #i86685# last changes removed before resync to m4
2008/03/13 09:51:38 pb 1.56.52.1: fix: #i86685# progressbar of splashscreen changed
2008-05-13 12:10:43 +00:00
Ivo Hinkelmann
ef52d08f66 INTEGRATION: CWS pdfimportfix (1.57.30); FILE MERGED
2008/04/16 09:57:03 akhva 1.57.30.1:  fix for xpdf.exe
2008-04-24 17:36:57 +00:00
Vladimir Glazounov
b857e4618b INTEGRATION: CWS native141 (1.57.14); FILE MERGED
2008/04/02 16:08:31 is 1.57.14.1: #i87732# version number in package names
2008-04-15 13:58:13 +00:00
Rüdiger Timm
549321776a INTEGRATION: CWS changefileheader (1.57.6); FILE MERGED
2008/03/31 16:07:15 rt 1.57.6.1: #i87441# Change license header to LPGL v3.
2008-04-10 08:45:46 +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
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
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
Ivo Hinkelmann
46fc5d6ccf INTEGRATION: CWS onlineupdate6 (1.50.40); FILE MERGED
2007/11/15 13:45:17 obr 1.50.40.3: #i82706# removed os and arch again since they don't get replaced by rtl bootstrap as expected
2007/11/06 22:13:22 obr 1.50.40.2: RESYNC: (1.50-1.53); FILE MERGED
2007/11/06 09:43:30 obr 1.50.40.1: #i82706# added os,arch,pkgfmt parameter
2007-11-26 12:20:58 +00:00
Jens-Heiner Rechtien
5e0b7ada46 INTEGRATION: CWS pj85 (1.50.38); FILE MERGED
2007/10/09 11:01:40 ericb 1.50.38.1: #i82432# fix wrong location for the user pref dir for X11 version
2007-11-01 16:16:21 +00:00
Ivo Hinkelmann
7fe73af7c0 INTEGRATION: CWS sb78_SRC680 (1.49.12.1.4); FILE MERGED
2007/09/26 12:07:21 sb 1.49.12.1.4.1: #i81445# ScriptFramework.jar is (unfortunately) part of the OOo Java API.
2007-10-15 15:29:33 +00:00
Vladimir Glazounov
4ea2f6b70a INTEGRATION: CWS sb71 (1.44.4); FILE MERGED
2007/10/02 10:19:20 sb 1.44.4.8: RESYNC: (1.49-1.50); FILE MERGED
2007/08/23 18:07:56 sb 1.44.4.7: RESYNC: (1.48-1.49); FILE MERGED
2007/08/20 08:57:58 sb 1.44.4.6: #i75466# Set URE_BIN_DIR in rc file on all platforms (instead of in startup scripts on Linux/Solaris etc. and in rc files on others).
2007/07/18 12:33:28 sb 1.44.4.5: RESYNC: (1.45-1.48); FILE MERGED
2007/05/30 14:30:23 sb 1.44.4.4: RESYNC: (1.44-1.45); FILE MERGED
2007/05/08 14:06:47 sb 1.44.4.3: #i75466# Find a place to set URE_BIN_DIR on Windows (set in the soffice etc. start scripts on Unix).
2007/04/26 08:38:29 sb 1.44.4.2: #i75466# UNO_SETTINGS in the Jvmfwk_Ini appears to be unused.
2007/04/16 13:53:37 sb 1.44.4.1: #i75466# Use of vnd.sun.star.expand: URLs in javavendors.xml requires URE_INTERNAL_LIB_DIR to be set in OOo unorc/uno.ini.
2007-10-15 11:56:42 +00:00
Vladimir Glazounov
833c0acfaf INTEGRATION: CWS dba23e (1.49.14); FILE MERGED
2007/08/08 09:22:22 oj 1.49.14.1: #i80338# remove HSQLDB
2007-08-27 15:06:05 +00:00
Rüdiger Timm
cfafc4ee6e INTEGRATION: CWS jl67 (1.45.102); FILE MERGED
2007/07/11 16:19:27 jl 1.45.102.2: RESYNC: (1.45-1.47); FILE MERGED
2007/07/11 12:20:48 jl 1.45.102.1: #i77752 support for default update URL for extensions in version.ini
2007-07-26 07:57:23 +00:00
Ivo Hinkelmann
832a33b401 INTEGRATION: CWS native93 (1.45.88); FILE MERGED
2007/07/02 15:37:08 is 1.45.88.1: #i73826# introducing OOo base version for all products
2007-07-11 13:42:27 +00:00
Rüdiger Timm
ebadea3b75 INTEGRATION: CWS c09tosrc (1.45.74); FILE MERGED
2007/06/21 16:27:16 is 1.45.74.1: #144951# c09 to src680 for installation tasks
2007-07-06 11:32:36 +00:00
Rüdiger Timm
052f217a11 INTEGRATION: CWS aquavcl01 (1.45.4); FILE MERGED
2007/05/14 12:07:23 ericb 1.45.4.5: #i77327#  correct change
2007/05/14 12:02:11 ericb 1.45.4.4: #i77327# remove extra else
2007/05/14 10:36:08 ericb 1.45.4.3: #i77327# add alpha to user install dir until Aqua version is stabilized
2007/05/14 10:32:40 ericb 1.45.4.2: #i77327# remove bad change
2007/05/14 10:30:32 ericb 1.45.4.1: #i77327# add alpha to user install dir until Aqua version is stabilized
2007-07-05 08:21:23 +00:00
Rüdiger Timm
11a82d1fb7 INTEGRATION: CWS npower6 (1.42.20); FILE MERGED
2007/02/07 16:33:28 npower 1.42.20.1: #i74096 support config options to control deployment of vba compatibility api
2007-04-25 15:19:20 +00:00
Oliver Bolte
73d22679bc INTEGRATION: CWS sb36 (1.24.10); FILE MERGED
2007/01/19 12:27:03 sb 1.24.10.6: #i51803# Keep UNO_JAVA_JFW_CLASSPATH_URLS in case of SYSTEM_ jars.
2007/01/12 16:46:50 sb 1.24.10.5: RESYNC: (1.40-1.41); FILE MERGED
2006/11/08 18:49:21 sb 1.24.10.4: RESYNC: (1.35-1.40); FILE MERGED
2006/03/13 11:30:01 sb 1.24.10.3: RESYNC: (1.25-1.35); FILE MERGED
2005/09/22 12:42:02 sb 1.24.10.2: RESYNC: (1.24-1.25); FILE MERGED
2005/07/11 13:26:54 sb 1.24.10.1: #i51803# Transfered cleaned-up jvmfwk3rc UNO_JAVA_JFW_CLASSPATH_URLS into unorc URE_INTERNAL_JAVA_CLASSPATH; cleaned up Order entries.
2007-03-12 10:01:44 +00:00
Vladimir Glazounov
6426c2fbda INTEGRATION: CWS macosxversioning01 (1.41.16); FILE MERGED
2007/01/20 14:36:45 pjanik 1.41.16.2: RESYNC: (1.41-1.42); FILE MERGED
2007/01/04 17:07:56 mox 1.41.16.1: Change the Mac OS X user folder from ...OpenOffice.org <ver>/ to ...OpenOffice.org/2/
2007-02-26 13:57:51 +00:00
Vladimir Glazounov
c2e30724b6 INTEGRATION: CWS systemxt (1.40.68); FILE MERGED
2006/11/22 16:05:39 rene 1.40.68.1: #i59985# add make XmlSearch buildable with upstream xt (by mkretzschmar)
2007-01-15 11:40:16 +00:00
Kurt Zenker
523f38cb4a INTEGRATION: CWS updatefeed (1.40.66); FILE MERGED
2006/12/06 09:20:53 obr 1.40.66.2: #i72061# UserAgent -> UpdateUserAgent
2006/12/04 17:10:06 is 1.40.66.1: #i72061# update keys into version file
2006-12-13 14:16:04 +00:00
Oliver Bolte
3050e3fb24 INTEGRATION: CWS cmcfixes28 (1.39.158); FILE MERGED
2006/09/27 11:20:28 cmc 1.39.158.1: #i69026# add some optional support for an additional serializer.jar location
2006-10-11 08:29:58 +00:00
Jens-Heiner Rechtien
3d20f0418f INTEGRATION: CWS sb53 (1.38.6); FILE MERGED
2006/05/08 13:25:09 sb 1.38.6.1: #135562# Reverted changes introduced in 1.29.2.1, as they broke installed UNO packages across a StarOffice patch update.
2006-05-09 09:45:06 +00:00
Rüdiger Timm
20a2301ebd INTEGRATION: CWS systemjava2 (1.37.6); FILE MERGED
2006/04/26 16:26:00 kendy 1.37.6.1: #i64777#
Fix --with-system-xalan breakage in scp2
2006-05-02 09:23:58 +00:00
Jens-Heiner Rechtien
81c022c2f2 INTEGRATION: CWS systemjava (1.35.24); FILE MERGED
2006/03/22 15:18:49 cmc 1.35.24.1: #i52974# support using the system java components
2006-04-19 14:15:13 +00:00
Vladimir Glazounov
96bf988608 INTEGRATION: CWS onlineupdate1 (1.35.32); FILE MERGED
2006/04/07 09:46:38 is 1.35.32.2: #134045# update url only for inhouse builds
2006/04/04 16:03:05 jl 1.35.32.1: #134045#
2006-04-07 14:03:00 +00:00
Rüdiger Timm
62b16da119 INTEGRATION: CWS aquacolors (1.32.52); FILE MERGED
2006/03/03 12:49:05 ericb 1.32.52.1: #i61174# aquacolors ;5Cadd key for MacOSXIntegrator()
2006-03-07 08:43:29 +00:00
Rüdiger Timm
3d95ab3848 INTEGRATION: CWS dbo510 (1.29.2); FILE MERGED
2006/02/14 11:44:11 dbo 1.29.2.2: RESYNC: (1.29-1.32); FILE MERGED
2005/11/25 10:10:37 dbo 1.29.2.1: #i49437# changed package related UNO_SERVICES, UNO_TYPES, UNO_JAVA_CLASSPATH prefixed with PKG
2006-03-06 09:17:42 +00:00
Rüdiger Timm
29640f9b76 INTEGRATION: CWS hro02 (1.31.12); FILE MERGED
2006/02/07 14:16:39 hro 1.31.12.1: #128675# Don't create an error report server entry for non SUN builds as debug information is not available
2006-02-09 16:07:10 +00:00
Oliver Bolte
e38f146a2c INTEGRATION: CWS macosx20xfixes01 (1.29.74); FILE MERGED
2006/01/11 14:04:19 obr 1.29.74.1: #i57253# do not hide user directory on OS X
2006-01-20 12:32:23 +00:00
Rüdiger Timm
7c74cb1210 #i10000# #i57253# Undo last change which should not go into master workspace. 2006-01-11 12:05:10 +00:00
Oliver Braun
24c4848917 #i57253# do not hide user directory on OS X 2006-01-08 21:02:05 +00:00
Jens-Heiner Rechtien
eae3113151 INTEGRATION: CWS aboutbox (1.28.6); FILE MERGED
2005/11/17 11:43:12 is 1.28.6.1: #127910# product update string
2005-11-17 17:01:36 +00:00
Rüdiger Timm
b32493c2f4 INTEGRATION: CWS c06 (1.24.80); FILE MERGED
2005/08/31 12:05:34 kso 1.24.80.3: #i53371# - added new optional layer for custom modules to configmgrrc.
2005/08/22 11:49:22 kso 1.24.80.2: #i53371# - configmgrrc: Changed location of custom data layer.
2005/08/22 09:11:09 kso 1.24.80.1: #i53371# - configmgrrc: Added configuration layer for custom data.
2005-11-11 11:27:37 +00:00
Jens-Heiner Rechtien
41439a6cfd INTEGRATION: CWS lo8 (1.26.36); FILE MERGED
2005/10/19 09:41:34 lo 1.26.36.1: #i48274# docbook.jar and XFlat.jar not needed
2005-10-24 17:31:12 +00:00
Jens-Heiner Rechtien
4212d648e0 INTEGRATION: CWS nativefixer18 (1.24.54); FILE MERGED
2005/09/26 17:22:44 is 1.24.54.7: RESYNC: (1.24-1.25); FILE MERGED
2005/09/23 15:06:14 hro 1.24.54.6: #i54684# Configuration uses version.ini for buuild id
2005/09/19 12:09:00 is 1.24.54.5: #125778# new source key for version file
2005/09/13 09:42:56 is 1.24.54.4: #124120# new version-ini file
2005/09/08 13:23:36 is 1.24.54.3: #124120# productkey also in bootstrap file
2005/09/06 10:32:11 is 1.24.54.2: #124120# shifting entries from bootstrap file to version file
2005/08/05 14:51:52 is 1.24.54.1: #124120# new version.ini file
2005-09-28 12:25:29 +00:00
Rüdiger Timm
c8eade75cc INTEGRATION: CWS ooo19126 (1.24.100); FILE MERGED
2005/09/05 17:49:12 rt 1.24.100.1: #i54170# Change license header: remove SISSL
2005-09-09 00:41:05 +00:00
Rüdiger Timm
d295757e7e INTEGRATION: CWS nativefixer11 (1.23.2); FILE MERGED
2005/06/23 14:55:38 is 1.23.2.1: #123800# improve patch update
2005-07-01 11:20:55 +00:00
Rüdiger Timm
8f5bfb8038 INTEGRATION: CWS nativefixer10 (1.21.10); FILE MERGED
2005/06/15 15:23:13 is 1.21.10.1: #i50709# constant user dir
2005-06-17 13:15:05 +00:00
Oliver Bolte
fc35b0c397 INTEGRATION: CWS sb31 (1.19.4); FILE MERGED
2005/06/02 13:31:43 sb 1.19.4.2: RESYNC: (1.19-1.21); FILE MERGED
2005/05/09 08:31:21 sb 1.19.4.1: #121392# Renamed URE use of UNO_[JAVA_]COMPONENT_PATH to URE_INTERNAL_LIB|JAVA_DIR.
2005-06-17 09:18:12 +00:00
Rüdiger Timm
8b61ba8702 INTEGRATION: CWS nativefixer9 (1.20.8); FILE MERGED
2005/05/19 07:31:24 jb 1.20.8.1: #i49148# Add configuration bootstrap parameter for schema versioning. Use buildid (from bootstraprc) as version tag.
2005-05-20 14:47:42 +00:00
Rüdiger Timm
205e7f6a1f INTEGRATION: CWS c01v006 (1.18.34); FILE MERGED
2005/04/27 12:44:31 pb 1.18.34.1: fix: #120401# ProgressColor -> ProgressBarColor
2005-05-13 07:25:16 +00:00
Oliver Bolte
6910048e72 INTEGRATION: CWS winregclean1 (1.18.28); FILE MERGED
2005/04/23 16:20:21 is 1.18.28.2: #i47659# initablefile
2005/04/22 14:36:07 is 1.18.28.1: #i47659# better mechanism to find the office
2005-04-29 07:54:40 +00:00
Rüdiger Timm
d5cdd75f8f INTEGRATION: CWS fwkfinal3 (1.17.74); FILE MERGED
2005/03/18 08:46:45 pb 1.17.74.1: fix: #120338# new entries to customize progressbar of splash screen
2005-03-30 07:42:35 +00:00
Rüdiger Timm
c0c83025f8 INTEGRATION: CWS nativefixer3 (1.16.4); FILE MERGED
2005/01/26 13:08:33 is 1.16.4.1: #i40375# productnames with white spaces
2005-01-31 10:01:28 +00:00