Commit graph

351 commits

Author SHA1 Message Date
Rüdiger Timm
9a66756386 INTEGRATION: CWS ooo19126 (1.4.200); FILE MERGED
2005/09/05 15:18:22 rt 1.4.200.1: #i54170# Change license header: remove SISSL
2005-09-07 17:53:03 +00:00
Rüdiger Timm
658597ce0c INTEGRATION: CWS ooo19126 (1.3.14); FILE MERGED
2005/09/05 15:18:21 rt 1.3.14.1: #i54170# Change license header: remove SISSL
2005-09-07 17:52:40 +00:00
Rüdiger Timm
a3ea9ebb72 INTEGRATION: CWS ooo19126 (1.7.46); FILE MERGED
2005/09/05 15:18:21 rt 1.7.46.1: #i54170# Change license header: remove SISSL
2005-09-07 17:52:24 +00:00
Rüdiger Timm
de11b2b84b INTEGRATION: CWS ooo19126 (1.3.14); FILE MERGED
2005/09/05 15:18:20 rt 1.3.14.1: #i54170# Change license header: remove SISSL
2005-09-07 17:52:08 +00:00
Rüdiger Timm
7ec941e784 INTEGRATION: CWS ooo19126 (1.8.14); FILE MERGED
2005/09/05 15:18:20 rt 1.8.14.1: #i54170# Change license header: remove SISSL
2005-09-07 17:51:52 +00:00
Rüdiger Timm
5c22abf2fb INTEGRATION: CWS ooo19126 (1.2.190); FILE MERGED
2005/09/05 15:18:19 rt 1.2.190.1: #i54170# Change license header: remove SISSL
2005-09-07 17:51:38 +00:00
Rüdiger Timm
e29cb82a2e INTEGRATION: CWS ooo19126 (1.14.46); FILE MERGED
2005/09/05 15:18:19 rt 1.14.46.1: #i54170# Change license header: remove SISSL
2005-09-07 17:51:18 +00:00
Rüdiger Timm
206673331f INTEGRATION: CWS ooo19126 (1.7.160); FILE MERGED
2005/09/05 15:18:19 rt 1.7.160.1: #i54170# Change license header: remove SISSL
2005-09-07 17:51:02 +00:00
Rüdiger Timm
6802efcea1 INTEGRATION: CWS ooo19126 (1.4.14); FILE MERGED
2005/09/05 15:18:18 rt 1.4.14.1: #i54170# Change license header: remove SISSL
2005-09-07 17:50:46 +00:00
Rüdiger Timm
1e0c960fd4 INTEGRATION: CWS ooo19126 (1.1.1.1.228); FILE MERGED
2005/09/05 15:18:18 rt 1.1.1.1.228.1: #i54170# Change license header: remove SISSL
2005-09-07 17:50:30 +00:00
Rüdiger Timm
1baa5243eb INTEGRATION: CWS ooo19126 (1.1.188); FILE MERGED
2005/09/05 15:18:17 rt 1.1.188.1: #i54170# Change license header: remove SISSL
2005-09-07 17:50:07 +00:00
Rüdiger Timm
e181d36aea INTEGRATION: CWS ooo19126 (1.1.1.1.228); FILE MERGED
2005/09/05 15:18:17 rt 1.1.1.1.228.1: #i54170# Change license header: remove SISSL
2005-09-07 17:49:54 +00:00
Rüdiger Timm
c738dc59a7 INTEGRATION: CWS ooo19126 (1.2.186); FILE MERGED
2005/09/05 15:18:16 rt 1.2.186.1: #i54170# Change license header: remove SISSL
2005-09-07 17:49:40 +00:00
Rüdiger Timm
a7b2adb522 INTEGRATION: CWS ooo19126 (1.3.186); FILE MERGED
2005/09/05 15:18:16 rt 1.3.186.1: #i54170# Change license header: remove SISSL
2005-09-07 17:49:25 +00:00
Rüdiger Timm
ba560064e2 INTEGRATION: CWS ooo19126 (1.4.14); FILE MERGED
2005/09/05 15:18:15 rt 1.4.14.1: #i54170# Change license header: remove SISSL
2005-09-07 17:49:11 +00:00
Rüdiger Timm
7df1e0c0b7 INTEGRATION: CWS ooo19126 (1.8.92); FILE MERGED
2005/09/05 15:18:15 rt 1.8.92.1: #i54170# Change license header: remove SISSL
2005-09-07 17:48:56 +00:00
Oliver Bolte
6460ca9534 INTEGRATION: CWS sb33 (1.13.178); FILE MERGED
2005/06/15 09:17:48 sb 1.13.178.1: #i50656# Improved the information available to clients about exceptions thrown across the bridge.
2005-07-07 09:56:24 +00:00
Oliver Bolte
c0f4929b30 INTEGRATION: CWS sb33 (1.40.6); FILE MERGED
2005/06/15 09:48:21 sb 1.40.6.1: #i49105# Replaced three-state _state_ with boolean _disposed_, to prevent a potential deadlock.
2005-07-07 09:56:10 +00:00
Oliver Bolte
de702da5e9 INTEGRATION: CWS sb31 (1.1.2); FILE ADDED
2005/04/08 15:33:03 sb 1.1.2.1: #120219# Added Sealed information to JAR file.
2005-06-17 09:03:24 +00:00
Oliver Bolte
ca3a053ded INTEGRATION: CWS sb31 (1.3.30); FILE MERGED
2005/04/07 12:03:30 sb 1.3.30.2: #120220# Load Java UNO components with a class loader that inherits from the UnoClassLoader, and make sure that any (Java classes representing) additional UNO types that a UNO component brings with it are found by the UnoClassLoader (the latter still needs TODO).
2005/03/30 12:44:03 sb 1.3.30.1: #120219# Cleaned up.
2005-06-17 09:03:12 +00:00
Oliver Bolte
6a6e8ab0cf INTEGRATION: CWS sb31 (1.3.154); FILE MERGED
2005/05/26 14:45:25 sb 1.3.154.4: #121932# Adaption for wntmsci10.
2005/04/18 14:20:29 sb 1.3.154.3: #121392# Extended manifest Class-Path so that native libraries can be found.
2005/04/08 15:32:46 sb 1.3.154.2: #120219# Added Sealed information to JAR file.
2005/03/30 12:44:47 sb 1.3.154.1: #120219# Removed dubious JAR file versioning; added Class-Path information to JAR file.
2005-06-17 09:02:58 +00:00
Oliver Bolte
432886f313 INTEGRATION: CWS sb31 (1.11.30); FILE MERGED
2005/03/30 12:43:37 sb 1.11.30.1: #120219# Missing dependency.
2005-06-17 09:02:44 +00:00
Oliver Bolte
a4fa3d0198 INTEGRATION: CWS sb31 (1.6.46); FILE MERGED
2005/03/30 12:45:47 sb 1.6.46.1: #120219# Cleaned up.
2005-06-17 09:02:28 +00:00
Oliver Bolte
e5447054c6 INTEGRATION: CWS sb31 (1.6.46); FILE MERGED
2005/04/27 12:50:04 sb 1.6.46.2: RESYNC: (1.6-1.7); FILE MERGED
2005/03/30 12:45:47 sb 1.6.46.1: #120219# Cleaned up.
2005-06-17 09:02:14 +00:00
Oliver Bolte
51717686df INTEGRATION: CWS sb31 (1.2.210); FILE MERGED
2005/03/30 12:45:47 sb 1.2.210.1: #120219# Cleaned up.
2005-06-17 09:02:02 +00:00
Oliver Bolte
80947b7d82 INTEGRATION: CWS sb31 (1.5.36); FILE MERGED
2005/03/30 12:45:46 sb 1.5.36.1: #120219# Cleaned up.
2005-06-17 09:01:49 +00:00
Oliver Bolte
c5afab4c81 INTEGRATION: CWS sb31 (1.2.144); FILE MERGED
2005/03/30 12:45:46 sb 1.2.144.1: #120219# Cleaned up.
2005-06-17 09:01:34 +00:00
Oliver Bolte
f231b73072 INTEGRATION: CWS sb31 (1.4.46); FILE MERGED
2005/03/30 12:45:46 sb 1.4.46.1: #120219# Cleaned up.
2005-06-17 09:01:19 +00:00
Oliver Bolte
e00c1ab568 INTEGRATION: CWS sb31 (1.2.154); FILE MERGED
2005/03/30 12:45:45 sb 1.2.154.1: #120219# Cleaned up.
2005-06-17 09:01:00 +00:00
Oliver Bolte
1f372e0a64 INTEGRATION: CWS sb31 (1.3.170); FILE MERGED
2005/03/30 12:45:45 sb 1.3.170.1: #120219# Cleaned up.
2005-06-17 09:00:48 +00:00
Oliver Bolte
89ee837795 INTEGRATION: CWS sb31 (1.2.154); FILE MERGED
2005/03/30 12:45:44 sb 1.2.154.1: #120219# Cleaned up.
2005-06-17 09:00:36 +00:00
Oliver Bolte
9356d4c599 INTEGRATION: CWS sb31 (1.2.210); FILE MERGED
2005/03/30 12:45:44 sb 1.2.210.1: #120219# Cleaned up.
2005-06-17 09:00:22 +00:00
Oliver Bolte
b612ee267b INTEGRATION: CWS sb31 (1.2.210); FILE MERGED
2005/03/30 12:45:43 sb 1.2.210.1: #120219# Cleaned up.
2005-06-17 08:58:16 +00:00
Oliver Bolte
5477fd2dce INTEGRATION: CWS sb31 (1.7.30); FILE MERGED
2005/04/21 13:37:31 sb 1.7.30.2: #120220# Adapted to reworked unoloader.jar.
2005/04/07 12:03:29 sb 1.7.30.1: #120220# Load Java UNO components with a class loader that inherits from the UnoClassLoader, and make sure that any (Java classes representing) additional UNO types that a UNO component brings with it are found by the UnoClassLoader (the latter still needs TODO).
2005-06-17 08:58:03 +00:00
Oliver Bolte
f2eb9faff7 INTEGRATION: CWS sb31 (1.3.170); FILE MERGED
2005/03/30 12:45:43 sb 1.3.170.1: #120219# Cleaned up.
2005-06-17 08:57:49 +00:00
Oliver Bolte
955b5ba662 INTEGRATION: CWS sb31 (1.3.210); FILE MERGED
2005/03/30 12:45:43 sb 1.3.210.1: #120219# Cleaned up.
2005-06-17 08:57:30 +00:00
Kurt Zenker
e59f0e7fc3 INTEGRATION: CWS readonlydoc1 (1.39.20); FILE MERGED
2005/05/12 14:19:43 sb 1.39.20.1: #i49149# Make sure that the java_remote_bridge is disposed whenever its MessageDispatcher thread terminates, even due to a thrown Error.
2005-05-18 09:55:21 +00:00
Oliver Bolte
e5f90521eb INTEGRATION: CWS fwkfinal8 (1.4.48); FILE MERGED
2005/04/05 14:31:39 jl 1.4.48.1: #i46616# Before a JNI exception is thrown we make sure that ExceptionClear is called
2005-04-18 11:16:20 +00:00
Vladimir Glazounov
68957d8837 INTEGRATION: CWS fwkfinal2 (1.6.20); FILE MERGED
2005/03/14 15:04:03 abi 1.6.20.1: #i44810#
2005-03-23 15:19:51 +00:00
Vladimir Glazounov
14b8739d23 INTEGRATION: CWS fwkfinal2 (1.1.2); FILE ADDED
2005/03/14 15:04:03 abi 1.1.2.1: #i44810#
2005-03-23 15:19:35 +00:00
Vladimir Glazounov
8149b43e68 INTEGRATION: CWS fwkfinal2 (1.7.2); FILE MERGED
2005/03/14 15:04:02 abi 1.7.2.1: #i44810#
2005-03-23 15:19:22 +00:00
Vladimir Glazounov
0f9447c9f2 INTEGRATION: CWS sb29 (1.6.2); FILE MERGED
2005/02/07 15:25:25 sb 1.6.2.1: #i42146# Make sure source compiles on Java 1.3.
2005-02-21 11:16:04 +00:00
Rüdiger Timm
d8f960012e INTEGRATION: CWS sdksample (1.2.114); FILE MERGED
2004/08/02 13:24:37 sb 1.2.114.1: #i29308# Work around encoding inconsistencies between java.net.URL and java.net.URI.
2005-01-31 14:52:06 +00:00
Rüdiger Timm
53fbcab0ee INTEGRATION: CWS sdksample (1.5.114); FILE MERGED
2004/08/02 13:24:36 sb 1.5.114.1: #i29308# Work around encoding inconsistencies between java.net.URL and java.net.URI.
2005-01-31 14:51:51 +00:00
Kurt Zenker
a0d7e784d8 INTEGRATION: CWS sb28 (1.12.18); FILE MERGED
2005/01/05 15:58:23 sb 1.12.18.1: #108675# Removed race between JavaThreadPoolFactory.add/removeJobQueue and JavaThreadPoolFactory.dispose; cleaned up JavaThreadPoolFactory class.
2005-01-18 12:36:20 +00:00
Kurt Zenker
b3dee8e776 INTEGRATION: CWS sb28 (1.4.18); FILE MERGED
2005/01/05 15:58:22 sb 1.4.18.1: #108675# Removed race between JavaThreadPoolFactory.add/removeJobQueue and JavaThreadPoolFactory.dispose; cleaned up JavaThreadPoolFactory class.
2005-01-18 12:36:06 +00:00
Jens-Heiner Rechtien
4f3306de77 INTEGRATION: CWS beansplit (1.4.34); FILE MERGED
2004/11/02 15:44:40 mi 1.4.34.2: loads msvcr71 too
2004/10/19 10:52:57 mi 1.4.34.1: catch exception on loading shared lib multiple times
2004-11-09 10:18:17 +00:00
Pascal Junck
2711233345 INTEGRATION: CWS sb22 (1.3.168); FILE MERGED
2004/10/14 10:54:48 sb 1.3.168.2: #i33217# Changed @since tags for C++/Java docu from OOo to UDK.
2004/09/28 14:45:10 sb 1.3.168.1: #i33217# Fixed @since tags.
2004-11-03 08:06:05 +00:00
Pascal Junck
e41b9918a3 INTEGRATION: CWS sb22 (1.2.170); FILE MERGED
2004/10/14 10:54:48 sb 1.2.170.2: #i33217# Changed @since tags for C++/Java docu from OOo to UDK.
2004/09/28 14:45:10 sb 1.2.170.1: #i33217# Fixed @since tags.
2004-11-03 08:05:50 +00:00
Pascal Junck
8301dabe36 INTEGRATION: CWS sb22 (1.2.170); FILE MERGED
2004/10/14 10:54:48 sb 1.2.170.2: #i33217# Changed @since tags for C++/Java docu from OOo to UDK.
2004/09/28 14:45:09 sb 1.2.170.1: #i33217# Fixed @since tags.
2004-11-03 08:05:37 +00:00