Commit graph

42 commits

Author SHA1 Message Date
Rüdiger Timm
ef995fcd2f INTEGRATION: CWS ooo19126 (1.5.8); FILE MERGED
2005/09/05 14:40:56 rt 1.5.8.1: #i54170# Change license header: remove SISSL
2005-09-07 18:22:30 +00:00
Rüdiger Timm
b05deb3204 INTEGRATION: CWS ooo19126 (1.3.4); FILE MERGED
2005/09/05 14:40:56 rt 1.3.4.1: #i54170# Change license header: remove SISSL
2005-09-07 18:22:16 +00:00
Oliver Bolte
46d2f46236 INTEGRATION: CWS sb33 (1.5.2); FILE MERGED
2005/06/29 13:54:09 sb 1.5.2.1: #i51091# Changed occurences of jobject in the jvmaccess API to void* to avoid different mangled C++ names for different JDKs.
2005-07-07 09:54:43 +00:00
Oliver Bolte
f8d27321d0 INTEGRATION: CWS sb33 (1.7.2); FILE MERGED
2005/06/29 13:54:08 sb 1.7.2.1: #i51091# Changed occurences of jobject in the jvmaccess API to void* to avoid different mangled C++ names for different JDKs.
2005-07-07 09:54:08 +00:00
Oliver Bolte
0cbb9ec2a1 INTEGRATION: CWS sb33 (1.2.2); FILE MERGED
2005/06/29 13:54:08 sb 1.2.2.1: #i51091# Changed occurences of jobject in the jvmaccess API to void* to avoid different mangled C++ names for different JDKs.
2005-07-07 09:53:52 +00:00
Oliver Bolte
3d51aebabb INTEGRATION: CWS sb33 (1.2.2); FILE MERGED
2005/06/29 13:54:07 sb 1.2.2.1: #i51091# Changed occurences of jobject in the jvmaccess API to void* to avoid different mangled C++ names for different JDKs.
2005-07-07 09:53:35 +00:00
Oliver Bolte
cde461fdbc INTEGRATION: CWS sb31 (1.4.10); FILE MERGED
2005/05/23 09:12:03 sb 1.4.10.1: #120220# Added an encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader.
2005-06-17 08:21:57 +00:00
Oliver Bolte
cb0847ce15 INTEGRATION: CWS sb31 (1.6.4); FILE MERGED
2005/05/23 09:08:55 sb 1.6.4.2: #121931# Removed dtor symbols that need not be exported; cleaned up.
2005/05/04 15:18:09 sb 1.6.4.1: #120220# Added an encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader.
2005-06-17 08:21:28 +00:00
Oliver Bolte
5c155dafef INTEGRATION: CWS sb31 (1.1.2); FILE ADDED
2005/04/07 13:48:49 sb 1.1.2.2: #120220# Fixed copyright statement.
2005/04/07 12:17:07 sb 1.1.2.1: #120220# Added an encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader.
2005-06-17 08:21:14 +00:00
Oliver Bolte
1c42e58b75 INTEGRATION: CWS sb31 (1.7.4); FILE MERGED
2005/04/07 12:17:45 sb 1.7.4.1: #120220# Added an encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader.
2005-06-17 08:21:01 +00:00
Oliver Bolte
76a187ac57 INTEGRATION: CWS sb31 (1.5.4); FILE MERGED
2005/04/07 12:19:52 sb 1.5.4.1: #120220# Added an encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader.
2005-06-17 08:20:47 +00:00
Oliver Bolte
558fda1073 INTEGRATION: CWS sb31 (1.4.4); FILE MERGED
2005/04/07 12:15:45 sb 1.4.4.1: #120220# Cleanup.
2005-06-17 08:20:34 +00:00
Oliver Bolte
51cec09872 INTEGRATION: CWS sb31 (1.1.2); FILE ADDED
2005/04/07 13:48:49 sb 1.1.2.2: #120220# Fixed copyright statement.
2005/04/07 12:16:31 sb 1.1.2.1: #120220# Added an encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader.
2005-06-17 08:20:20 +00:00
Oliver Bolte
81b2b22d15 INTEGRATION: CWS buildfixes01 (1.4.6); FILE MERGED
2005/06/07 13:42:55 thb 1.4.6.1: #i50426# Corrected license header
2005-06-15 09:25:58 +00:00
Jens-Heiner Rechtien
84a306efa7 INTEGRATION: CWS nojava1 (1.4.36); FILE MERGED
2004/09/24 14:35:35 haggai 1.4.36.3: RESYNC: (1.4-1.5); FILE MERGED
2004/08/16 15:20:49 cmc 1.4.36.2: #i33045# use normal -DSOLAR_JAVA
2004/08/16 14:21:42 cmc 1.4.36.1: #i33045# build jvmaccess even without java, just default to failure on javarelated stuff
2004-11-09 10:50:21 +00:00
Jens-Heiner Rechtien
0251d5366e INTEGRATION: CWS nojava1 (1.3.42); FILE MERGED
2004/08/16 15:20:48 cmc 1.3.42.2: #i33045# use normal -DSOLAR_JAVA
2004/08/16 14:21:41 cmc 1.3.42.1: #i33045# build jvmaccess even without java, just default to failure on javarelated stuff
2004-11-09 10:50:10 +00:00
Jens-Heiner Rechtien
4ff64a3236 INTEGRATION: CWS nojava1 (1.5.28); FILE MERGED
2004/09/24 14:34:58 haggai 1.5.28.3: RESYNC: (1.5-1.6); FILE MERGED
2004/08/16 15:20:48 cmc 1.5.28.2: #i33045# use normal -DSOLAR_JAVA
2004/08/16 14:21:41 cmc 1.5.28.1: #i33045# build jvmaccess even without java, just default to failure on javarelated stuff
2004-11-09 10:49:59 +00:00
Jens-Heiner Rechtien
b3bad513d7 INTEGRATION: CWS nojava1 (1.3.26); FILE MERGED
2004/08/16 15:20:47 cmc 1.3.26.2: #i33045# use normal -DSOLAR_JAVA
2004/08/16 14:21:40 cmc 1.3.26.1: #i33045# build jvmaccess even without java, just default to failure on javarelated stuff
2004-11-09 10:49:46 +00:00
Pascal Junck
4e31e94fa3 INTEGRATION: CWS sb22 (1.5.6); FILE MERGED
2004/09/20 13:48:10 sb 1.5.6.1: #109743# Cleaned up.
2004-11-03 07:39:57 +00:00
Pascal Junck
9c2b978312 INTEGRATION: CWS sb22 (1.4.6); FILE MERGED
2004/10/22 07:32:54 sb 1.4.6.1: #i20747# Drop minor.micro from names of Unix UNO dynamic libraries; add uno_ prefix to names of Unix core UNO dynamic libraries.
2004-11-03 07:39:40 +00:00
Jens-Heiner Rechtien
5988d5eb82 INTEGRATION: CWS ooo20040815 (1.4.34); FILE MERGED
2004/08/01 11:04:46 sparcmoz 1.4.34.1: #i32394# add map for linux sparc
2004-09-09 10:19:44 +00:00
Rüdiger Timm
dc2f035bdb INTEGRATION: CWS sb20 (1.1.98); FILE MERGED
2004/06/14 13:45:18 sb 1.1.98.1: #i29119# sandbox.jar no longer needed by UNO.
2004-07-23 14:11:06 +00:00
Jens-Heiner Rechtien
507a9e9731 INTEGRATION: CWS jl8 (1.3.68); FILE MERGED
2004/06/14 09:46:32 jl 1.3.68.1: #i29389# remove javainfo.hxx + implementation
2004-07-23 11:05:12 +00:00
Jens-Heiner Rechtien
57641d1010 INTEGRATION: CWS jl8 (1.4.68); FILE MERGED
2004/06/14 09:46:31 jl 1.4.68.1: #i29389# remove javainfo.hxx + implementation
2004-07-23 11:04:40 +00:00
Jens-Heiner Rechtien
b49e5f0d3b INTEGRATION: CWS jl8 (1.5.22); FILE MERGED
2004/06/14 09:46:27 jl 1.5.22.1: #i29389# remove javainfo.hxx + implementation
2004-07-23 11:03:29 +00:00
Jens-Heiner Rechtien
7a139160c7 INTEGRATION: CWS jl8 (1.3.60); FILE MERGED
2004/06/15 10:19:13 jl 1.3.60.1: #i29389#
2004-07-23 11:02:31 +00:00
Kurt Zenker
ac53b50277 INTEGRATION: CWS jl3 (1.2.54); FILE MERGED
2004/02/17 11:45:56 jl 1.2.54.1: #i22146# clarified documentation
2004-03-25 13:50:27 +00:00
Vladimir Glazounov
ed42bda093 INTEGRATION: CWS geordi2q11 (1.3.32); FILE MERGED
2003/12/16 12:49:52 hr 1.3.32.1: #111934#: join CWS ooo111fix1
2003-12-17 12:39:34 +00:00
Vladimir Glazounov
36843d67ae INTEGRATION: CWS geordi2q11 (1.4.42); FILE MERGED
2003/12/16 12:49:47 hr 1.4.42.1: #111934#: join CWS ooo111fix1
2003-12-17 12:38:51 +00:00
Oliver Bolte
c8f7dcada4 INTEGRATION: CWS geordi2q04 (1.2.32); FILE MERGED
2003/09/02 07:59:08 rt 1.2.32.1: #111934#: Join CWS geordiregression04.
2003-09-04 10:40:56 +00:00
Jens-Heiner Rechtien
0c608accda INTEGRATION: CWS ooo11rc2 (1.2.20); FILE MERGED
2003/07/14 14:10:38 fa 1.2.20.1: Make sure OS X dylibs are delivered.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16614

Dan
fa@ooo
2003-07-16 16:25:25 +00:00
Vladimir Glazounov
44c59de8a8 INTEGRATION: CWS mh11rc (1.2.14); FILE MERGED
2003/06/06 09:48:38 mh 1.2.14.1: join: from beta2
2003-06-12 08:50:08 +00:00
Vladimir Glazounov
1af23edcdd INTEGRATION: CWS uno4 (1.2.10); FILE MERGED
2003/05/16 06:25:01 jl 1.2.10.1: *** empty log message ***
2003-05-22 08:43:17 +00:00
Vladimir Glazounov
834d3c44a3 INTEGRATION: CWS uno4 (1.2.10); FILE MERGED
2003/05/19 07:44:09 sb 1.2.10.1: #i14282# Added symbols for UnsupportedException.
2003-05-22 08:42:55 +00:00
Vladimir Glazounov
3786e2881a INTEGRATION: CWS uno4 (1.3.10); FILE MERGED
2003/05/19 07:44:08 sb 1.3.10.1: #i14282# Added symbols for UnsupportedException.
2003-05-22 08:42:10 +00:00
Jens-Heiner Rechtien
4f848dc771 INTEGRATION: CWS ooo20030412 (1.3.2); FILE MERGED
2003/04/14 16:34:48 mh 1.3.2.1: chg: missing dependency
2003-04-28 15:17:55 +00:00
Oliver Bolte
9e0b38df8c #100000# depends on offuh 2003-04-25 07:35:08 +00:00
Vladimir Glazounov
74016316ff #100000# type generation 2003-04-07 09:23:33 +00:00
Jens-Heiner Rechtien
44bf5dacd7 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-26 11:41:32 +00:00
Stephan Bergmann
ed88c618f5 #105077# Adapted to build.lst's strange syntax rules. 2002-12-09 14:32:13 +00:00
Stephan Bergmann
21a10ee6a5 #105077# Differently mangled names for JDK13 and JDK14. 2002-12-09 14:24:42 +00:00
Stephan Bergmann
a6ce240fcc #105077# 2002-12-06 10:35:41 +00:00