Commit graph

6545 commits

Author SHA1 Message Date
Oliver Bolte
511a367467 INTEGRATION: CWS pathoptions01 (1.19.54); FILE MERGED
2006/06/26 07:25:04 as 1.19.54.1: #i66157# new property to handle the most actual document template filter for an OOo module
2006-07-13 12:30:20 +00:00
Oliver Bolte
d0b34cfb27 INTEGRATION: CWS pathoptions01 (1.29.52); FILE MERGED
2006/06/30 17:22:50 mav 1.29.52.2: RESYNC: (1.29-1.30); FILE MERGED
2006/06/26 07:25:03 as 1.29.52.1: #i66157# new property to handle the most actual document template filter for an OOo module
2006-07-13 12:30:03 +00:00
Oliver Bolte
142cba488a INTEGRATION: CWS native55 (1.50.6); FILE MERGED
2006/07/11 08:03:34 is 1.50.6.2: #i67141# epm setting for no and internal
2006/07/10 11:38:15 is 1.50.6.1: #i67141# problem with value of EPM
2006-07-13 12:15:19 +00:00
Oliver Bolte
579c335573 INTEGRATION: CWS pathoptions01 (1.27.242); FILE MERGED
2006/07/11 10:06:45 mav 1.27.242.2: RESYNC: (1.27-1.28); FILE MERGED
2006/07/06 10:19:28 hjs 1.27.242.1: #137804# make zip*alllangiso overideable for not forcing all case
2006-07-13 11:08:18 +00:00
Oliver Bolte
d6e001395f INTEGRATION: CWS pathoptions01 (1.25.242); FILE MERGED
2006/07/06 10:19:28 hjs 1.25.242.1: #137804# make zip*alllangiso overideable for not forcing all case
2006-07-13 11:08:06 +00:00
Oliver Bolte
aebd954804 INTEGRATION: CWS targetedaot2 (1.195.14); FILE MERGED
2006/07/11 12:46:54 cmc 1.195.14.1: #i67154# better to use the fact that the compiler is gcj, rather than the JDK is the GNU classpath one for default javac/javai
2006-07-13 10:13:32 +00:00
Oliver Bolte
9c3d9dd2ce INTEGRATION: CWS cowfixes01 (1.33.48); FILE MERGED
2006/05/10 18:03:22 thb 1.33.48.2: RESYNC: (1.33-1.34); FILE MERGED
2006/04/21 09:56:29 lo 1.33.48.1: #134471#
2006-07-13 09:32:37 +00:00
Oliver Bolte
30a19f6d73 INTEGRATION: CWS cowfixes01 (1.192.22); FILE MERGED
2006/06/28 11:02:00 thb 1.192.22.3: RESYNC: (1.202-1.203); FILE MERGED
2006/05/10 18:00:36 thb 1.192.22.2: RESYNC: (1.192-1.202); FILE MERGED
2006/04/10 14:01:19 thb 1.192.22.1: #128078# Including bf_wrapper680 bf_frm680 bf_ofa680 bindet680 bf_lng680 bf_sd680 bf_migratefilter680 textconversiondlgs680 date680 egi680 productregistration.uno calc680 evoab1 fpicker.uno fwm680 eme680 epb680 epg680 ept680 epp680 era680 eti680 exp680 ips680 ime680 ipb680 icd680 ipx680 ipt680 ipd680 ira680 itg680 iti680 tfu680 icg680 uui680 tab bat basprov680li.uno avmedia680 dbext680 spell680 so680 socomp offacc680 flash680 smd680
2006-07-13 09:26:22 +00:00
Oliver Bolte
12c152caa9 INTEGRATION: CWS latex (1.11.236); FILE MERGED
2006/04/07 11:21:06 sus 1.11.236.1: #i16350# adding DocBook example tags to filters
2006-07-13 08:36:01 +00:00
Oliver Bolte
b04743544f INTEGRATION: CWS latex (1.14.236); FILE MERGED
2006/04/07 09:53:36 sus 1.14.236.1: #i24813# Adding writer2latex.jar to the Writer module for pp3 productupdate
2006-07-13 08:35:50 +00:00
Oliver Bolte
84bae19b37 INTEGRATION: CWS latex (1.20.50); FILE MERGED
2006/07/06 10:22:10 sus 1.20.50.2: #i24813# Solving a merge error to m174
2006/04/07 09:53:36 sus 1.20.50.1: #i24813# Adding writer2latex.jar to the Writer module for pp3 productupdate
2006-07-13 08:35:32 +00:00
Oliver Bolte
6cd8730a78 INTEGRATION: CWS jl34 (1.202.12); FILE MERGED
2006/05/18 10:08:46 jl 1.202.12.1: #65266# cli_uno in patch
2006-07-13 07:32:55 +00:00
Oliver Bolte
8551de66a9 INTEGRATION: CWS vq33 (1.151.8); FILE MERGED
2006/07/03 19:00:16 vq 1.151.8.1: #i66767# Fix problem when tcsh appears as part of the path.
2006-07-10 18:05:10 +00:00
Oliver Bolte
0fcbbbfc83 INTEGRATION: CWS vq33 (1.166.8); FILE MERGED
2006/07/03 19:00:16 vq 1.166.8.1: #i66767# Fix problem when tcsh appears as part of the path.
2006-07-10 18:00:12 +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
Oliver Bolte
b10a8c483d INTEGRATION: CWS vq33 (1.1.2); FILE ADDED
2006/07/03 19:16:40 vq 1.1.2.1: #i66706# Move udkversion.mk from sal/inc/ to solenv/inc/.
2006-07-10 17:51:45 +00:00
Oliver Bolte
e9dad76c7e INTEGRATION: CWS vq33 (1.191.18); FILE MERGED
2006/07/03 19:16:40 vq 1.191.18.3: #i66706# Move udkversion.mk from sal/inc/ to solenv/inc/.
2006/06/24 03:09:29 vq 1.191.18.2: #i66705# Remove wrong .SUFFIXES targets.
2006/06/24 02:56:10 vq 1.191.18.1: #i66531# Fix "Macro `LAST_MINOR' redefined after use" warnings.
2006-07-10 17:51:36 +00:00
Oliver Bolte
1dc38b782e INTEGRATION: CWS vq33 (1.32.110); FILE MERGED
2006/07/03 18:44:53 vq 1.32.110.1: #i66940# Make the scripts aware of bash as possible shell.
2006-07-10 17:51:25 +00:00
Oliver Bolte
3382767442 INTEGRATION: CWS vq33 (1.22.272); FILE MERGED
2006/07/03 18:44:53 vq 1.22.272.1: #i66940# Make the scripts aware of bash as possible shell.
2006-07-10 17:51:00 +00:00
Oliver Bolte
c349dd8d9e INTEGRATION: CWS vq33 (1.53.52); FILE MERGED
2006/07/03 18:44:53 vq 1.53.52.1: #i66940# Make the scripts aware of bash as possible shell.
2006-07-10 17:49:40 +00:00
Oliver Bolte
318548a63d SRC680 2006-07-10 17:12:41 +00:00
Oliver Bolte
9b160502b8 INTEGRATION: CWS qiq (1.34.56); FILE MERGED
2006/06/27 11:04:45 fs 1.34.56.2: RESYNC: (1.34-1.36); FILE MERGED
2006/05/24 07:01:15 fs 1.34.56.1: new lib sdbt
2006-07-10 15:17:20 +00:00
Oliver Bolte
8610f1378f INTEGRATION: CWS qiq (1.43.20); FILE MERGED
2006/06/27 11:04:21 fs 1.43.20.2: RESYNC: (1.43-1.44); FILE MERGED
2006/05/24 06:58:43 fs 1.43.20.1: new lib sdbt
2006-07-10 15:16:26 +00:00
Oliver Bolte
e36d866614 INTEGRATION: CWS qiq (1.201.6); FILE MERGED
2006/06/27 11:03:55 fs 1.201.6.2: RESYNC: (1.201-1.203); FILE MERGED
2006/05/24 06:58:42 fs 1.201.6.1: new lib sdbt
2006-07-10 15:16:15 +00:00
Oliver Bolte
4bbf4d0174 INTEGRATION: CWS linuxppcrpm (1.34.68); FILE MERGED
2006/07/02 16:31:24 ericb 1.34.68.1: #i66719# linuxppcrpm make rpm buildable on Debian or Ubuntu distribution
2006-07-10 10:00:31 +00:00
Oliver Bolte
00b890b1b2 INTEGRATION: CWS linuxppcrpm (1.33.162); FILE MERGED
2006/07/02 16:31:24 ericb 1.33.162.1: #i66719# linuxppcrpm make rpm buildable on Debian or Ubuntu distribution
2006-07-10 10:00:18 +00:00
Oliver Bolte
954c60fade INTEGRATION: CWS linuxppcrpm (1.49.90); FILE MERGED
2006/07/02 16:31:24 ericb 1.49.90.1: #i66719# linuxppcrpm make rpm buildable on Debian or Ubuntu distribution
2006-07-10 09:59:57 +00:00
Nakata Maho
6e6661f2eb Fix conflicts 2006-07-08 02:16:08 +00:00
Kurt Zenker
2b2ad26bcf SRC680 2006-07-06 15:08:18 +00:00
Kurt Zenker
10e802322c INTEGRATION: CWS warningfixes01 (1.2.2); FILE MERGED
2006/06/27 12:34:08 sb 1.2.2.2: #i66700# Minimal adaption to cygwin platform (no functional testhxx yet, but build does not break any more).
2006/06/27 08:44:28 sb 1.2.2.1: #i66725# CAPTURE_COMMAND must be set before settings.mk is included.
2006-07-06 13:24:28 +00:00
Kurt Zenker
26d7b1017e INTEGRATION: CWS warningfixes01 (1.2.2); FILE MERGED
2006/06/27 12:34:08 sb 1.2.2.1: #i66700# Minimal adaption to cygwin platform (no functional testhxx yet, but build does not break any more).
2006-07-06 13:24:17 +00:00
Kurt Zenker
69f1e72f8b INTEGRATION: CWS warningfixes01 (1.4.2); FILE MERGED
2006/06/27 14:27:36 sb 1.4.2.1: #i66760# Removed warning on FreeBSD/amd64 (thanks to pjanik).
2006-07-06 13:24:00 +00:00
Kurt Zenker
c4d0b0a7ec #i10000# gernerate new 2006-07-06 07:51:06 +00:00
Kurt Zenker
06fed35d6f INTEGRATION: CWS ause058 (1.105.4); FILE MERGED
2006/06/22 14:05:06 hjs 1.105.4.2: #i58890# applied iz58890_3.diff
2006/06/12 16:34:45 hjs 1.105.4.1: #i65725# no more MK_UNROLL
2006-07-05 21:32:39 +00:00
Kurt Zenker
48e4f35fe6 INTEGRATION: CWS ause058 (1.166.4); FILE MERGED
2006/06/22 14:05:06 hjs 1.166.4.1: #i58890# applied iz58890_3.diff
2006-07-05 21:32:27 +00:00
Kurt Zenker
2713c220f6 INTEGRATION: CWS ause058 (1.151.4); FILE MERGED
2006/06/22 14:05:05 hjs 1.151.4.1: #i58890# applied iz58890_3.diff
2006-07-05 21:32:13 +00:00
Kurt Zenker
2e0611f013 INTEGRATION: CWS ause058 (1.173.4); FILE MERGED
2006/06/26 12:31:01 hjs 1.173.4.7: RESYNC: (1.173-1.174); FILE MERGED
2006/06/16 11:38:08 hjs 1.173.4.6: #i58351# more bash
2006/06/14 11:15:14 hjs 1.173.4.5: #i58351# applied relevant parts of the patch to support bash
2006/06/14 08:26:58 hjs 1.173.4.4: #i66210# remove autoupdate of local (hamburg) environments. more problems than benefit...
2006/06/13 16:21:19 hjs 1.173.4.3: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006/06/12 16:29:21 hjs 1.173.4.2: #i65725# romoving move remains of MULTI* targets; #i63235# useless URD stuff removed
2006/06/09 14:34:13 hjs 1.173.4.1: #i65725# first round
2006-07-05 21:10:18 +00:00
Kurt Zenker
9647a33a15 INTEGRATION: CWS ause058 (1.15.328); FILE MERGED
2006/06/22 14:05:05 hjs 1.15.328.1: #i58890# applied iz58890_3.diff
2006-07-05 21:07:20 +00:00
Kurt Zenker
a4eec387e6 INTEGRATION: CWS ause058 (1.17.40); FILE MERGED
2006/06/22 13:17:40 hjs 1.17.40.1: #i58890# applied iz58890_3.diff
2006-07-05 21:06:21 +00:00
Kurt Zenker
b25e76d7cf INTEGRATION: CWS ause058 (1.2.498); FILE MERGED
2006/06/22 13:17:40 hjs 1.2.498.2: #i58890# applied iz58890_3.diff
2006/06/16 11:38:09 hjs 1.2.498.1: #i58351# more bash
2006-07-05 21:06:10 +00:00
Kurt Zenker
3cc872a33b INTEGRATION: CWS ause058 (1.5.156); FILE MERGED
2006/06/26 12:28:16 hjs 1.5.156.3: RESYNC: (1.5-1.6); FILE MERGED
2006/06/23 21:07:47 vq 1.5.156.2: #i66669# Replace |& with $(PIPEERROR).
2006/06/13 16:21:24 hjs 1.5.156.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:06:01 +00:00
Kurt Zenker
9fce5bee37 INTEGRATION: CWS ause058 (1.23.162); FILE MERGED
2006/06/26 12:28:30 hjs 1.23.162.2: RESYNC: (1.23-1.24); FILE MERGED
2006/06/13 16:21:24 hjs 1.23.162.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:05:50 +00:00
Kurt Zenker
ff49c70258 INTEGRATION: CWS ause058 (1.15.162); FILE MERGED
2006/06/26 12:29:42 hjs 1.15.162.2: RESYNC: (1.15-1.16); FILE MERGED
2006/06/13 16:21:24 hjs 1.15.162.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:05:19 +00:00
Kurt Zenker
0658da8d48 INTEGRATION: CWS ause058 (1.12.330); FILE MERGED
2006/06/13 16:21:23 hjs 1.12.330.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:04:47 +00:00
Kurt Zenker
8ddca82533 INTEGRATION: CWS ause058 (1.7.330); FILE MERGED
2006/06/13 16:21:23 hjs 1.7.330.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:04:36 +00:00
Kurt Zenker
ee0bb31dff INTEGRATION: CWS ause058 (1.8.328); FILE MERGED
2006/06/26 12:28:52 hjs 1.8.328.2: RESYNC: (1.8-1.9); FILE MERGED
2006/06/13 16:21:23 hjs 1.8.328.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:04:24 +00:00
Kurt Zenker
b9879c7179 INTEGRATION: CWS ause058 (1.2.96); FILE MERGED
2006/06/13 16:21:23 hjs 1.2.96.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:04:13 +00:00
Kurt Zenker
63205d525a INTEGRATION: CWS ause058 (1.7.60); FILE MERGED
2006/06/13 16:21:22 hjs 1.7.60.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:04:02 +00:00
Kurt Zenker
1c9d898f3c INTEGRATION: CWS ause058 (1.13.154); FILE MERGED
2006/06/26 12:28:08 hjs 1.13.154.2: RESYNC: (1.13-1.14); FILE MERGED
2006/06/13 16:21:22 hjs 1.13.154.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:03:52 +00:00
Kurt Zenker
6ba2bbcfac INTEGRATION: CWS ause058 (1.17.58); FILE MERGED
2006/06/26 12:28:59 hjs 1.17.58.2: RESYNC: (1.17-1.18); FILE MERGED
2006/06/13 16:21:22 hjs 1.17.58.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:03:41 +00:00