Commit graph

10387 commits

Author SHA1 Message Date
Rüdiger Timm
bb8304c176 INTEGRATION: CWS ause091 (1.101.14); FILE MERGED
2008/07/28 16:13:59 hjs 1.101.14.2: #i92204# - different tmp dirs for pro and nonpro
2008/07/23 14:23:08 hjs 1.101.14.1: #i92044# - do not relay on intermediate files
2008-07-30 11:47:36 +00:00
Rüdiger Timm
4acbd9b1d0 INTEGRATION: CWS ause091 (1.87.14); FILE MERGED
2008/07/29 10:05:23 hjs 1.87.14.1: #i92140# fix condition; reset variable
2008-07-30 11:47:22 +00:00
Rüdiger Timm
950114ca3f INTEGRATION: CWS ause091 (1.45.14); FILE MERGED
2008/07/23 14:24:08 hjs 1.45.14.1: #i92044# - do not relay on intermediate files
2008-07-30 11:47:03 +00:00
Rüdiger Timm
00754ffbe7 INTEGRATION: CWS ause091 (1.1.2); FILE ADDED
2008/07/24 16:07:55 hjs 1.1.2.1: #i92050# - create *minor.mk in a mp safe way
2008-07-30 11:46:51 +00:00
Rüdiger Timm
516a1896e1 INTEGRATION: CWS sb92 (1.40.22); FILE MERGED
2008/07/23 11:14:18 sb 1.40.22.1: on unxsoli4, /usr/local/lib can pick up a system libxml2.so.2 that is not compatible with the OOo libxslt.so.1 (and according to hjs, /usr/local/lib is not needed at all here)
2008-07-30 11:41:44 +00:00
Kurt Zenker
cdf71f09ae #i87518# patch fix --enable-reportdesign 2008-07-29 13:56:32 +00:00
Mathias Bauer
efaa520b16 #i92212#: new profile names 2008-07-28 10:43:11 +00:00
Oliver Bolte
cee47d2751 DEV300 2008-07-26 05:40:44 +00:00
Oliver Bolte
07553af076 INTEGRATION: CWS localisation29 (1.46.84); FILE MERGED
2008/07/14 16:50:25 vg 1.46.84.2: #i52975#,#i87989#,#i87994#,#i85486#,#i81177#,#i56024#,#i85700#,#i90333#,#i87976#,#i91388#,#i91317#,#i61734#,#i87984#,#i80503#,#i89100#,#i87993#,#i87982#,#i91030#,#i91228#,#i76701#,#i90330#,#i85699#,#i87995#,#i88000#,#i81671#,#i79805#,#i85655#,#i87980#,#i77223#,#i91096#,#i91176#,#i87990#,#i87973#,#i89705#,#i85704#,#i90375#,#i91095#,#i91219#,#i64726#,#i85145#,#i90303#,#i91363#,#i82089#,#i90331#,#i87983#,#i87986#,#i85695#,#i85651#,#i83821#,#i81419#,#i90327#,#158183#,#i91418#,#i80812#,#i85703#,#i91302#,#i91221#,#i76172#,#i87988#,#i87760#,#i91085#,#i87981#,#i85694#,#i84900#,#i91381#,#i89617#,#i80523#,#i62571#,#i85652#,#i62701#,#i91257#,#i91040#,#i91029#,#i91256#,#i91222#,#i91356#,#i91261#,#i87997#,#i88441#,#i91341#,#i87203#,#i89014#,#i87996#,#i85653#,#i88444#,#i91354#,#i91413#,#i90223#,#i82093# localisation for OOo 3.0 final
2008/07/14 10:57:16 vg 1.46.84.1: #i52975#,#i87989#,#i87994#,#i85486#,#i81177#,#i56024#,#i85700#,#i90333#,#i87976#,#i91388#,#i91317#,#i61734#,#i87984#,#i80503#,#i89100#,#i87993#,#i87982#,#i91030#,#i91228#,#i76701#,#i90330#,#i85699#,#i87995#,#i88000#,#i81671#,#i79805#,#i85655#,#i87980#,#i77223#,#i91096#,#i91176#,#i87990#,#i87973#,#i89705#,#i85704#,#i90375#,#i91095#,#i91219#,#i64726#,#i85145#,#i90303#,#i91363#,#i82089#,#i90331#,#i87983#,#i87986#,#i85695#,#i85651#,#i83821#,#i81419#,#i90327#,#158183#,#i91418#,#i80812#,#i85703#,#i91302#,#i91221#,#i76172#,#i87988#,#i87760#,#i91085#,#i87981#,#i85694#,#i84900#,#i91381#,#i89617#,#i80523#,#i62571#,#i85652#,#i62701#,#i91257#,#i91040#,#i91029#,#i91256#,#i91222#,#i91356#,#i91261#,#i87997#,#i88441#,#i91341#,#i87203#,#i89014#,#i87996#,#i85653#,#i88444#,#i91354#,#i91413#,#i90223#,#i82093# localisation for OOo 3.0 final
2008-07-25 17:48:15 +00:00
Oliver Bolte
66cc159985 INTEGRATION: CWS socs17 (1.64.18); FILE MERGED
2008/07/22 13:58:46 tkr 1.64.18.1: #158228# license text added
2008-07-25 10:52:08 +00:00
Oliver Bolte
9802ee93a6 INTEGRATION: CWS socs17 (1.114.32); FILE MERGED
2008/07/22 13:58:46 tkr 1.114.32.1: #158228# license text added
2008-07-25 10:50:36 +00:00
Oliver Bolte
e75909eeb5 INTEGRATION: CWS cmcfixes46 (1.267.2); FILE MERGED
2008/07/14 08:32:11 cmc 1.267.2.3: RESYNC: (1.269-1.275); FILE MERGED
2008/06/03 10:13:53 cmc 1.267.2.2: RESYNC: (1.267-1.269); FILE MERGED
2008/05/26 10:17:05 cmc 1.267.2.1: #i89956# support icu 4.0
2008-07-25 10:20:14 +00:00
Oliver Bolte
926234f45d INTEGRATION: CWS cmcfixes46 (1.234.2); FILE MERGED
2008/07/14 08:31:51 cmc 1.234.2.4: RESYNC: (1.236-1.242); FILE MERGED
2008/06/03 11:01:12 cmc 1.234.2.3: update configure
2008/06/03 10:13:16 cmc 1.234.2.2: RESYNC: (1.234-1.236); FILE MERGED
2008/05/26 10:17:00 cmc 1.234.2.1: #i89956# support icu 4.0
2008-07-25 10:19:28 +00:00
Oliver Bolte
a960193e7c INTEGRATION: CWS cmcfixes46 (1.133.28); FILE MERGED
2008/07/14 08:29:56 cmc 1.133.28.2: RESYNC: (1.133-1.136); FILE MERGED
2008/06/03 09:26:48 cmc 1.133.28.1: #i83545# lets try this fix
2008-07-25 10:12:43 +00:00
Oliver Bolte
7201598085 INTEGRATION: CWS aqua11y02 (1.66.60); FILE MERGED
2008/07/11 09:02:52 obr 1.66.60.3: RESYNC: (1.69-1.73); FILE MERGED
2008/06/18 18:04:55 fne 1.66.60.2: RESYNC: (1.66-1.69); FILE MERGED
2008/06/11 13:49:40 obr 1.66.60.1: raised baseline for Java UNO AccessBridge to Java 1.5
2008-07-25 08:12:58 +00:00
Oliver Bolte
3603000f19 INTEGRATION: CWS jl108 (1.11.8); FILE MERGED
2008/07/23 11:16:01 jl 1.11.8.1: #i91982# define _MSC for builds with microsoft compiler
2008-07-25 05:36:51 +00:00
Oliver Bolte
d954ed3c35 INTEGRATION: CWS jl108 (1.75.10); FILE MERGED
2008/07/23 11:16:01 jl 1.75.10.2: #i91982# define _MSC for builds with microsoft compiler
2008/07/23 09:16:45 jl 1.75.10.1: #i91982# define MSC for builds with microsoft compiler
2008-07-25 05:35:57 +00:00
Oliver Bolte
d57e2620a9 INTEGRATION: CWS jl108 (1.302.6); FILE MERGED
2008/07/23 11:16:01 jl 1.302.6.1: #i91982# define _MSC for builds with microsoft compiler
2008-07-25 05:35:37 +00:00
Oliver Bolte
5b7e1121ee DEV300 2008-07-22 18:04:15 +00:00
Oliver Bolte
4e4c1235c8 INTEGRATION: CWS os2port03 (1.168.4.1.2); FILE MERGED
2008/07/18 12:51:43 obr 1.168.4.1.2.3: resync to DEV300:m24
2008/07/17 05:20:12 obr 1.168.4.1.2.2: RESYNC: (1.168.4.1-1.193); FILE MERGED
2008/04/15 10:06:40 ydario 1.168.4.1.2.1: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008-07-22 16:41:57 +00:00
Oliver Bolte
c45f31320d INTEGRATION: CWS os2port03 (1.227.4); FILE MERGED
2008/07/17 05:20:06 obr 1.227.4.4: RESYNC: (1.237.4.5-1.275); FILE MERGED
2008/02/08 08:50:57 obr 1.227.4.3: RESYNC: (1.237.4.1-1.237.4.5); FILE MERGED
2008/01/15 14:35:07 obr 1.227.4.2: RESYNC: (1.227-1.237.4.1); FILE MERGED
2008/01/14 16:17:59 ydario 1.227.4.1: os2 specific configuration
Issue number:i85203
Submitted by:ydario
2008-07-22 16:41:43 +00:00
Oliver Bolte
2ed59dbaa8 INTEGRATION: CWS os2port03 (1.1.2); FILE ADDED
2008/01/14 16:17:59 ydario 1.1.2.1: os2 specific configuration
Issue number:i85203
Submitted by:ydario
2008-07-22 16:41:27 +00:00
Oliver Bolte
ad3a7960dc INTEGRATION: CWS os2port03 (1.211.4.1.2); FILE MERGED
2008/07/17 05:19:44 obr 1.211.4.1.2.4: RESYNC: (1.211.4.5-1.242); FILE MERGED
2008/02/08 10:28:19 obr 1.211.4.1.2.3: updated configure
2008/02/08 08:50:47 obr 1.211.4.1.2.2: RESYNC: (1.211.4.1-1.211.4.5); FILE MERGED
2008/01/15 21:06:51 obr 1.211.4.1.2.1: #i85203# regenerated configure from configure.in
2008-07-22 16:41:16 +00:00
Oliver Bolte
30b19b875b INTEGRATION: CWS os2port03 (1.11.12); FILE MERGED
2008/07/16 12:39:23 obr 1.11.12.2: RESYNC: (1.11-1.12); FILE MERGED
2008/01/14 16:37:54 ydario 1.11.12.1: use OS2 instead of __EMX__
Issue number:i85203
Submitted by:ydario
2008-07-22 16:24:34 +00:00
Oliver Bolte
25eb38b8fa INTEGRATION: CWS os2port03 (1.10.12); FILE MERGED
2008/07/16 12:39:20 obr 1.10.12.2: RESYNC: (1.10-1.12); FILE MERGED
2008/04/15 14:38:20 ydario 1.10.12.1: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008-07-22 16:24:20 +00:00
Oliver Bolte
dd16b80a2d INTEGRATION: CWS os2port03 (1.40.4); FILE MERGED
2008/07/16 12:24:18 obr 1.40.4.3: RESYNC: (1.41-1.44); FILE MERGED
2008/01/15 13:52:45 obr 1.40.4.2: RESYNC: (1.40-1.41); FILE MERGED
2008/01/14 16:41:05 ydario 1.40.4.1: add os2 build.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:55:24 +00:00
Oliver Bolte
0ac2dfe4da INTEGRATION: CWS os2port03 (1.37.20); FILE MERGED
2008/07/18 12:35:00 obr 1.37.20.2: resync to DEV300:m24
2008/01/14 16:41:05 ydario 1.37.20.1: add os2 build.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:55:11 +00:00
Oliver Bolte
6877f31298 INTEGRATION: CWS os2port03 (1.7.630); FILE MERGED
2008/07/16 12:20:22 obr 1.7.630.2: RESYNC: (1.7-1.8); FILE MERGED
2008/01/14 17:25:27 ydario 1.7.630.1: define version also for os2.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:47 +00:00
Oliver Bolte
e49c312cb0 INTEGRATION: CWS os2port03 (1.1.2); FILE ADDED
2008/01/15 08:49:56 ydario 1.1.2.1: os2 startup macros.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:34 +00:00
Oliver Bolte
9b4c9a44af INTEGRATION: CWS os2port03 (1.54.62); FILE MERGED
2008/07/16 12:20:19 obr 1.54.62.3: RESYNC: (1.55-1.57); FILE MERGED
2008/01/15 13:52:27 obr 1.54.62.2: RESYNC: (1.54-1.55); FILE MERGED
2008/01/15 09:36:36 ydario 1.54.62.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:23 +00:00
Oliver Bolte
11cab37e55 INTEGRATION: CWS os2port03 (1.36.46); FILE MERGED
2008/07/16 12:20:16 obr 1.36.46.4: RESYNC: (1.37-1.41); FILE MERGED
2008/04/15 14:38:00 ydario 1.36.46.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:52:24 obr 1.36.46.2: RESYNC: (1.36-1.37); FILE MERGED
2008/01/15 09:36:36 ydario 1.36.46.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:10 +00:00
Oliver Bolte
2b2eb9efe3 INTEGRATION: CWS os2port03 (1.13.334); FILE MERGED
2008/07/16 12:20:12 obr 1.13.334.2: RESYNC: (1.13-1.14); FILE MERGED
2008/01/15 09:36:36 ydario 1.13.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:57 +00:00
Oliver Bolte
a166edea5f INTEGRATION: CWS os2port03 (1.115.10); FILE MERGED
2008/07/16 12:20:09 obr 1.115.10.5: RESYNC: (1.118-1.126); FILE MERGED
2008/04/15 14:38:00 ydario 1.115.10.4: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/16 07:35:30 ydario 1.115.10.3: Remove empty line (added by mistake) in WNT build.
Issue number:i85203
Submitted by:ydario
2008/01/15 13:52:21 obr 1.115.10.2: RESYNC: (1.115-1.118); FILE MERGED
2008/01/15 09:36:36 ydario 1.115.10.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:45 +00:00
Oliver Bolte
2e639c4b68 INTEGRATION: CWS os2port03 (1.14.334); FILE MERGED
2008/07/16 12:20:06 obr 1.14.334.2: RESYNC: (1.14-1.15); FILE MERGED
2008/01/15 09:36:36 ydario 1.14.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:31 +00:00
Oliver Bolte
f3aed6d944 INTEGRATION: CWS os2port03 (1.22.334); FILE MERGED
2008/07/16 12:20:03 obr 1.22.334.2: RESYNC: (1.22-1.23); FILE MERGED
2008/01/15 09:36:36 ydario 1.22.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:17 +00:00
Oliver Bolte
646d086974 INTEGRATION: CWS os2port03 (1.43.6); FILE MERGED
2008/07/16 12:20:00 obr 1.43.6.4: RESYNC: (1.44-1.48); FILE MERGED
2008/04/15 14:38:00 ydario 1.43.6.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:52:18 obr 1.43.6.2: RESYNC: (1.43-1.44); FILE MERGED
2008/01/15 09:36:36 ydario 1.43.6.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:04 +00:00
Oliver Bolte
6af0deee9a INTEGRATION: CWS os2port03 (1.68.10); FILE MERGED
2008/07/16 12:19:56 obr 1.68.10.3: RESYNC: (1.69-1.74); FILE MERGED
2008/01/15 13:52:15 obr 1.68.10.2: RESYNC: (1.68-1.69); FILE MERGED
2008/01/15 09:36:36 ydario 1.68.10.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:51 +00:00
Oliver Bolte
2d5aef0dd6 INTEGRATION: CWS os2port03 (1.201.46); FILE MERGED
2008/07/16 12:19:53 obr 1.201.46.3: RESYNC: (1.202-1.209); FILE MERGED
2008/01/15 13:52:12 obr 1.201.46.2: RESYNC: (1.201-1.202); FILE MERGED
2008/01/15 09:36:36 ydario 1.201.46.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:38 +00:00
Oliver Bolte
cca46caf65 INTEGRATION: CWS os2port03 (1.10.218); FILE MERGED
2008/07/16 12:19:50 obr 1.10.218.2: RESYNC: (1.10-1.11); FILE MERGED
2008/01/15 09:36:36 ydario 1.10.218.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:25 +00:00
Oliver Bolte
d4b78cfea9 INTEGRATION: CWS os2port03 (1.220.8); FILE MERGED
2008/07/16 12:19:47 obr 1.220.8.4: RESYNC: (1.224.2.1-1.233); FILE MERGED
2008/02/08 08:15:58 obr 1.220.8.3: RESYNC: (1.224-1.224.2.1); FILE MERGED
2008/01/15 13:52:09 obr 1.220.8.2: RESYNC: (1.220-1.224); FILE MERGED
2008/01/15 09:36:36 ydario 1.220.8.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:12 +00:00
Oliver Bolte
3cece8e0af INTEGRATION: CWS os2port03 (1.91.60.1.4); FILE MERGED
2008/07/16 12:19:44 obr 1.91.60.1.4.2: RESYNC: (1.91.60.1-1.99); FILE MERGED
2008/01/29 15:36:12 ydario 1.91.60.1.4.1: os2 build system fixes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:00 +00:00
Oliver Bolte
5bdf81d461 INTEGRATION: CWS os2port03 (1.48.218); FILE MERGED
2008/07/16 12:19:41 obr 1.48.218.2: RESYNC: (1.48-1.49); FILE MERGED
2008/04/15 14:38:00 ydario 1.48.218.1: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008-07-22 15:49:47 +00:00
Oliver Bolte
c08f526967 INTEGRATION: CWS os2port03 (1.5.2); FILE ADDED
2008/07/18 11:27:40 rt 1.5.2.3: License header updated.
2008/04/15 14:38:00 ydario 1.5.2.2: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2003/08/25 14:46:01 ydario 1.5.2.1: file os2.mk was added on branch cws_src680_os2port03 on 2008-04-15 14:38:00 +0000
2008-07-22 15:49:32 +00:00
Oliver Bolte
e75ddc4836 INTEGRATION: CWS os2port03 (1.123.44); FILE MERGED
2008/07/16 12:19:38 obr 1.123.44.3: RESYNC: (1.123-1.136); FILE MERGED
2008/04/15 14:37:59 ydario 1.123.44.2: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/29 15:36:12 ydario 1.123.44.1: os2 build system fixes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:49:20 +00:00
Oliver Bolte
6e257fbe9a INTEGRATION: CWS os2port03 (1.33.46); FILE MERGED
2008/07/16 12:19:34 obr 1.33.46.4: RESYNC: (1.34-1.36); FILE MERGED
2008/04/15 14:37:59 ydario 1.33.46.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:52:06 obr 1.33.46.2: RESYNC: (1.33-1.34); FILE MERGED
2008/01/15 09:36:37 ydario 1.33.46.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:49:02 +00:00
Oliver Bolte
15c055ddf7 INTEGRATION: CWS os2port03 (1.111.16); FILE MERGED
2008/07/16 12:19:31 obr 1.111.16.5: RESYNC: (1.114-1.122); FILE MERGED
2008/04/15 14:37:59 ydario 1.111.16.4: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/16 07:35:30 ydario 1.111.16.3: Remove empty line (added by mistake) in WNT build.
Issue number:i85203
Submitted by:ydario
2008/01/15 13:52:02 obr 1.111.16.2: RESYNC: (1.111-1.114); FILE MERGED
2008/01/15 09:36:37 ydario 1.111.16.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:48:40 +00:00
Oliver Bolte
e6ab684abd INTEGRATION: CWS os2port03 (1.19.334); FILE MERGED
2008/01/15 09:36:37 ydario 1.19.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:48:00 +00:00
Oliver Bolte
70b5b6e996 INTEGRATION: CWS os2port03 (1.42.6); FILE MERGED
2008/07/16 12:19:26 obr 1.42.6.4: RESYNC: (1.43-1.46); FILE MERGED
2008/04/15 14:37:58 ydario 1.42.6.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:51:59 obr 1.42.6.2: RESYNC: (1.42-1.43); FILE MERGED
2008/01/15 09:36:37 ydario 1.42.6.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:47:41 +00:00
Oliver Bolte
863160c878 INTEGRATION: CWS os2port03 (1.63.10); FILE MERGED
2008/07/16 12:19:22 obr 1.63.10.3: RESYNC: (1.64-1.68); FILE MERGED
2008/01/15 13:51:56 obr 1.63.10.2: RESYNC: (1.63-1.64); FILE MERGED
2008/01/15 09:36:37 ydario 1.63.10.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:47:26 +00:00
Oliver Bolte
6e9fdc5a28 INTEGRATION: CWS os2port03 (1.124.46); FILE MERGED
2008/07/16 12:19:09 obr 1.124.46.2: RESYNC: (1.124-1.129); FILE MERGED
2008/01/29 15:36:12 ydario 1.124.46.1: os2 build system fixes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:47:13 +00:00