Commit graph

349 commits

Author SHA1 Message Date
Oliver Bolte
b44aad6dfa #i10000# one ALLUSERS setting too much 2006-09-19 05:41:10 +00:00
Oliver Bolte
3e0ea34d10 INTEGRATION: CWS writerfilter (1.43.8); FILE MERGED
2006/08/03 08:48:24 hbrinkm 1.43.8.7: RESYNC: (1.56-1.58); FILE MERGED
2006/07/21 08:20:24 hbrinkm 1.43.8.6: RESYNC: (1.55-1.56); FILE MERGED
2006/04/18 08:32:17 tra 1.43.8.5: RESYNC: (1.53-1.55); FILE MERGED
2006/03/14 13:54:48 tra 1.43.8.4: RESYNC: (1.52-1.53); FILE MERGED
2006/02/20 14:37:11 tra 1.43.8.3: RESYNC: (1.51-1.52); FILE MERGED
2006/01/02 17:24:51 tra 1.43.8.2: RESYNC: (1.43-1.51); FILE MERGED
2005/11/15 12:31:43 sb 1.43.8.1: #i57188# Missing fix for the recent MSITEMPLATEDIR changes (fix by is).
2006-09-15 13:38:43 +00:00
Oliver Bolte
0665e03e30 INTEGRATION: CWS writerfilter (1.2.86); FILE MERGED
2006/02/20 14:36:53 tra 1.2.86.2: RESYNC: (1.2-1.3); FILE MERGED
2005/11/15 12:30:22 sb 1.2.86.1: #i57188# When storing the path to the installed URE in the Windows registry, make sure that it ends up in HKEY_LOCAL_MACHINE.
2006-09-15 13:38:28 +00:00
Kurt Zenker
d37ddd8d0a INTEGRATION: CWS native56 (1.2.194); FILE MERGED
2006/07/19 14:48:23 is 1.2.194.1: #138243# followupdialog for outofdiscspace
2006-07-21 09:35:21 +00:00
Kurt Zenker
01c1b83256 INTEGRATION: CWS native56 (1.2.122); FILE MERGED
2006/07/19 14:48:22 is 1.2.122.1: #138243# followupdialog for outofdiscspace
2006-07-21 09:35:04 +00:00
Kurt Zenker
1ee69a3c60 INTEGRATION: CWS native56 (1.5.122); FILE MERGED
2006/07/19 14:48:22 is 1.5.122.1: #138243# followupdialog for outofdiscspace
2006-07-21 09:34:48 +00:00
Oliver Bolte
037a848257 INTEGRATION: CWS native54 (1.56.32); FILE MERGED
2006/07/11 10:46:26 is 1.56.32.1: #137670# no more download sets in cws
2006-07-13 14:15:45 +00:00
Oliver Bolte
af84fa61dd INTEGRATION: CWS vq33 (1.56.26); FILE MERGED
2006/07/03 18:52:05 vq 1.56.26.1: #i66881# Fix typo in makefile.
Patch by ericb@openoffice.org
2006-07-10 17:59:28 +00:00
Kurt Zenker
c25b353ba8 INTEGRATION: CWS native51 (1.39.24); FILE MERGED
2006/06/29 10:57:18 is 1.39.24.1: #137669# preparing pp4
2006-07-05 20:15:04 +00:00
Rüdiger Timm
4f8d01b6b9 #i10000# Undo last changes. They were meant for OOC680, not SRC680. 2006-05-12 11:55:45 +00:00
Rüdiger Timm
54bd9aeb45 #i10000# Create install sets for all languages according to http://wiki.services.openoffice.org/wiki/OOoRelease203 2006-05-12 11:23:50 +00:00
Kurt Zenker
0b53f999ba INTEGRATION: CWS macosx20xfixes02 (1.55.2); FILE MERGED
2006/04/03 19:34:31 obr 1.55.2.1: #i63030# enable simple installer for OS X packaging
2006-04-26 19:45:16 +00:00
Vladimir Glazounov
d467dbe1f5 INTEGRATION: CWS onlineupdate1 (1.38.8); FILE MERGED
2006/04/04 16:04:10 jl 1.38.8.1: #134045#
2006-04-07 13:44:24 +00:00
Oliver Bolte
d291493b0e INTEGRATION: CWS cairofixes01 (1.52.42); FILE MERGED
2006/03/06 09:05:26 thb 1.52.42.2: #i62739# Corrected typo
2006/03/03 11:26:08 thb 1.52.42.1: #i62739# Changed line of products to pack to be sensitive to BUILD_TYPE (at least for the ODK case)
2006-03-22 10:02:24 +00:00
Oliver Bolte
93b8b0ea78 INTEGRATION: CWS pyunofixes2 (1.28.20); FILE MERGED
2006/01/07 21:38:02 jbu 1.28.20.2: RESYNC: (1.28-1.51); FILE MERGED
2006/01/07 20:02:06 jbu 1.28.20.1: #i54532# added officehelper.py (provided by Christian Junker)
2006-03-22 09:55:10 +00:00
Rüdiger Timm
2e9c7a6711 INTEGRATION: CWS native41 (1.34.2); FILE MERGED
2006/03/01 15:12:03 is 1.34.2.1: #i62678# admin installation for sdk in correct directory
2006-03-09 13:08:19 +00:00
Rüdiger Timm
46d5f903cd INTEGRATION: CWS jl31 (1.33.18); FILE MERGED
2006/02/17 13:19:22 is 1.33.18.1: #i62140# substitution of variables defined in include files
2006-03-09 09:44:12 +00:00
Rüdiger Timm
1e58604b21 INTEGRATION: CWS ause048 (1.52.28); FILE MERGED
2006/02/14 16:38:22 hjs 1.52.28.1: #i59674# remove hack that is no longer required
2006-03-08 12:52:58 +00:00
Rüdiger Timm
3c5ade80b1 INTEGRATION: CWS native36 (1.33.6); FILE MERGED
2006/02/08 13:39:05 is 1.33.6.2: #130847# setting patch level 3
2006/01/31 13:27:18 is 1.33.6.1: #i59187# allowing relative pathes in ddf files
2006-03-06 13:02:58 +00:00
Rüdiger Timm
3a43acf01d INTEGRATION: CWS native36 (1.4.170); FILE MERGED
2006/02/08 14:11:07 is 1.4.170.1: #i48393# german license string with dot at end
2006-03-06 13:02:46 +00:00
Rüdiger Timm
15f42e28fc INTEGRATION: CWS native40 (1.33.22); FILE MERGED
2006/02/22 14:47:04 is 1.33.22.1: #i62313# new OOo downloads
2006-03-06 08:29:39 +00:00
Kurt Zenker
4c866ae8a2 INTEGRATION: CWS native38 (1.33.10); FILE MERGED
2006/02/09 16:30:24 is 1.33.10.1: #i61842# new include path for ooo dev bitmaps
2006-02-27 15:38:33 +00:00
Rüdiger Timm
56aa3ddbe8 INTEGRATION: CWS sysui12 (1.26.4); FILE MERGED
2006/01/09 10:22:59 obr 1.26.4.4: RESYNC: (1.30-1.32); FILE MERGED
2005/12/19 14:34:43 obr 1.26.4.3: RESYNC: (1.27-1.30); FILE MERGED
2005/11/07 10:30:42 obr 1.26.4.2: RESYNC: (1.26-1.27); FILE MERGED
2005/10/06 12:42:26 is 1.26.4.1: #i46964# new desktop integration packaging
2006-01-13 14:02:35 +00:00
Kurt Zenker
151547f07d INTEGRATION: CWS native35 (1.3.6); FILE MERGED
2006/01/05 12:52:43 is 1.3.6.2: #i46347# new strings for filetypedialog
2006/01/05 12:09:47 is 1.3.6.1: #i46347# new strings for filetypedialog
2006-01-06 10:33:22 +00:00
Kurt Zenker
c48ff19827 INTEGRATION: CWS native35 (1.3.6); FILE MERGED
2006/01/05 12:52:42 is 1.3.6.2: #i46347# new strings for filetypedialog
2006/01/05 12:09:46 is 1.3.6.1: #i46347# new strings for filetypedialog
2006-01-06 10:33:10 +00:00
Kurt Zenker
9bb85e6a17 INTEGRATION: CWS native35 (1.7.6); FILE MERGED
2006/01/05 12:52:42 is 1.7.6.2: #i46347# new strings for filetypedialog
2006/01/05 12:09:45 is 1.7.6.1: #i46347# new strings for filetypedialog
2006-01-06 10:32:57 +00:00
Kurt Zenker
90bbad76b9 INTEGRATION: CWS native35 (1.9.6); FILE MERGED
2006/01/05 12:09:32 is 1.9.6.1: #i46347# new strings for filetypedialog
2006-01-06 10:32:46 +00:00
Kurt Zenker
b3ccfc7ba3 INTEGRATION: CWS native35 (1.8.6); FILE MERGED
2006/01/05 12:52:41 is 1.8.6.2: #i46347# new strings for filetypedialog
2006/01/05 12:09:14 is 1.8.6.1: #i46347# new strings for filetypedialog
2006-01-06 10:32:33 +00:00
Kurt Zenker
61217f1c58 INTEGRATION: CWS native34 (1.29.16); FILE MERGED
2006/01/02 17:04:17 is 1.29.16.3: RESYNC: (1.29-1.30); FILE MERGED
2005/12/21 11:58:44 is 1.29.16.2: #129308# increasing productversion
2005/12/16 15:47:12 is 1.29.16.1: #i59447# beta is also an old product to update
2006-01-06 10:19:01 +00:00
Kurt Zenker
8023e458cc INTEGRATION: CWS native34 (1.6.88); FILE MERGED
2005/12/16 15:47:13 is 1.6.88.1: #i59447# beta is also an old product to update
2006-01-06 10:18:50 +00:00
Kurt Zenker
7f4eb91cc4 INTEGRATION: CWS sb44 (1.29.10); FILE MERGED
2005/12/12 16:08:33 sb 1.29.10.1: #i59113# Changed URE version from 1.0 to 1.1.
2006-01-03 11:47:46 +00:00
Kurt Zenker
37fa3af6ec INTEGRATION: CWS sb44 (1.48.12); FILE MERGED
2005/12/12 16:08:33 sb 1.48.12.1: #i59113# Changed URE version from 1.0 to 1.1.
2006-01-03 11:47:32 +00:00
Kurt Zenker
f703ed14ea INTEGRATION: CWS sb44 (1.2.100); FILE MERGED
2005/12/12 16:08:33 sb 1.2.100.1: #i59113# Changed URE version from 1.0 to 1.1.
2006-01-03 11:47:17 +00:00
Kurt Zenker
19b6c09956 INTEGRATION: CWS sb44 (1.2.100); FILE MERGED
2005/12/12 16:08:32 sb 1.2.100.1: #i59113# Changed URE version from 1.0 to 1.1.
2006-01-03 11:47:04 +00:00
Jens-Heiner Rechtien
e6e1b1d3a4 INTEGRATION: CWS jsc2 (1.48.20); FILE MERGED
2005/12/19 12:08:23 jsc 1.48.20.1: #i59480# build only English SDK - sdkoo_en-US
2005-12-28 17:03:17 +00:00
Oliver Bolte
b97c3b72ca #i59674#,#i10000# workaround to survive registration of KDE addressbook 2005-12-22 11:53:58 +00:00
Oliver Bolte
44786c67b9 INTEGRATION: CWS nativefixer21 (1.42.2); FILE MERGED
2005/11/28 10:24:00 is 1.42.2.5: RESYNC: (1.47-1.48); FILE MERGED
2005/11/15 17:18:27 is 1.42.2.4: RESYNC: (1.46-1.47); FILE MERGED
2005/11/10 17:49:07 is 1.42.2.3: RESYNC: (1.43-1.46); FILE MERGED
2005/10/26 09:59:08 is 1.42.2.2: RESYNC: (1.42-1.43); FILE MERGED
2005/10/24 09:21:59 is 1.42.2.1: #i56369# usage of wrong ure idt files
2005-12-21 11:52:58 +00:00
Oliver Bolte
33ce3f4ea4 INTEGRATION: CWS nativefixer21 (1.2.54); FILE MERGED
2005/11/29 13:49:06 is 1.2.54.1: #i58437# removing empty string
2005-12-21 11:52:44 +00:00
Oliver Bolte
36a488fc04 INTEGRATION: CWS nativefixer21 (1.2.2); FILE MERGED
2005/11/29 13:49:04 is 1.2.2.1: #i58437# removing empty string
2005-12-21 11:52:31 +00:00
Oliver Bolte
31f55fae70 INTEGRATION: CWS nativefixer21 (1.6.94); FILE MERGED
2005/11/29 13:49:03 is 1.6.94.1: #i58437# removing empty string
2005-12-21 11:52:18 +00:00
Oliver Bolte
86a53943e7 INTEGRATION: CWS nativefixer21 (1.8.40); FILE MERGED
2005/11/29 13:49:02 is 1.8.40.1: #i58437# removing empty string
2005-12-21 11:52:03 +00:00
Oliver Bolte
cd35e9d752 INTEGRATION: CWS nativefixer21 (1.7.44); FILE MERGED
2005/11/29 13:48:53 is 1.7.44.1: #i58437# removing empty string
2005-12-21 11:51:49 +00:00
Rüdiger Timm
d7cd64bd39 #i10000# Back to normality, i.e. what we had before 2.0.1 release phase. 2005-12-15 08:40:46 +00:00
Rüdiger Timm
4bbd19f982 INTEGRATION: CWS native33 (1.29.6); FILE MERGED
2005/12/13 10:35:16 is 1.29.6.2: #i58845# file versioning
2005/12/07 16:08:07 is 1.29.6.1: #i58900# targetdir definition
2005-12-14 11:34:16 +00:00
Rüdiger Timm
020d54a06c INTEGRATION: CWS native33 (1.2.138); FILE MERGED
2005/12/13 10:36:05 is 1.2.138.1: #i58845# file versioning´inc_ooolangpack/windows/msi_templates/components.txt
2005-12-14 11:34:05 +00:00
Rüdiger Timm
4334c925e5 INTEGRATION: CWS native33 (1.2.138); FILE MERGED
2005/12/13 10:39:28 is 1.2.138.1: #i58847# setting default destination dir in update process
2005-12-14 11:33:54 +00:00
Rüdiger Timm
36c4251d57 INTEGRATION: CWS native33 (1.3.162); FILE MERGED
2005/12/07 16:07:11 is 1.3.162.1: #i58849# showing no product code if another installation was found
2005-12-14 11:33:38 +00:00
Rüdiger Timm
00d5c3ec25 INTEGRATION: CWS native33 (1.2.138); FILE MERGED
2005/12/13 10:37:04 is 1.2.138.1: #i58845# file versioning
2005-12-14 11:33:27 +00:00
Rüdiger Timm
265dc96c45 #i10000# Do not pack 'th' office sets, do 'en-US_th' instead. 2005-12-09 14:58:31 +00:00
Kurt Zenker
cb33b4c20e INTEGRATION: CWS native31 (1.28.8); FILE MERGED
2005/11/28 13:08:28 is 1.28.8.2: #i58540# setting ooo versions
2005/11/28 11:12:33 is 1.28.8.1: #i58540# setting ooo versions
2005-11-30 12:22:05 +00:00