485b66cde4
#i10000# mergeconflicts buildable resolved
2004-07-07 09:08:42 +00:00
fd9bf4d4ca
INTEGRATION: CWS docking1 (1.17.34); FILE MERGED
...
2004/06/15 14:59:10 gh 1.17.34.1: #i29531#add support for string ids to acces UI elements. Needed for new ToolBoxes
2004-07-06 12:23:45 +00:00
e44dc76995
INTEGRATION: CWS docking1 (1.53.36); FILE MERGED
...
2004/07/06 10:01:51 cd 1.53.36.3: RESYNC manually
2004/06/15 14:59:10 gh 1.53.36.2: #i29531#add support for string ids to acces UI elements. Needed for new ToolBoxes
2004/05/27 15:19:18 gh 1.53.36.1: compensate libraries which have been renamed
2004-07-06 12:23:29 +00:00
ee6fd2f98e
INTEGRATION: CWS mergebuild (1.38.18); FILE MERGED
...
2004/04/21 00:12:53 hjs 1.38.18.3: RESYNC: (1.38-1.39); FILE MERGED
2003/11/11 19:15:34 ihi 1.38.18.2: en -> en-US
2003/11/10 16:44:09 ihi 1.38.18.1: #111234# Merge during build
2004-06-25 15:29:39 +00:00
bfcd535c9a
INTEGRATION: CWS mergebuild (1.6.2); FILE MERGED
...
2004/01/29 13:52:59 hjs 1.6.2.1: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun:⭐ :lang::Locale
2004-06-25 15:29:14 +00:00
923e09f66b
INTEGRATION: CWS mergebuild (1.15.2); FILE MERGED
...
2004/04/21 00:11:19 hjs 1.15.2.4: RESYNC: (1.15-1.17); FILE MERGED
2004/01/29 13:57:25 hjs 1.15.2.3: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun:⭐ :lang::Locale
2004/01/29 13:56:58 hjs 1.15.2.2: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun:⭐ :lang::Locale
2004/01/29 13:52:55 hjs 1.15.2.1: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun:⭐ :lang::Locale
2004-06-25 15:28:52 +00:00
6168721cb3
INTEGRATION: CWS gh6 (1.6.100); FILE MERGED
...
2004/05/18 12:40:25 gh 1.6.100.1: #116401# allow setting of environment variables for childprocesses from BASIC
2004-06-17 10:47:29 +00:00
24fd00c961
INTEGRATION: CWS gh6 (1.4.114); FILE MERGED
...
2004/05/05 15:37:36 gh 1.4.114.1: #116221#limit size of resultfile
2004-06-17 10:47:17 +00:00
e452f192d7
INTEGRATION: CWS gh6 (1.15.16); FILE MERGED
...
2004/05/05 15:37:36 gh 1.15.16.3: #116221#limit size of resultfile
2004/03/08 13:10:51 gh 1.15.16.2: #109333#add userdata earlier so the type is already available in the Paint
2004/03/08 10:44:16 gh 1.15.16.1: #112055# warnings are more important than qaErrors
2004-06-17 10:47:06 +00:00
e8039879b1
INTEGRATION: CWS gh6 (1.8.24); FILE MERGED
...
2004/03/08 16:01:41 gh 1.8.24.1: #i20002#new look and feel of About Box
2004-06-17 10:46:53 +00:00
8f42f0fc16
INTEGRATION: CWS gh6 (1.17.16); FILE MERGED
...
2004/03/08 16:01:41 gh 1.17.16.1: #i20002#new look and feel of About Box
2004-06-17 10:46:37 +00:00
fe11098ada
INTEGRATION: CWS gh6 (1.53.128); FILE MERGED
...
2004/06/08 14:19:04 gh 1.53.128.3: #i20002# changed from (R) to (C)
2004/04/02 10:11:37 gh 1.53.128.2: #i26908#comment out unused menu entry
2004/03/08 16:01:40 gh 1.53.128.1: #i20002#new look and feel of About Box
2004-06-17 10:46:25 +00:00
8fa4530cb9
INTEGRATION: CWS gh6 (1.3.32); FILE MERGED
...
2004/05/06 10:01:55 gh 1.3.32.1: #116440#make automatically started scripts more unattended
2004-06-17 10:46:10 +00:00
b10e4e5c27
INTEGRATION: CWS gh6 (1.4.162); FILE MERGED
...
2004/05/06 10:01:54 gh 1.4.162.3: #116440#make automatically started scripts more unattended
2004/05/05 15:53:50 gh 1.4.162.2: #i26967#show filename in 'not found' dialog
2004/05/05 15:35:56 gh 1.4.162.1: #i26967#show filename in 'not found' dialog
2004-06-17 10:45:56 +00:00
6431d63c9d
INTEGRATION: CWS gh6 (1.5.156); FILE MERGED
...
2004/05/12 11:25:48 gh 1.5.156.1: #i29082#recompile after reload of sources
2004-06-17 10:45:41 +00:00
359262b037
INTEGRATION: CWS gh6 (1.7.162); FILE MERGED
...
2004/05/05 10:09:31 gh 1.7.162.1: #108007#Get focus handling better
2004-06-17 10:45:28 +00:00
bfe49c642d
INTEGRATION: CWS gh6 (1.53.16); FILE MERGED
...
2004/05/27 15:22:53 gh 1.53.16.6: compensate libraries which have been renamed
2004/05/06 10:01:53 gh 1.53.16.5: #116440#make automatically started scripts more unattended
2004/05/05 15:37:36 gh 1.53.16.4: #116221#limit size of resultfile
2004/05/05 10:09:31 gh 1.53.16.3: #108007#Get focus handling better
2004/05/03 16:21:01 gh 1.53.16.2: #i26798# run even when resultfile has focus
2004/03/08 16:02:24 gh 1.53.16.1: fix compiler warnings
2004-06-17 10:45:16 +00:00
954bf14be0
INTEGRATION: CWS gh6 (1.12.6); FILE MERGED
...
2004/05/06 10:02:35 gh 1.12.6.1: remove delivering testtool.res since it is not used since ages
2004-06-17 10:45:02 +00:00
068e603230
INTEGRATION: CWS sb18 (1.12.16); FILE MERGED
...
2004/05/18 11:09:49 sb 1.12.16.1: #i21150# Added new syntax: dim as ....
2004-06-03 13:33:07 +00:00
7d336b291b
INTEGRATION: CWS ab08fixes (1.16.2); FILE MERGED
...
2004/04/02 08:24:25 ab 1.16.2.1: #i18989# Made dim handling in DimArray() and Array() consistant to Dim command
2004-05-28 13:35:12 +00:00
ec6057b9b1
INTEGRATION: CWS ab08fixes (1.16.2); FILE MERGED
...
2004/05/18 11:23:48 ab 1.16.2.1: #i16341# Fixed addLines() method
2004-05-28 13:34:58 +00:00
3cdc65b28c
INTEGRATION: CWS bmpres01 (1.12.148); FILE MERGED
...
2004/04/27 14:30:54 ka 1.12.148.1: using new resource structure for images
2004-05-21 10:49:35 +00:00
8027621b47
INTEGRATION: CWS bmpres01 (1.53.148); FILE MERGED
...
2004/04/27 14:30:53 ka 1.53.148.1: using new resource structure for images
2004-05-21 10:49:22 +00:00
2297005daa
INTEGRATION: CWS jl5vba (1.10.82); FILE MERGED
...
2004/02/13 16:18:28 ab 1.10.82.2: #115448# Dim/Private only active under compatibility mode
2004/01/21 10:26:10 ab 1.10.82.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.10.4)
2004-03-17 12:37:42 +00:00
cc6a1ab920
INTEGRATION: CWS jl5vba (1.6.110); FILE MERGED
...
2004/01/21 10:23:50 ab 1.6.110.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.6.22)
2004-03-17 12:37:26 +00:00
1115db9447
INTEGRATION: CWS jl5vba (1.15.92); FILE MERGED
...
2004/01/21 10:22:48 ab 1.15.92.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.15.14)
2004-03-17 12:37:12 +00:00
f7084f49ac
INTEGRATION: CWS jl5vba (1.11.138); FILE MERGED
...
2004/01/21 10:06:45 ab 1.11.138.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.11.52)
2004-03-17 12:37:00 +00:00
762e3647d2
INTEGRATION: CWS jl5vba (1.14.110); FILE MERGED
...
2004/01/21 10:01:07 ab 1.14.110.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.14.22)
2004-03-17 12:36:46 +00:00
84f829ebd7
INTEGRATION: CWS jl5vba (1.8.138); FILE MERGED
...
2004/01/21 09:59:18 ab 1.8.138.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.8.52)
2004-03-17 12:36:33 +00:00
3fb69dfef2
INTEGRATION: CWS jl5vba (1.15.6); FILE MERGED
...
2004/01/21 09:47:40 ab 1.15.6.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.14.4)
2004-03-17 12:36:19 +00:00
8163ffd1fd
INTEGRATION: CWS jl5vba (1.52.6); FILE MERGED
...
2004/01/21 09:46:42 ab 1.52.6.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.51.4)
2004-03-17 12:36:05 +00:00
57000f74e0
INTEGRATION: CWS jl5vba (1.2.94); FILE MERGED
...
2004/01/21 09:39:37 ab 1.2.94.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.2.6)
2004-03-17 12:35:49 +00:00
c474f71563
INTEGRATION: CWS jl5vba (1.3.142); FILE MERGED
...
2004/01/21 09:32:38 ab 1.3.142.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.3.56)
2004-03-17 12:35:29 +00:00
9cdb73ff28
INTEGRATION: CWS jl5vba (1.25.94); FILE MERGED
...
2004/01/20 15:48:58 ab 1.25.94.1: #111934# Merge to src680, for tasks see merge message for CWS ab02vba (1.25.6)
2004-03-17 12:35:23 +00:00
d4294c127a
INTEGRATION: CWS jl5vba (1.3.94); FILE MERGED
...
2004/01/21 09:28:59 ab 1.3.94.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.3.6)
2004-03-17 12:35:14 +00:00
34bb807184
INTEGRATION: CWS jl5vba (1.6.94); FILE MERGED
...
2004/01/21 09:28:00 ab 1.6.94.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.6.6)
2004-03-17 12:35:00 +00:00
fd6ff91d5b
INTEGRATION: CWS jl5vba (1.4.6); FILE MERGED
...
2004/01/21 09:24:39 ab 1.4.6.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.3.22)
2004-03-17 12:34:46 +00:00
bf1c855eb6
INTEGRATION: CWS jl5vba (1.16.110); FILE MERGED
...
2004/01/21 09:23:14 ab 1.16.110.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.16.22)
2004-03-17 12:34:32 +00:00
48e50e3fef
INTEGRATION: CWS jl5vba (1.1.1.1.182); FILE MERGED
...
2004/01/21 09:22:20 ab 1.1.1.1.182.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.1.1.1.96)
2004-03-17 12:34:18 +00:00
05dba8e2ce
INTEGRATION: CWS jl5vba (1.4.94); FILE MERGED
...
2004/01/21 09:08:10 ab 1.4.94.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.4.6)
2004-03-17 12:34:05 +00:00
6e6f4b16b3
INTEGRATION: CWS jl5vba (1.6.16); FILE MERGED
...
2004/01/21 09:06:00 ab 1.6.16.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.5.22)
2004-03-17 12:33:51 +00:00
82bd05da2a
INTEGRATION: CWS jl5vba (1.8.94); FILE MERGED
...
2004/01/21 09:03:01 ab 1.8.94.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.8.6)
2004-03-17 12:33:38 +00:00
cc83b70dbc
INTEGRATION: CWS jl5vba (1.5.82); FILE MERGED
...
2004/01/21 08:58:21 ab 1.5.82.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.5.4)
2004-03-17 12:33:25 +00:00
c21f9dd596
INTEGRATION: CWS jl5vba (1.6.82); FILE MERGED
...
2004/01/21 08:51:05 ab 1.6.82.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.6.4)
2004-03-17 12:33:10 +00:00
64eea10dbb
INTEGRATION: CWS jl5vba (1.11.16); FILE MERGED
...
2004/02/13 16:34:33 ab 1.11.16.2: #115449# Handle local ReDim command correctly
2004/01/21 08:16:47 ab 1.11.16.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.10.4)
2004-03-17 12:32:57 +00:00
7985cc6961
INTEGRATION: CWS jl5vba (1.2.144); FILE MERGED
...
2004/01/21 08:42:10 ab 1.2.144.1: #111934# Merge to src680, for tasks see message INTEGRATION: CWS ab02vba (1.2.58)
2004-03-17 12:32:41 +00:00
1d2589fcab
INTEGRATION: CWS jl5vba (1.15.72); FILE MERGED
...
2004/01/20 15:38:22 ab 1.15.72.1: #111934# Merge #111741# User defined types #112369# Decimal type #109170# Recursion limit
2004-03-17 12:32:25 +00:00
8308f6ddfe
INTEGRATION: CWS jl5vba (1.4.6); FILE MERGED
...
2004/01/20 15:30:39 ab 1.4.6.1: #111934# Merge #111741# User defined types #111851# OLE support
2004-03-17 12:32:02 +00:00
1f36eca1d7
INTEGRATION: CWS jl5vba (1.15.6); FILE MERGED
...
2004/01/20 15:25:35 ab 1.15.6.1: #111934# Merge #111741# User defined types #111851# OLE support
2004-03-17 12:31:48 +00:00
20d35b3baf
INTEGRATION: CWS tl02 (1.25.58); FILE MERGED
...
2003/10/31 10:19:55 tl 1.25.58.1: #112502# SbxType -> Uno fixed
2004-03-17 08:37:16 +00:00
