Commit graph

269 commits

Author SHA1 Message Date
Oliver Bolte
d2be290030 INTEGRATION: CWS pchfix02 (1.5.8); FILE MERGED
2006/09/01 17:58:31 kaib 1.5.8.1: #i68856# Added header markers and pch files
2006-09-17 00:14:53 +00:00
Oliver Bolte
f4a24e4826 INTEGRATION: CWS pchfix02 (1.4.40); FILE MERGED
2006/09/01 17:58:30 kaib 1.4.40.1: #i68856# Added header markers and pch files
2006-09-17 00:14:40 +00:00
Oliver Bolte
1be6a5d270 INTEGRATION: CWS pchfix02 (1.1.2); FILE ADDED
2006/09/01 17:58:30 kaib 1.1.2.1: #i68856# Added header markers and pch files
2006-09-17 00:14:26 +00:00
Kurt Zenker
42b086698b INTEGRATION: CWS warningfixes02 (1.7.2); FILE MERGED
2006/06/30 12:30:30 sb 1.7.2.1: #i66577# Made the code compile (warning-free) on a unxlngi6.pro GCC 4.1.1 Linux box.
2006-07-19 16:13:08 +00:00
Kurt Zenker
e663352585 INTEGRATION: CWS targetedaot (1.23.2); FILE MERGED
2006/06/12 09:32:03 cmc 1.23.2.3: #i54692# move aottarget stuff locally here in xmlhelp
2006/04/26 09:10:17 cmc 1.23.2.2: #i54692# enable optimized AOT helpers
2006/04/25 16:09:34 cmc 1.23.2.1: #i54692# enable optimized AOT helpers
2006-07-05 20:13:24 +00:00
Kurt Zenker
8c7ec734d3 INTEGRATION: CWS targetedaot (1.13.12); FILE MERGED
2006/04/26 09:09:49 cmc 1.13.12.2: #i54692# enable optimized AOT helpers
2006/04/25 16:09:33 cmc 1.13.12.1: #i54692# enable optimized AOT helpers
2006-07-05 20:13:02 +00:00
Jens-Heiner Rechtien
9b414dd6ef INTEGRATION: CWS warnings01 (1.10.166); FILE MERGED
2006/01/25 20:43:33 sb 1.10.166.2: RESYNC: (1.10-1.11); FILE MERGED
2005/12/15 16:36:48 ab 1.10.166.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:42:55 +00:00
Jens-Heiner Rechtien
e06620b8c8 INTEGRATION: CWS warnings01 (1.16.10); FILE MERGED
2006/04/06 14:48:34 ab 1.16.10.3: #i55991# warning-free code
2006/01/25 20:43:22 sb 1.16.10.2: RESYNC: (1.16-1.17); FILE MERGED
2005/12/15 16:36:48 ab 1.16.10.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:42:44 +00:00
Jens-Heiner Rechtien
c586e23159 INTEGRATION: CWS warnings01 (1.4.192); FILE MERGED
2005/12/15 16:36:48 ab 1.4.192.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:42:32 +00:00
Jens-Heiner Rechtien
0dc6b87166 INTEGRATION: CWS warnings01 (1.6.18); FILE MERGED
2006/06/02 09:35:08 abi 1.6.18.2: #i65894# corrected ifdefs
2005/12/15 16:36:47 ab 1.6.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:42:09 +00:00
Jens-Heiner Rechtien
e61146cda4 INTEGRATION: CWS warnings01 (1.13.18); FILE MERGED
2005/12/15 16:36:47 ab 1.13.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:41:58 +00:00
Jens-Heiner Rechtien
b13a504863 INTEGRATION: CWS warnings01 (1.7.18); FILE MERGED
2005/12/15 16:36:46 ab 1.7.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:41:47 +00:00
Jens-Heiner Rechtien
21c9ba1544 INTEGRATION: CWS warnings01 (1.9.18); FILE MERGED
2005/12/15 16:36:46 ab 1.9.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:41:22 +00:00
Jens-Heiner Rechtien
e5b7af88db INTEGRATION: CWS warnings01 (1.6.18); FILE MERGED
2005/12/15 16:36:45 ab 1.6.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:41:11 +00:00
Jens-Heiner Rechtien
af0fada241 INTEGRATION: CWS warnings01 (1.5.18); FILE MERGED
2005/12/15 16:36:45 ab 1.5.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:40:46 +00:00
Jens-Heiner Rechtien
05a63d7dc2 INTEGRATION: CWS warnings01 (1.37.18); FILE MERGED
2006/04/06 14:48:33 ab 1.37.18.2: #i55991# warning-free code
2005/12/15 16:36:44 ab 1.37.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:40:34 +00:00
Jens-Heiner Rechtien
25d738a0a9 INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED
2005/12/15 16:36:44 ab 1.3.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:40:22 +00:00
Jens-Heiner Rechtien
53387a40cf INTEGRATION: CWS warnings01 (1.11.18); FILE MERGED
2005/12/15 16:36:43 ab 1.11.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:40:00 +00:00
Jens-Heiner Rechtien
8a9adeb49b INTEGRATION: CWS warnings01 (1.5.18); FILE MERGED
2005/12/15 16:36:43 ab 1.5.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:39:50 +00:00
Jens-Heiner Rechtien
6f8ee8f17f INTEGRATION: CWS warnings01 (1.2.18); FILE MERGED
2006/04/19 16:00:11 sb 1.2.18.1: #i53898# Removed dead code.
2006-06-19 23:39:39 +00:00
Jens-Heiner Rechtien
722293cb4c INTEGRATION: CWS warnings01 (1.2.194); FILE MERGED
2005/12/15 16:36:43 ab 1.2.194.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:39:28 +00:00
Jens-Heiner Rechtien
0d2c02ce19 INTEGRATION: CWS warnings01 (1.5.18); FILE MERGED
2006/04/06 14:48:33 ab 1.5.18.2: #i55991# warning-free code
2005/12/15 16:36:43 ab 1.5.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:39:17 +00:00
Jens-Heiner Rechtien
2116aa79e9 INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED
2005/12/15 16:36:42 ab 1.3.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:39:06 +00:00
Jens-Heiner Rechtien
dc1d26275c INTEGRATION: CWS warnings01 (1.42.8); FILE MERGED
2006/06/02 09:35:08 abi 1.42.8.3: #i65894# corrected ifdefs
2006/01/25 20:43:04 sb 1.42.8.2: RESYNC: (1.42-1.44); FILE MERGED
2005/12/15 16:36:42 ab 1.42.8.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:38:50 +00:00
Jens-Heiner Rechtien
28ff23a9bc INTEGRATION: CWS warnings01 (1.7.18); FILE MERGED
2005/12/15 16:36:42 ab 1.7.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:38:38 +00:00
Jens-Heiner Rechtien
5d5508967d INTEGRATION: CWS warnings01 (1.16.18); FILE MERGED
2005/12/15 16:36:42 ab 1.16.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:38:27 +00:00
Jens-Heiner Rechtien
eefba5de53 INTEGRATION: CWS warnings01 (1.1.182); FILE MERGED
2006/04/06 14:48:33 ab 1.1.182.1: #i55991# warning-free code
2006-06-19 23:38:15 +00:00
Jens-Heiner Rechtien
8da3218881 INTEGRATION: CWS warnings01 (1.12.18); FILE MERGED
2005/12/15 16:36:41 ab 1.12.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:38:05 +00:00
Jens-Heiner Rechtien
0fc27d7128 INTEGRATION: CWS warnings01 (1.4.18); FILE MERGED
2005/12/15 16:36:41 ab 1.4.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
2006-06-19 23:37:47 +00:00
Jens-Heiner Rechtien
a1e70a7bb5 INTEGRATION: CWS systemjava (1.22.2); FILE MERGED
2006/03/22 14:39:45 cmc 1.22.2.1: #i52974# support using the system xerces/xalan
2006-04-19 14:10:29 +00:00
Vladimir Glazounov
6f75994a7f INTEGRATION: CWS jaxpapi (1.21.2); FILE MERGED
2006/01/19 14:48:36 cmc 1.21.2.1: #i58308# remove sun jaxp impl in favour of apache one
2006-03-16 10:17:16 +00:00
Vladimir Glazounov
7bdd595b4d INTEGRATION: CWS jaxpapi (1.16.20); FILE MERGED
2006/01/17 11:20:47 cmc 1.16.20.1: #i58308# remove sun jaxp impl in favour of apache one
2006-03-16 10:17:04 +00:00
Oliver Bolte
f6212dcc14 INTEGRATION: CWS hr28 (1.20.32); FILE MERGED
2006/01/11 17:01:51 hr 1.20.32.2: #i60366#: remove obsolete file
2006/01/11 16:18:18 hr 1.20.32.1: #i60366#: remove obsolete files, add FileURLStreamHandler.class, GCJFileURLStreamHandler.class, MemoryURLConnection.class, license header
2006-01-16 11:42:15 +00:00
Oliver Bolte
1c2de9fdfa INTEGRATION: CWS hr28 (1.12.150); FILE MERGED
2006/01/11 16:38:53 hr 1.12.150.1: #i60366#: remove helpserver.sh
2006-01-16 11:34:13 +00:00
Kurt Zenker
83174efb88 INTEGRATION: CWS iconswitching1 (1.7.10); FILE MERGED
2005/11/02 00:12:04 kendy 1.7.10.2: RESYNC: (1.7-1.8); FILE MERGED
2005/07/20 14:29:04 kendy 1.7.10.1: #i36518#
Icon switching for the help
2006-01-05 17:18:15 +00:00
Kurt Zenker
2fe932ab98 INTEGRATION: CWS iconswitching1 (1.17.44); FILE MERGED
2005/11/30 14:54:45 kendy 1.17.44.3: RESYNC: (1.18-1.19); FILE MERGED
2005/11/02 00:08:05 kendy 1.17.44.2: RESYNC: (1.17-1.18); FILE MERGED
2005/07/20 14:29:04 kendy 1.17.44.1: #i36518#
Icon switching for the help
2006-01-05 17:18:03 +00:00
Kurt Zenker
76837163c0 INTEGRATION: CWS iconswitching1 (1.41.10); FILE MERGED
2005/11/30 14:54:37 kendy 1.41.10.3: RESYNC: (1.42-1.43); FILE MERGED
2005/11/02 00:07:41 kendy 1.41.10.2: RESYNC: (1.41-1.42); FILE MERGED
2005/07/20 14:29:03 kendy 1.41.10.1: #i36518#
Icon switching for the help
2006-01-05 17:17:52 +00:00
Kurt Zenker
f24bd9a879 INTEGRATION: CWS iconswitching1 (1.8.154); FILE MERGED
2005/11/02 00:05:46 kendy 1.8.154.2: RESYNC: (1.8-1.9); FILE MERGED
2005/07/20 14:29:03 kendy 1.8.154.1: #i36518#
Icon switching for the help
2006-01-05 17:17:40 +00:00
Rüdiger Timm
b4977fc4a9 INTEGRATION: CWS c06 (1.10.170); FILE MERGED
2005/08/24 14:59:54 abi 1.10.170.1: #i53539# no basic help, if org.openoffice.Office.Common/Help/ShowBasic is set to false
2005-11-11 11:17:44 +00:00
Rüdiger Timm
21725aecb2 INTEGRATION: CWS c06 (1.16.14); FILE MERGED
2005/08/24 14:59:54 abi 1.16.14.1: #i53539# no basic help, if org.openoffice.Office.Common/Help/ShowBasic is set to false
2005-11-11 11:17:25 +00:00
Rüdiger Timm
8020163e44 INTEGRATION: CWS c06 (1.17.48); FILE MERGED
2005/08/24 14:59:54 abi 1.17.48.1: #i53539# no basic help, if org.openoffice.Office.Common/Help/ShowBasic is set to false
2005-11-11 11:17:07 +00:00
Rüdiger Timm
2670b02578 INTEGRATION: CWS c06 (1.41.14); FILE MERGED
2005/08/24 14:59:54 abi 1.41.14.1: #i53539# no basic help, if org.openoffice.Office.Common/Help/ShowBasic is set to false
2005-11-11 11:16:51 +00:00
Jens-Heiner Rechtien
2d6ccdacfc INTEGRATION: CWS morejava (1.14.12); FILE MERGED
2005/08/26 14:05:45 fridrich_strba 1.14.12.1: Issue number:
Submitted by:  kendy
Reviewed by:   fridrich_strba
Enable build with java 5 ("enum" is reserved word in jdk 1.5.0)
2005-10-25 10:24:55 +00:00
Jens-Heiner Rechtien
6d7f833990 INTEGRATION: CWS cmcfixes18 (1.8.164); FILE MERGED
2005/09/05 09:51:08 cmc 1.8.164.2: #i54220# add SABLOT build types
2005/09/05 09:45:12 cmc 1.8.164.1: #i54220# add BERKELEYDB build types
2005-09-23 12:48:31 +00:00
Rüdiger Timm
d6f02b8c03 INTEGRATION: CWS ooo19126 (1.7.18); FILE MERGED
2005/09/05 17:19:39 rt 1.7.18.1: #i54170# Change license header: remove SISSL
2005-09-09 11:27:33 +00:00
Rüdiger Timm
d39906d35e INTEGRATION: CWS ooo19126 (1.5.52); FILE MERGED
2005/09/05 17:19:38 rt 1.5.52.1: #i54170# Change license header: remove SISSL
2005-09-09 11:27:15 +00:00
Rüdiger Timm
ec8aeb2ac8 INTEGRATION: CWS ooo19126 (1.7.138); FILE MERGED
2005/09/05 17:19:37 rt 1.7.138.1: #i54170# Change license header: remove SISSL
2005-09-09 11:26:10 +00:00
Rüdiger Timm
c1b2a42a70 INTEGRATION: CWS ooo19126 (1.5.184); FILE MERGED
2005/09/05 17:19:37 rt 1.5.184.1: #i54170# Change license header: remove SISSL
2005-09-09 11:25:50 +00:00
Rüdiger Timm
3646756d29 INTEGRATION: CWS ooo19126 (1.2.184); FILE MERGED
2005/09/05 17:19:37 rt 1.2.184.1: #i54170# Change license header: remove SISSL
2005-09-09 11:25:36 +00:00
Rüdiger Timm
242479d219 INTEGRATION: CWS ooo19126 (1.4.182); FILE MERGED
2005/09/05 17:19:36 rt 1.4.182.1: #i54170# Change license header: remove SISSL
2005-09-09 11:25:23 +00:00