Commit graph

7472 commits

Author SHA1 Message Date
Rüdiger Timm
17fcd6712b INTEGRATION: CWS dba23b (1.6.100); FILE MERGED
2007/07/09 18:57:25 fs 1.6.100.1: implInitialize: don't call base class if already handled
2007-07-24 11:10:39 +00:00
Rüdiger Timm
c1bd83edee INTEGRATION: CWS dba23b (1.11.100); FILE MERGED
2007/07/11 11:54:08 fs 1.11.100.2: RESYNC: (1.11-1.12); FILE MERGED
2007/07/08 20:35:13 fs 1.11.100.1: during #i65812#: context details not used
2007-07-24 11:10:26 +00:00
Rüdiger Timm
35311e414f INTEGRATION: CWS dba23b (1.31.88); FILE MERGED
2007/07/11 11:54:04 fs 1.31.88.2: RESYNC: (1.31-1.32); FILE MERGED
2007/06/14 19:46:06 fs 1.31.88.1: #i78459# submitted by mox@openoffice.org: remove dead code related to ancient Mac OS System 9 port
2007-07-24 11:10:12 +00:00
Rüdiger Timm
ef4776458c INTEGRATION: CWS dba23b (1.68.14); FILE MERGED
2007/06/28 09:04:04 fs 1.68.14.1: #i78362# don't register the data source browser as controller for all opened database connections
2007-07-24 11:09:55 +00:00
Rüdiger Timm
2e71587d23 INTEGRATION: CWS dba23b (1.5.282); FILE MERGED
2007/07/08 20:34:47 fs 1.5.282.1: during #i65812#: context details not used
2007-07-24 11:09:40 +00:00
Rüdiger Timm
d6d7b6151d INTEGRATION: CWS dba23b (1.18.88); FILE MERGED
2007/07/11 11:54:01 fs 1.18.88.2: RESYNC: (1.18-1.19); FILE MERGED
2007/06/14 19:46:06 fs 1.18.88.1: #i78459# submitted by mox@openoffice.org: remove dead code related to ancient Mac OS System 9 port
2007-07-24 11:09:26 +00:00
Rüdiger Timm
50fdc70805 INTEGRATION: CWS dba23b (1.6.152); FILE MERGED
2007/07/04 10:33:35 fs 1.6.152.1: #i78733# managing data sources now done by an external process
2007-07-24 11:09:02 +00:00
Rüdiger Timm
a2264948f1 INTEGRATION: CWS dba23b (1.17.88); FILE MERGED
2007/07/04 11:57:16 fs 1.17.88.2: #i10000#
2007/07/04 10:33:35 fs 1.17.88.1: #i78733# managing data sources now done by an external process
2007-07-24 11:08:47 +00:00
Rüdiger Timm
16aa7613d4 INTEGRATION: CWS dba23b (1.43.22); FILE MERGED
2007/07/04 10:33:16 fs 1.43.22.1: #i78733# removed dead string
2007-07-24 11:08:32 +00:00
Rüdiger Timm
877d77abf7 INTEGRATION: CWS dba23b (1.6.282); FILE MERGED
2007/07/04 11:48:28 fs 1.6.282.2: #i10000#
2007/07/04 10:34:29 fs 1.6.282.1: #i78733# managing data sources now done by an external process
2007-07-24 11:08:19 +00:00
Rüdiger Timm
0bd810bfa1 INTEGRATION: CWS dba23b (1.3.282); FILE MERGED
2007/07/04 10:33:16 fs 1.3.282.1: #i78733# removed dead string
2007-07-24 11:08:05 +00:00
Rüdiger Timm
4998a1b782 INTEGRATION: CWS dba23b (1.19.14); FILE MERGED
2007/07/11 11:53:25 fs 1.19.14.3: RESYNC: (1.19-1.20); FILE MERGED
2007/07/04 11:48:28 fs 1.19.14.2: #i10000#
2007/07/04 10:34:29 fs 1.19.14.1: #i78733# managing data sources now done by an external process
2007-07-24 11:07:51 +00:00
Rüdiger Timm
1f0a615efa INTEGRATION: CWS dba23b (1.186.12); FILE MERGED
2007/07/11 11:53:22 fs 1.186.12.4: RESYNC: (1.186-1.189); FILE MERGED
2007/07/08 20:36:18 fs 1.186.12.3: during #i65812#: context details not used
2007/06/28 09:04:03 fs 1.186.12.2: #i78362# don't register the data source browser as controller for all opened database connections
2007/06/11 20:00:38 fs 1.186.12.1: #i76857# allow to disable 'Edit database file' context menu entry by configuration option
2007-07-24 11:07:37 +00:00
Rüdiger Timm
464d62ed55 INTEGRATION: CWS dba23b (1.76.10); FILE MERGED
2007/07/11 20:15:59 fs 1.76.10.3: #i10000#
2007/07/11 11:53:17 fs 1.76.10.2: RESYNC: (1.76-1.78); FILE MERGED
2007/07/08 20:36:15 fs 1.76.10.1: during #i65812#: context details not used
2007-07-24 11:07:21 +00:00
Rüdiger Timm
ef0c14b045 INTEGRATION: CWS dba23b (1.76.12); FILE MERGED
2007/07/11 11:53:14 fs 1.76.12.2: RESYNC: (1.76-1.77); FILE MERGED
2007/06/28 09:04:03 fs 1.76.12.1: #i78362# don't register the data source browser as controller for all opened database connections
2007-07-24 11:07:07 +00:00
Rüdiger Timm
ff0ffec719 INTEGRATION: CWS dba23b (1.17.90); FILE MERGED
2007/07/11 11:53:11 fs 1.17.90.2: RESYNC: (1.17-1.18); FILE MERGED
2007/06/28 09:04:03 fs 1.17.90.1: #i78362# don't register the data source browser as controller for all opened database connections
2007-07-24 11:06:54 +00:00
Rüdiger Timm
f28076a0f2 INTEGRATION: CWS dba23b (1.24.58); FILE MERGED
2007/07/11 11:53:07 fs 1.24.58.2: RESYNC: (1.24-1.26); FILE MERGED
2007/07/09 18:47:37 fs 1.24.58.1: openDialog: only needed parameters
2007-07-24 11:06:39 +00:00
Rüdiger Timm
3e3ba37638 INTEGRATION: CWS dba23b (1.21.12); FILE MERGED
2007/07/08 20:36:31 fs 1.21.12.1: during #i65812#: context details not used
2007-07-24 11:06:24 +00:00
Rüdiger Timm
a831377440 INTEGRATION: CWS dba23b (1.6.102); FILE MERGED
2007/07/07 19:16:38 fs 1.6.102.1: diagnostics
2007-07-24 11:06:10 +00:00
Rüdiger Timm
3d5930fd07 INTEGRATION: CWS dba23b (1.8.102); FILE MERGED
2007/07/07 19:16:38 fs 1.8.102.1: diagnostics
2007-07-24 11:05:57 +00:00
Rüdiger Timm
534bafad8b INTEGRATION: CWS dba23b (1.42.12); FILE MERGED
2007/07/11 11:53:04 fs 1.42.12.2: RESYNC: (1.42-1.43); FILE MERGED
2007/06/21 11:48:46 fs 1.42.12.1: some DBG_UNHANDLED_EXCEPTION
2007-07-24 11:05:15 +00:00
Rüdiger Timm
91c0797487 INTEGRATION: CWS dba23b (1.72.102); FILE MERGED
2007/07/07 19:24:15 fs 1.72.102.1: #i78593# when obtaining the Info property value from the Settings, copy all values which are removeable, and the non-default ones which are removeable
2007-07-24 11:05:01 +00:00
Rüdiger Timm
da9da84a28 INTEGRATION: CWS dba23b (1.12.22); FILE MERGED
2007/06/28 09:02:47 fs 1.12.22.1: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007-07-24 11:04:48 +00:00
Rüdiger Timm
814d7928ef INTEGRATION: CWS dba23b (1.32.20); FILE MERGED
2007/07/07 20:21:50 fs 1.32.20.2: during #i78593#: don't re-create the Settings property bag when it's not necessary
2007/06/28 09:02:47 fs 1.32.20.1: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007-07-24 11:04:32 +00:00
Rüdiger Timm
b42a30bd91 INTEGRATION: CWS dba23b (1.14.66); FILE MERGED
2007/07/07 20:21:09 fs 1.14.66.3: during #i78593#: don't re-create the Settings property bag when it's not necessary
2007/06/28 09:02:47 fs 1.14.66.2: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007/06/12 13:17:53 fs 1.14.66.1: removed declaration of non-existent methods
2007-07-24 11:04:18 +00:00
Rüdiger Timm
100c35bdf0 INTEGRATION: CWS dba23b (1.18.60); FILE MERGED
2007/07/08 19:36:17 fs 1.18.60.4: #i78987# +FormsCheckRequiredFields
2007/07/07 20:21:08 fs 1.18.60.3: during #i78593#: don't re-create the Settings property bag when it's not necessary
2007/07/07 19:25:04 fs 1.18.60.2: #i78593# add MAYBEDEFAULT attribute when adding the defaults to the Settings property bag
2007/06/28 09:02:47 fs 1.18.60.1: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect)
2007-07-24 11:04:04 +00:00
Rüdiger Timm
fb2a8c9866 INTEGRATION: CWS dba23b (1.92.14); FILE MERGED
2007/07/02 20:07:12 fs 1.92.14.1: #i78410# fix getBinaryStream so there's no recursion
2007-07-24 11:03:50 +00:00
Rüdiger Timm
d2fed243df INTEGRATION: CWS dba23b (1.11.74); FILE MERGED
2007/07/04 13:35:17 fs 1.11.74.2: #i10000#
2007/07/04 10:32:23 fs 1.11.74.1: #i78733# build dbaccess/win32/source/odbcconfig
2007-07-24 11:03:35 +00:00
Rüdiger Timm
d69b8442bd INTEGRATION: CWS dba23b (1.3.6); FILE MERGED
2007/07/11 20:08:37 fs 1.3.6.1: #i10000# re-merge the changes done before the file moved on HEAD
2007-07-24 11:03:20 +00:00
Oliver Bolte
221426e24e INTEGRATION: CWS basemodelrefactoring (1.21.24); FILE MERGED
2007/05/29 20:17:12 mba 1.21.24.3: RESYNC: (1.22-1.23); FILE MERGED
2007/05/08 23:21:02 mba 1.21.24.2: RESYNC: (1.21-1.22); FILE MERGED
2007/04/16 21:48:30 mba 1.21.24.1: #i26672#: parameter changed
2007-07-17 12:21:33 +00:00
Rüdiger Timm
43729c2b57 #i79375# Avoid warning ('directValue' may be used uninitialized in this function). Patch by pjanik. 2007-07-09 07:44:32 +00:00
Rüdiger Timm
692111189c INTEGRATION: CWS oj14 (1.1.2); FILE ADDED
2006/01/03 08:57:09 oj 1.1.2.1: makefile ext
2007-07-06 07:46:53 +00:00
Rüdiger Timm
4e9321b0e9 INTEGRATION: CWS oj14 (1.25.8); FILE MERGED
2007/06/23 21:23:18 fs 1.25.8.7: RESYNC: (1.29-1.30); FILE MERGED
2007/04/18 12:11:12 oj 1.25.8.6: RESYNC: (1.28-1.29); FILE MERGED
2007/04/05 08:05:16 lla 1.25.8.5: #146843#
2007/02/20 15:53:10 oj 1.25.8.4: RESYNC: (1.27-1.28); FILE MERGED
2006/11/07 09:59:06 oj 1.25.8.3: RESYNC: (1.26-1.27); FILE MERGED
2006/07/04 08:28:17 oj 1.25.8.2: RESYNC: (1.25-1.26); FILE MERGED
2006/01/03 08:07:52 oj 1.25.8.1: export controller class
2007-07-06 07:46:44 +00:00
Rüdiger Timm
b42cf30932 INTEGRATION: CWS oj14 (1.6.130); FILE MERGED
2007/06/04 19:03:14 oj 1.6.130.5: RESYNC: (1.10-1.11); FILE MERGED
2006/12/18 16:25:45 oj 1.6.130.4: RESYNC: (1.9-1.10); FILE MERGED
2006/11/07 09:55:49 oj 1.6.130.3: RESYNC: (1.8-1.9); FILE MERGED
2006/07/04 08:27:23 oj 1.6.130.2: RESYNC: (1.6-1.8); FILE MERGED
2006/01/03 08:07:52 oj 1.6.130.1: export controller class
2007-07-06 07:46:29 +00:00
Rüdiger Timm
be36e5c86b INTEGRATION: CWS oj14 (1.4.8); FILE MERGED
2006/04/25 13:03:21 oj 1.4.8.3: new include
2006/03/20 07:49:02 oj 1.4.8.2: use of module client helper
2006/01/03 07:49:30 oj 1.4.8.1: changed module client
2007-07-06 07:45:52 +00:00
Rüdiger Timm
ef1984ee8f INTEGRATION: CWS oj14 (1.10.8); FILE MERGED
2006/11/07 09:54:14 oj 1.10.8.2: RESYNC: (1.10-1.11); FILE MERGED
2006/01/03 07:49:30 oj 1.10.8.1: changed module client
2007-07-06 07:45:25 +00:00
Rüdiger Timm
e30d26cc54 INTEGRATION: CWS oj14 (1.6.8); FILE MERGED
2006/04/25 13:03:21 oj 1.6.8.3: new include
2006/03/20 07:49:01 oj 1.6.8.2: use of module client helper
2006/01/03 07:49:30 oj 1.6.8.1: changed module client
2007-07-06 07:45:13 +00:00
Rüdiger Timm
1f452b285f INTEGRATION: CWS oj14 (1.3.8); FILE MERGED
2006/03/20 07:49:00 oj 1.3.8.2: use of module client helper
2006/01/03 07:49:29 oj 1.3.8.1: changed module client
2007-07-06 07:44:52 +00:00
Rüdiger Timm
bc49f89e4c INTEGRATION: CWS oj14 (1.5.8); FILE MERGED
2006/01/03 07:49:29 oj 1.5.8.1: changed module client
2007-07-06 07:44:30 +00:00
Rüdiger Timm
dc40f60834 INTEGRATION: CWS oj14 (1.13.6); FILE MERGED
2006/11/07 09:50:43 oj 1.13.6.5: RESYNC: (1.15-1.17); FILE MERGED
2006/07/04 08:25:24 oj 1.13.6.4: RESYNC: (1.13-1.15); FILE MERGED
2006/04/25 12:50:08 oj 1.13.6.3: new include
2006/03/20 07:48:59 oj 1.13.6.2: use of module client helper
2006/01/03 07:49:28 oj 1.13.6.1: changed module client
2007-07-06 07:44:17 +00:00
Rüdiger Timm
9c6e661119 INTEGRATION: CWS oj14 (1.10.8); FILE MERGED
2006/11/07 09:50:15 oj 1.10.8.5: RESYNC: (1.11-1.12); FILE MERGED
2006/07/04 08:24:49 oj 1.10.8.4: RESYNC: (1.10-1.11); FILE MERGED
2006/04/25 12:50:08 oj 1.10.8.3: new include
2006/03/20 07:48:59 oj 1.10.8.2: use of module client helper
2006/01/03 07:49:28 oj 1.10.8.1: changed module client
2007-07-06 07:43:52 +00:00
Rüdiger Timm
9656e96ad4 INTEGRATION: CWS oj14 (1.8.4); FILE MERGED
2006/11/07 09:49:34 oj 1.8.4.5: RESYNC: (1.9-1.10); FILE MERGED
2006/07/04 08:24:12 oj 1.8.4.4: RESYNC: (1.8-1.9); FILE MERGED
2006/04/25 12:50:07 oj 1.8.4.3: new include
2006/03/20 07:48:58 oj 1.8.4.2: use of module client helper
2006/01/03 07:49:27 oj 1.8.4.1: changed module client
2007-07-06 07:43:23 +00:00
Rüdiger Timm
a153bd92f1 INTEGRATION: CWS oj14 (1.99.4); FILE MERGED
2007/06/04 19:00:59 oj 1.99.4.7: RESYNC: (1.110-1.111); FILE MERGED
2007/02/20 15:52:07 oj 1.99.4.6: RESYNC: (1.109-1.110); FILE MERGED
2006/12/18 16:25:10 oj 1.99.4.5: RESYNC: (1.108-1.109); FILE MERGED
2006/11/07 09:49:26 oj 1.99.4.4: RESYNC: (1.104-1.108); FILE MERGED
2006/07/04 08:23:44 oj 1.99.4.3: RESYNC: (1.100-1.104); FILE MERGED
2006/03/20 14:06:30 oj 1.99.4.2: RESYNC: (1.99-1.100); FILE MERGED
2006/01/03 07:49:27 oj 1.99.4.1: changed module client
2007-07-06 07:43:02 +00:00
Rüdiger Timm
88ee0373ca INTEGRATION: CWS oj14 (1.44.4); FILE MERGED
2006/11/07 09:49:05 oj 1.44.4.4: RESYNC: (1.51-1.56); FILE MERGED
2006/07/04 08:23:23 oj 1.44.4.3: RESYNC: (1.46-1.51); FILE MERGED
2006/03/20 14:06:17 oj 1.44.4.2: RESYNC: (1.45-1.46); FILE MERGED
2006/01/03 07:49:27 oj 1.44.4.1: changed module client
2007-07-06 07:42:50 +00:00
Rüdiger Timm
1430dc875a INTEGRATION: CWS oj14 (1.19.8); FILE MERGED
2007/06/04 19:00:46 oj 1.19.8.7: RESYNC: (1.24-1.25); FILE MERGED
2006/11/07 09:48:57 oj 1.19.8.6: RESYNC: (1.21-1.24); FILE MERGED
2006/07/04 08:23:14 oj 1.19.8.5: RESYNC: (1.20-1.21); FILE MERGED
2006/04/25 12:50:06 oj 1.19.8.4: new include
2006/03/20 07:48:57 oj 1.19.8.3: use of module client helper
2006/01/03 13:25:46 oj 1.19.8.2: RESYNC: (1.19-1.20); FILE MERGED
2006/01/03 07:49:26 oj 1.19.8.1: changed module client
2007-07-06 07:42:26 +00:00
Rüdiger Timm
6fae0b7061 INTEGRATION: CWS oj14 (1.4.8); FILE MERGED
2006/01/03 07:49:26 oj 1.4.8.1: changed module client
2007-07-06 07:42:03 +00:00
Rüdiger Timm
f5c452a828 INTEGRATION: CWS oj14 (1.42.4); FILE MERGED
2006/11/07 09:47:52 oj 1.42.4.5: RESYNC: (1.43-1.46); FILE MERGED
2006/07/04 08:22:11 oj 1.42.4.4: RESYNC: (1.42-1.43); FILE MERGED
2006/04/25 12:51:11 oj 1.42.4.3: new include
2006/03/20 07:48:56 oj 1.42.4.2: use of module client helper
2006/01/03 07:49:26 oj 1.42.4.1: changed module client
2007-07-06 07:41:42 +00:00
Rüdiger Timm
0fa2e5f5b7 INTEGRATION: CWS oj14 (1.7.4); FILE MERGED
2006/11/07 09:47:10 oj 1.7.4.4: RESYNC: (1.7-1.8); FILE MERGED
2006/04/25 12:49:36 oj 1.7.4.3: new include
2006/03/20 07:48:56 oj 1.7.4.2: use of module client helper
2006/01/03 07:49:25 oj 1.7.4.1: changed module client
2007-07-06 07:41:23 +00:00
Rüdiger Timm
983fbd96b8 INTEGRATION: CWS oj14 (1.11.8); FILE MERGED
2007/06/04 18:57:35 oj 1.11.8.6: RESYNC: (1.13-1.14); FILE MERGED
2006/11/07 09:47:01 oj 1.11.8.5: RESYNC: (1.12-1.13); FILE MERGED
2006/07/04 08:21:18 oj 1.11.8.4: RESYNC: (1.11-1.12); FILE MERGED
2006/04/25 12:49:36 oj 1.11.8.3: new include
2006/03/20 07:48:55 oj 1.11.8.2: use of module client helper
2006/01/03 07:49:25 oj 1.11.8.1: changed module client
2007-07-06 07:41:10 +00:00
Rüdiger Timm
5fc7d19d68 INTEGRATION: CWS oj14 (1.102.4); FILE MERGED
2007/06/04 18:57:13 oj 1.102.4.8: RESYNC: (1.108-1.109); FILE MERGED
2007/02/20 20:44:17 oj 1.102.4.7: mere conflict
2007/02/20 15:51:45 oj 1.102.4.6: RESYNC: (1.107-1.108); FILE MERGED
2006/12/21 12:30:03 oj 1.102.4.5: impl selectionSupplier
2006/12/18 16:24:53 oj 1.102.4.4: RESYNC: (1.106-1.107); FILE MERGED
2006/11/07 09:46:54 oj 1.102.4.3: RESYNC: (1.104-1.106); FILE MERGED
2006/07/04 08:21:10 oj 1.102.4.2: RESYNC: (1.102-1.104); FILE MERGED
2006/01/03 07:49:25 oj 1.102.4.1: changed module client
2007-07-06 07:40:51 +00:00
Rüdiger Timm
3fbd54a4f8 INTEGRATION: CWS oj14 (1.13.8); FILE MERGED
2007/06/04 18:56:33 oj 1.13.8.3: RESYNC: (1.14-1.15); FILE MERGED
2006/07/04 08:20:50 oj 1.13.8.2: RESYNC: (1.13-1.14); FILE MERGED
2006/01/03 07:49:25 oj 1.13.8.1: changed module client
2007-07-06 07:40:27 +00:00
Rüdiger Timm
a1193cd872 INTEGRATION: CWS oj14 (1.19.8); FILE MERGED
2006/12/18 16:24:31 oj 1.19.8.6: RESYNC: (1.21-1.22); FILE MERGED
2006/11/07 09:46:23 oj 1.19.8.5: RESYNC: (1.20-1.21); FILE MERGED
2006/07/04 08:20:29 oj 1.19.8.4: RESYNC: (1.19-1.20); FILE MERGED
2006/04/25 12:49:35 oj 1.19.8.3: new include
2006/03/20 07:48:55 oj 1.19.8.2: use of module client helper
2006/01/03 07:49:24 oj 1.19.8.1: changed module client
2007-07-06 07:40:14 +00:00
Rüdiger Timm
cbc06afedb INTEGRATION: CWS oj14 (1.24.8); FILE MERGED
2007/06/04 18:53:42 oj 1.24.8.6: RESYNC: (1.27-1.28); FILE MERGED
2006/11/07 09:44:06 oj 1.24.8.5: RESYNC: (1.25-1.27); FILE MERGED
2006/07/04 08:18:20 oj 1.24.8.4: RESYNC: (1.24-1.25); FILE MERGED
2006/04/25 12:49:33 oj 1.24.8.3: new include
2006/03/20 07:48:53 oj 1.24.8.2: use of module client helper
2006/01/03 07:49:23 oj 1.24.8.1: changed module client
2007-07-06 07:39:32 +00:00
Rüdiger Timm
f32d740d45 INTEGRATION: CWS oj14 (1.18.8); FILE MERGED
2007/06/23 21:23:01 fs 1.18.8.6: RESYNC: (1.20-1.21); FILE MERGED
2006/11/07 09:43:57 oj 1.18.8.5: RESYNC: (1.19-1.20); FILE MERGED
2006/07/04 08:18:12 oj 1.18.8.4: RESYNC: (1.18-1.19); FILE MERGED
2006/04/25 12:49:33 oj 1.18.8.3: new include
2006/03/20 07:48:53 oj 1.18.8.2: use of module client helper
2006/01/03 07:49:23 oj 1.18.8.1: changed module client
2007-07-06 07:39:14 +00:00
Rüdiger Timm
785848a26a INTEGRATION: CWS oj14 (1.15.6); FILE MERGED
2006/11/07 09:41:52 oj 1.15.6.5: RESYNC: (1.16-1.20); FILE MERGED
2006/07/04 08:17:41 oj 1.15.6.4: RESYNC: (1.15-1.16); FILE MERGED
2006/04/25 12:49:32 oj 1.15.6.3: new include
2006/03/20 07:48:52 oj 1.15.6.2: use of module client helper
2006/01/03 07:49:23 oj 1.15.6.1: changed module client
2007-07-06 07:39:02 +00:00
Rüdiger Timm
35ded4acf8 INTEGRATION: CWS oj14 (1.51.6); FILE MERGED
2006/11/07 09:41:19 oj 1.51.6.6: RESYNC: (1.53-1.55); FILE MERGED
2006/07/04 08:17:12 oj 1.51.6.5: RESYNC: (1.52-1.53); FILE MERGED
2006/04/25 12:49:31 oj 1.51.6.4: new include
2006/03/20 14:04:14 oj 1.51.6.3: RESYNC: (1.51-1.52); FILE MERGED
2006/03/20 07:48:51 oj 1.51.6.2: use of module client helper
2006/01/03 07:49:22 oj 1.51.6.1: changed module client
2007-07-06 07:38:41 +00:00
Rüdiger Timm
408aab4b76 INTEGRATION: CWS oj14 (1.19.8); FILE MERGED
2006/11/07 09:33:33 oj 1.19.8.3: RESYNC: (1.20-1.23); FILE MERGED
2006/07/04 08:15:57 oj 1.19.8.2: RESYNC: (1.19-1.20); FILE MERGED
2006/01/03 07:49:22 oj 1.19.8.1: changed module client
2007-07-06 07:38:21 +00:00
Rüdiger Timm
86061e8e77 INTEGRATION: CWS oj14 (1.16.4); FILE MERGED
2007/06/04 18:50:02 oj 1.16.4.9: RESYNC: (1.20-1.21); FILE MERGED
2006/12/21 12:30:02 oj 1.16.4.8: impl selectionSupplier
2006/11/13 13:23:56 oj 1.16.4.7: merge conflicts
2006/11/08 11:15:28 oj 1.16.4.6: merge conflicts resolved
2006/11/07 09:39:24 oj 1.16.4.5: RESYNC: (1.17-1.19); FILE MERGED
2006/07/04 08:15:49 oj 1.16.4.4: RESYNC: (1.16-1.17); FILE MERGED
2006/04/25 13:03:20 oj 1.16.4.3: new include
2006/03/20 07:48:50 oj 1.16.4.2: use of module client helper
2006/01/03 07:49:22 oj 1.16.4.1: changed module client
2007-07-06 07:38:03 +00:00
Rüdiger Timm
c1c0281cee INTEGRATION: CWS oj14 (1.25.4); FILE MERGED
2007/06/04 18:49:51 oj 1.25.4.6: RESYNC: (1.28-1.29); FILE MERGED
2006/11/08 11:15:28 oj 1.25.4.5: merge conflicts resolved
2006/11/07 09:38:47 oj 1.25.4.4: RESYNC: (1.26-1.28); FILE MERGED
2006/07/04 08:15:32 oj 1.25.4.3: RESYNC: (1.25-1.26); FILE MERGED
2006/03/20 07:48:49 oj 1.25.4.2: use of module client helper
2006/01/03 07:49:21 oj 1.25.4.1: changed module client
2007-07-06 07:37:35 +00:00
Rüdiger Timm
3be75440d1 INTEGRATION: CWS oj14 (1.17.4); FILE MERGED
2007/06/07 11:10:38 oj 1.17.4.14: make use of new method in mimeconfighelper
2007/06/05 12:38:35 oj 1.17.4.13: merge problems fixed
2007/06/04 18:48:52 oj 1.17.4.12: RESYNC: (1.20-1.21); FILE MERGED
2007/05/21 13:34:53 lla 1.17.4.11: #i77259# don't eliminate exceptions
2007/04/05 08:06:29 lla 1.17.4.10: #146843#
2006/11/09 07:30:51 oj 1.17.4.9: remove wnt warning
2006/11/08 11:18:22 oj 1.17.4.8: merge conflict
2006/11/08 11:15:28 oj 1.17.4.7: merge conflicts resolved
2006/11/07 09:38:28 oj 1.17.4.6: RESYNC: (1.18-1.20); FILE MERGED
2006/07/11 10:57:56 oj 1.17.4.5: conflicts and warnings removed
2006/07/04 08:15:14 oj 1.17.4.4: RESYNC: (1.17-1.18); FILE MERGED
2006/04/25 13:03:20 oj 1.17.4.3: new include
2006/03/20 07:48:49 oj 1.17.4.2: use of module client helper
2006/01/03 07:49:20 oj 1.17.4.1: changed module client
2007-07-06 07:37:12 +00:00
Rüdiger Timm
9d5462d3a2 INTEGRATION: CWS oj14 (1.27.4); FILE MERGED
2007/06/04 18:48:41 oj 1.27.4.8: RESYNC: (1.32-1.34); FILE MERGED
2006/11/07 09:37:49 oj 1.27.4.7: RESYNC: (1.30-1.32); FILE MERGED
2006/07/04 08:15:06 oj 1.27.4.6: RESYNC: (1.29-1.30); FILE MERGED
2006/04/25 13:03:19 oj 1.27.4.5: new include
2006/03/20 14:02:55 oj 1.27.4.4: RESYNC: (1.28-1.29); FILE MERGED
2006/03/20 07:48:48 oj 1.27.4.3: use of module client helper
2006/01/03 13:24:05 oj 1.27.4.2: RESYNC: (1.27-1.28); FILE MERGED
2006/01/03 07:49:20 oj 1.27.4.1: changed module client
2007-07-06 07:36:59 +00:00
Rüdiger Timm
55e571e9e5 INTEGRATION: CWS oj14 (1.73.44); FILE MERGED
2007/06/12 13:26:41 fs 1.73.44.3: some less line feeds. Looks better, doesn't it?
2007/06/04 18:45:18 oj 1.73.44.2: RESYNC: (1.73-1.74); FILE MERGED
2007/05/24 07:39:03 fs 1.73.44.1: some less line feeds. Looks better, doesn't it?
2007-07-06 07:36:39 +00:00
Rüdiger Timm
2fe39ebd5f INTEGRATION: CWS oj14 (1.7.8); FILE MERGED
2006/11/08 11:15:28 oj 1.7.8.6: merge conflicts resolved
2006/11/07 09:36:55 oj 1.7.8.5: RESYNC: (1.8-1.11); FILE MERGED
2006/07/04 08:14:57 oj 1.7.8.4: RESYNC: (1.7-1.8); FILE MERGED
2006/04/25 13:03:19 oj 1.7.8.3: new include
2006/03/20 07:48:48 oj 1.7.8.2: use of module client helper
2006/01/03 07:49:20 oj 1.7.8.1: changed module client
2007-07-06 07:36:26 +00:00
Rüdiger Timm
e72aed8356 INTEGRATION: CWS oj14 (1.2.28); FILE MERGED
2007/06/05 12:38:35 oj 1.2.28.4: merge problems fixed
2007/06/04 18:48:09 oj 1.2.28.3: RESYNC: (1.3-1.4); FILE MERGED
2006/12/18 16:23:20 oj 1.2.28.2: RESYNC: (1.2-1.3); FILE MERGED
2006/11/08 12:11:48 oj 1.2.28.1: use of new classes
2007-07-06 07:36:01 +00:00
Rüdiger Timm
ef78c5490c INTEGRATION: CWS oj14 (1.22.4); FILE MERGED
2007/06/04 18:47:00 oj 1.22.4.7: RESYNC: (1.25-1.26); FILE MERGED
2006/11/07 09:35:38 oj 1.22.4.6: RESYNC: (1.24-1.25); FILE MERGED
2006/07/04 08:14:02 oj 1.22.4.5: RESYNC: (1.23-1.24); FILE MERGED
2006/04/25 13:03:18 oj 1.22.4.4: new include
2006/03/20 14:02:06 oj 1.22.4.3: RESYNC: (1.22-1.23); FILE MERGED
2006/03/20 07:48:47 oj 1.22.4.2: use of module client helper
2006/01/03 07:49:20 oj 1.22.4.1: changed module client
2007-07-06 07:35:43 +00:00
Rüdiger Timm
6e772fabc5 INTEGRATION: CWS oj14 (1.16.8); FILE MERGED
2007/06/04 18:46:48 oj 1.16.8.7: RESYNC: (1.21-1.22); FILE MERGED
2007/02/20 15:50:52 oj 1.16.8.6: RESYNC: (1.20-1.21); FILE MERGED
2006/11/07 09:35:30 oj 1.16.8.5: RESYNC: (1.17-1.20); FILE MERGED
2006/07/04 08:13:53 oj 1.16.8.4: RESYNC: (1.16-1.17); FILE MERGED
2006/04/25 13:03:18 oj 1.16.8.3: new include
2006/03/20 07:48:46 oj 1.16.8.2: use of module client helper
2006/01/03 07:49:20 oj 1.16.8.1: changed module client
2007-07-06 07:35:30 +00:00
Rüdiger Timm
376f275ddf INTEGRATION: CWS oj14 (1.41.4); FILE MERGED
2007/06/04 18:46:36 oj 1.41.4.7: RESYNC: (1.50-1.51); FILE MERGED
2006/11/07 09:35:10 oj 1.41.4.6: RESYNC: (1.45-1.50); FILE MERGED
2006/07/04 08:13:32 oj 1.41.4.5: RESYNC: (1.42-1.45); FILE MERGED
2006/04/25 13:03:17 oj 1.41.4.4: new include
2006/03/20 14:01:54 oj 1.41.4.3: RESYNC: (1.41-1.42); FILE MERGED
2006/03/20 07:48:46 oj 1.41.4.2: use of module client helper
2006/01/03 07:49:19 oj 1.41.4.1: changed module client
2007-07-06 07:35:06 +00:00
Rüdiger Timm
82d7735c08 INTEGRATION: CWS oj14 (1.16.8); FILE MERGED
2007/06/04 18:46:17 oj 1.16.8.8: RESYNC: (1.23-1.24); FILE MERGED
2007/02/20 15:50:44 oj 1.16.8.7: RESYNC: (1.22-1.23); FILE MERGED
2006/11/07 09:35:01 oj 1.16.8.6: RESYNC: (1.20-1.22); FILE MERGED
2006/07/04 08:13:24 oj 1.16.8.5: RESYNC: (1.17-1.20); FILE MERGED
2006/04/25 13:03:17 oj 1.16.8.4: new include
2006/03/20 14:01:42 oj 1.16.8.3: RESYNC: (1.16-1.17); FILE MERGED
2006/03/20 07:48:45 oj 1.16.8.2: use of module client helper
2006/01/03 07:49:19 oj 1.16.8.1: changed module client
2007-07-06 07:34:52 +00:00
Rüdiger Timm
1e5467226e INTEGRATION: CWS oj14 (1.24.8); FILE MERGED
2007/06/04 18:46:05 oj 1.24.8.6: RESYNC: (1.28-1.29); FILE MERGED
2006/11/07 09:34:52 oj 1.24.8.5: RESYNC: (1.25-1.28); FILE MERGED
2006/07/04 08:13:16 oj 1.24.8.4: RESYNC: (1.24-1.25); FILE MERGED
2006/04/25 13:03:16 oj 1.24.8.3: new include
2006/03/20 07:48:45 oj 1.24.8.2: use of module client helper
2006/01/03 07:49:19 oj 1.24.8.1: changed module client
2007-07-06 07:34:33 +00:00
Rüdiger Timm
87b99b8ac7 INTEGRATION: CWS oj14 (1.58.4); FILE MERGED
2007/06/23 21:22:54 fs 1.58.4.8: RESYNC: (1.70-1.71); FILE MERGED
2007/06/04 18:45:50 oj 1.58.4.7: RESYNC: (1.68-1.70); FILE MERGED
2006/12/18 16:23:05 oj 1.58.4.6: RESYNC: (1.66-1.68); FILE MERGED
2006/11/07 09:34:32 oj 1.58.4.5: RESYNC: (1.60-1.66); FILE MERGED
2006/07/04 08:12:57 oj 1.58.4.4: RESYNC: (1.59-1.60); FILE MERGED
2006/04/25 13:03:16 oj 1.58.4.3: new include
2006/03/20 07:48:44 oj 1.58.4.2: use of module client helper
2006/01/03 07:49:18 oj 1.58.4.1: changed module client
2007-07-06 07:34:20 +00:00
Rüdiger Timm
1c610909e5 INTEGRATION: CWS oj14 (1.5.4); FILE MERGED
2006/11/07 09:34:25 oj 1.5.4.6: RESYNC: (1.7-1.8); FILE MERGED
2006/07/04 08:12:48 oj 1.5.4.5: RESYNC: (1.6-1.7); FILE MERGED
2006/04/25 13:03:15 oj 1.5.4.4: new include
2006/03/20 14:01:16 oj 1.5.4.3: RESYNC: (1.5-1.6); FILE MERGED
2006/03/20 07:48:44 oj 1.5.4.2: use of module client helper
2006/01/03 07:49:18 oj 1.5.4.1: changed module client
2007-07-06 07:34:01 +00:00
Rüdiger Timm
ba5d78c28d INTEGRATION: CWS oj14 (1.27.4); FILE MERGED
2006/11/07 09:34:17 oj 1.27.4.6: RESYNC: (1.29-1.31); FILE MERGED
2006/07/04 08:12:40 oj 1.27.4.5: RESYNC: (1.28-1.29); FILE MERGED
2006/04/25 13:03:15 oj 1.27.4.4: new include
2006/03/20 14:01:03 oj 1.27.4.3: RESYNC: (1.27-1.28); FILE MERGED
2006/03/20 07:48:43 oj 1.27.4.2: use of module client helper
2006/01/03 07:49:18 oj 1.27.4.1: changed module client
2007-07-06 07:33:42 +00:00
Rüdiger Timm
f126b317fb INTEGRATION: CWS oj14 (1.16.4); FILE MERGED
2006/11/07 09:33:41 oj 1.16.4.6: RESYNC: (1.21-1.22); FILE MERGED
2006/07/04 08:12:20 oj 1.16.4.5: RESYNC: (1.18-1.21); FILE MERGED
2006/04/25 13:03:14 oj 1.16.4.4: new include
2006/03/20 14:00:35 oj 1.16.4.3: RESYNC: (1.16-1.18); FILE MERGED
2006/03/20 07:48:43 oj 1.16.4.2: use of module client helper
2006/01/03 07:49:18 oj 1.16.4.1: changed module client
2007-07-06 07:33:29 +00:00
Rüdiger Timm
ebb4fc3dac INTEGRATION: CWS oj14 (1.1.2); FILE ADDED
2006/04/25 13:03:14 oj 1.1.2.3: new include
2006/03/20 07:48:42 oj 1.1.2.2: use of module client helper
2005/11/28 11:53:12 oj 1.1.2.1: new module helper for dbu
2007-07-06 07:33:09 +00:00
Rüdiger Timm
cc7b505ce3 INTEGRATION: CWS oj14 (1.5.8); FILE MERGED
2006/04/25 13:03:12 oj 1.5.8.3: new include
2006/03/20 07:48:41 oj 1.5.8.2: use of module client helper
2006/01/03 07:49:17 oj 1.5.8.1: changed module client
2007-07-06 07:32:44 +00:00
Rüdiger Timm
9a94dcf603 INTEGRATION: CWS oj14 (1.10.8); FILE MERGED
2007/06/04 18:44:29 oj 1.10.8.4: RESYNC: (1.10-1.11); FILE MERGED
2006/04/25 13:03:12 oj 1.10.8.3: new include
2006/03/20 07:48:40 oj 1.10.8.2: use of module client helper
2006/01/03 07:49:16 oj 1.10.8.1: changed module client
2007-07-06 07:32:29 +00:00
Rüdiger Timm
ed5c18159a INTEGRATION: CWS oj14 (1.3.8); FILE MERGED
2006/07/04 08:11:38 oj 1.3.8.2: RESYNC: (1.3-1.4); FILE MERGED
2006/04/25 13:03:11 oj 1.3.8.1: new include
2007-07-06 07:32:06 +00:00
Rüdiger Timm
7a73a78e48 INTEGRATION: CWS oj14 (1.32.8); FILE MERGED
2007/02/20 19:41:22 oj 1.32.8.6: merge conflict resolved
2007/02/20 15:50:26 oj 1.32.8.5: RESYNC: (1.33-1.35); FILE MERGED
2006/12/21 14:12:33 oj 1.32.8.4: impl propset
2006/12/21 12:30:02 oj 1.32.8.3: impl selectionSupplier
2006/11/07 09:32:12 oj 1.32.8.2: RESYNC: (1.32-1.33); FILE MERGED
2006/01/03 07:49:16 oj 1.32.8.1: changed module client
2007-07-06 07:31:39 +00:00
Rüdiger Timm
3773819e15 INTEGRATION: CWS oj14 (1.3.8); FILE MERGED
2006/01/03 07:49:16 oj 1.3.8.1: changed module client
2007-07-06 07:31:06 +00:00
Rüdiger Timm
ffbecb747d INTEGRATION: CWS oj14 (1.3.8); FILE MERGED
2006/07/04 08:10:01 oj 1.3.8.4: RESYNC: (1.3-1.4); FILE MERGED
2006/04/25 13:03:11 oj 1.3.8.3: new include
2006/03/20 07:48:40 oj 1.3.8.2: use of module client helper
2006/01/03 07:49:16 oj 1.3.8.1: changed module client
2007-07-06 07:30:53 +00:00
Rüdiger Timm
8c434dbacf INTEGRATION: CWS oj14 (1.8.8); FILE MERGED
2006/07/04 08:09:30 oj 1.8.8.2: RESYNC: (1.8-1.9); FILE MERGED
2006/04/25 13:03:10 oj 1.8.8.1: new include
2007-07-06 07:30:39 +00:00
Rüdiger Timm
7a2b1e9879 INTEGRATION: CWS oj14 (1.10.8); FILE MERGED
2006/07/04 08:09:11 oj 1.10.8.2: RESYNC: (1.10-1.11); FILE MERGED
2006/01/03 07:49:15 oj 1.10.8.1: changed module client
2007-07-06 07:30:26 +00:00
Rüdiger Timm
c1948d0635 INTEGRATION: CWS oj14 (1.5.8); FILE MERGED
2007/06/04 18:41:44 oj 1.5.8.3: RESYNC: (1.6-1.7); FILE MERGED
2006/11/07 09:31:23 oj 1.5.8.2: RESYNC: (1.5-1.6); FILE MERGED
2006/04/25 13:03:10 oj 1.5.8.1: new include
2007-07-06 07:29:54 +00:00
Rüdiger Timm
8afd29beef INTEGRATION: CWS oj14 (1.9.8); FILE MERGED
2006/11/08 13:43:43 oj 1.9.8.4: merge conflicts
2006/11/07 09:26:04 oj 1.9.8.3: RESYNC: (1.9-1.11); FILE MERGED
2006/11/07 07:32:41 oj 1.9.8.2: moved
Issue number:
Submitted by:
Reviewed by:
2006/01/03 08:46:17 oj 1.9.8.1: moved to inc
2007-07-06 07:29:20 +00:00
Rüdiger Timm
a540888faf INTEGRATION: CWS oj14 (1.4.8); FILE MERGED
2007/06/04 18:41:04 oj 1.4.8.2: RESYNC: (1.4-1.5); FILE MERGED
2006/04/25 13:03:09 oj 1.4.8.1: new include
2007-07-06 07:28:58 +00:00
Rüdiger Timm
9397abdd82 INTEGRATION: CWS oj14 (1.7.8); FILE MERGED
2007/06/04 18:40:30 oj 1.7.8.6: RESYNC: (1.9-1.10); FILE MERGED
2006/11/07 09:31:01 oj 1.7.8.5: RESYNC: (1.8-1.9); FILE MERGED
2006/04/25 13:03:09 oj 1.7.8.4: new include
2006/03/20 07:48:39 oj 1.7.8.3: use of module client helper
2006/01/03 13:22:54 oj 1.7.8.2: RESYNC: (1.7-1.8); FILE MERGED
2006/01/03 07:49:15 oj 1.7.8.1: changed module client
2007-07-06 07:28:45 +00:00
Rüdiger Timm
88069c4f78 INTEGRATION: CWS oj14 (1.4.8); FILE MERGED
2007/06/04 18:31:17 oj 1.4.8.3: RESYNC: (1.4-1.5); FILE MERGED
2006/03/20 07:48:39 oj 1.4.8.2: use of module client helper
2006/01/03 07:49:15 oj 1.4.8.1: changed module client
2007-07-06 07:28:29 +00:00
Rüdiger Timm
f6e814e7f9 INTEGRATION: CWS oj14 (1.96.2); FILE MERGED
2007/06/06 07:34:40 lla 1.96.2.2: #i77259# new dialog if extension is not present
2007/05/24 11:58:36 lla 1.96.2.1: #i77259# error message if no report designer is installed
2007-07-06 07:28:17 +00:00
Rüdiger Timm
aaacc044da INTEGRATION: CWS oj14 (1.12.4); FILE MERGED
2007/06/06 07:34:39 lla 1.12.4.1: #i77259# new dialog if extension is not present
2007-07-06 07:27:58 +00:00
Rüdiger Timm
de15435860 INTEGRATION: CWS oj14 (1.5.8); FILE MERGED
2007/02/20 15:50:18 oj 1.5.8.7: RESYNC: (1.8-1.10); FILE MERGED
2006/12/18 16:22:14 oj 1.5.8.6: RESYNC: (1.7-1.8); FILE MERGED
2006/11/07 09:30:18 oj 1.5.8.5: RESYNC: (1.6-1.7); FILE MERGED
2006/07/04 08:08:28 oj 1.5.8.4: RESYNC: (1.5-1.6); FILE MERGED
2006/04/25 13:03:08 oj 1.5.8.3: new include
2006/03/20 07:48:38 oj 1.5.8.2: use of module client helper
2006/01/03 07:49:15 oj 1.5.8.1: changed module client
2007-07-06 07:27:45 +00:00
Rüdiger Timm
b690304494 INTEGRATION: CWS oj14 (1.2.28); FILE MERGED
2007/06/05 12:38:34 oj 1.2.28.4: merge problems fixed
2007/06/04 18:39:54 oj 1.2.28.3: RESYNC: (1.2-1.3); FILE MERGED
2006/11/08 13:43:43 oj 1.2.28.2: merge conflicts
2006/11/08 12:11:47 oj 1.2.28.1: use of new classes
2007-07-06 07:27:00 +00:00
Rüdiger Timm
9de1bbbf54 INTEGRATION: CWS oj14 (1.33.4); FILE MERGED
2007/06/04 18:38:45 oj 1.33.4.4: RESYNC: (1.36-1.37); FILE MERGED
2006/11/07 09:26:46 oj 1.33.4.3: RESYNC: (1.35-1.36); FILE MERGED
2006/07/04 08:07:51 oj 1.33.4.2: RESYNC: (1.33-1.35); FILE MERGED
2006/04/25 13:03:08 oj 1.33.4.1: new include
2007-07-06 07:26:49 +00:00
Rüdiger Timm
bb5d978693 INTEGRATION: CWS oj14 (1.36.8); FILE MERGED
2006/11/07 09:29:48 oj 1.36.8.2: RESYNC: (1.36-1.37); FILE MERGED
2006/01/03 07:49:15 oj 1.36.8.1: changed module client
2007-07-06 07:26:37 +00:00
Rüdiger Timm
8130b23e30 INTEGRATION: CWS oj14 (1.5.8); FILE MERGED
2007/06/04 18:33:26 oj 1.5.8.3: RESYNC: (1.5-1.6); FILE MERGED
2006/03/20 07:48:38 oj 1.5.8.2: use of module client helper
2006/01/03 07:49:14 oj 1.5.8.1: changed module client
2007-07-06 07:26:19 +00:00
Rüdiger Timm
cc8e9c9441 INTEGRATION: CWS oj14 (1.15.4); FILE MERGED
2006/11/07 09:27:53 oj 1.15.4.5: RESYNC: (1.17-1.18); FILE MERGED
2006/07/04 08:06:26 oj 1.15.4.4: RESYNC: (1.15-1.17); FILE MERGED
2006/04/25 13:03:07 oj 1.15.4.3: new include
2006/03/20 07:48:38 oj 1.15.4.2: use of module client helper
2006/01/03 07:49:14 oj 1.15.4.1: changed module client
2007-07-06 07:25:44 +00:00
Rüdiger Timm
6e8cc42cab INTEGRATION: CWS oj14 (1.8.8); FILE MERGED
2006/07/04 08:05:44 oj 1.8.8.2: RESYNC: (1.8-1.9); FILE MERGED
2006/04/25 13:03:06 oj 1.8.8.1: new include
2007-07-06 07:25:15 +00:00
Rüdiger Timm
188a6b7692 INTEGRATION: CWS oj14 (1.7.8); FILE MERGED
2006/07/04 08:05:05 oj 1.7.8.4: RESYNC: (1.7-1.8); FILE MERGED
2006/04/25 13:03:06 oj 1.7.8.3: new include
2006/03/20 07:48:37 oj 1.7.8.2: use of module client helper
2006/01/03 07:49:14 oj 1.7.8.1: changed module client
2007-07-06 07:24:54 +00:00
Rüdiger Timm
286adad720 INTEGRATION: CWS oj14 (1.35.8); FILE MERGED
2006/11/07 09:29:06 oj 1.35.8.4: RESYNC: (1.36-1.37); FILE MERGED
2006/07/04 08:04:43 oj 1.35.8.3: RESYNC: (1.35-1.36); FILE MERGED
2006/04/25 13:03:05 oj 1.35.8.2: new include
2006/01/03 07:49:14 oj 1.35.8.1: changed module client
2007-07-06 07:24:41 +00:00
Rüdiger Timm
91b68e2530 INTEGRATION: CWS oj14 (1.7.8); FILE MERGED
2006/07/04 08:04:24 oj 1.7.8.2: RESYNC: (1.7-1.8); FILE MERGED
2006/04/25 13:03:05 oj 1.7.8.1: new include
2007-07-06 07:24:24 +00:00
Rüdiger Timm
4aa010f9ee INTEGRATION: CWS oj14 (1.20.8); FILE MERGED
2006/11/07 09:28:01 oj 1.20.8.2: RESYNC: (1.20-1.21); FILE MERGED
2006/04/25 13:03:04 oj 1.20.8.1: new include
2007-07-06 07:23:57 +00:00