738afad303
INTEGRATION: CWS ooo20040704 (1.38.36); FILE MERGED
...
2004/08/09 14:59:28 vg 1.38.36.3: RESYNC MERGED 1.39 1.42
Everything below this line will be added to the revision comment.
2004/07/20 07:16:10 svesik 1.38.36.2: RESYNC: (1.38-1.39); FILE MERGED
2004/06/28 14:59:38 cmc 1.38.36.1: #i30801# allow using system stl if possible
2004-09-08 13:58:49 +00:00
bdd214717c
INTEGRATION: CWS insight01 (1.17.8); FILE MERGED
...
2004/07/23 13:23:49 oj 1.17.8.2: RESYNC: (1.17-1.20); FILE MERGED
2004/02/20 11:15:30 oj 1.17.8.1: #i25414# extend form file format for form:datasource
2004-08-02 13:15:52 +00:00
5ae1d7a19e
INTEGRATION: CWS insight01 (1.22.98); FILE MERGED
...
2004/07/23 13:23:18 oj 1.22.98.4: RESYNC: (1.23-1.25); FILE MERGED
2004/02/20 11:15:30 oj 1.22.98.3: #i25414# extend form file format for form:datasource
2004/01/02 20:26:46 oj 1.22.98.2: RESYNC: (1.22-1.23); FILE MERGED
2003/12/17 10:49:12 oj 1.22.98.1: #111075# changes for the new database export/import filter
2004-08-02 13:15:40 +00:00
e9550097ed
INTEGRATION: CWS insight01 (1.3.98); FILE MERGED
...
2004/02/20 11:15:31 oj 1.3.98.1: #i25414# extend form file format for form:datasource
2004-08-02 13:15:26 +00:00
1adebc8382
INTEGRATION: CWS insight01 (1.6.98); FILE MERGED
...
2004/02/20 11:15:31 oj 1.6.98.1: #i25414# extend form file format for form:datasource
2004-08-02 13:15:14 +00:00
a9bffe3394
INTEGRATION: CWS insight01 (1.12.20); FILE MERGED
...
2004/07/23 13:22:53 oj 1.12.20.2: RESYNC: (1.12-1.13); FILE MERGED
2004/02/20 11:15:31 oj 1.12.20.1: #i25414# extend form file format for form:datasource
2004-08-02 13:15:02 +00:00
e75a7b1832
INTEGRATION: CWS insight01 (1.9.8); FILE MERGED
...
2004/07/23 13:24:19 oj 1.9.8.2: RESYNC: (1.9-1.10); FILE MERGED
2004/02/20 11:15:31 oj 1.9.8.1: #i25414# extend form file format for form:datasource
2004-08-02 13:14:49 +00:00
9ffe16d92d
INTEGRATION: CWS insight01 (1.13.8); FILE MERGED
...
2004/07/23 13:24:08 oj 1.13.8.2: RESYNC: (1.13-1.15); FILE MERGED
2004/02/20 11:15:32 oj 1.13.8.1: #i25414# extend form file format for form:datasource
2004-08-02 13:14:36 +00:00
c2e662e188
INTEGRATION: CWS insight01 (1.21.8); FILE MERGED
...
2004/07/23 13:22:07 oj 1.21.8.3: RESYNC: (1.22-1.24); FILE MERGED
2004/05/28 10:40:36 oj 1.21.8.2: RESYNC: (1.21-1.22); FILE MERGED
2004/02/20 11:15:32 oj 1.21.8.1: #i25414# extend form file format for form:datasource
2004-08-02 13:14:23 +00:00
2cb0e9376d
INTEGRATION: CWS insight01 (1.37.8); FILE MERGED
...
2004/07/23 13:20:54 oj 1.37.8.4: RESYNC: (1.38-1.42); FILE MERGED
2004/06/11 08:44:14 oj 1.37.8.3: file format changes for connection-resource
2004/05/28 10:40:05 oj 1.37.8.2: RESYNC: (1.37-1.38); FILE MERGED
2004/02/20 11:15:32 oj 1.37.8.1: #i25414# extend form file format for form:datasource
2004-08-02 13:14:10 +00:00
c532392c6d
INTEGRATION: CWS insight01 (1.9.20); FILE MERGED
...
2004/07/23 13:23:58 oj 1.9.20.4: RESYNC: (1.10-1.11); FILE MERGED
2004/07/06 09:22:19 oj 1.9.20.3: RESYNC: (1.9-1.10); FILE MERGED
2004/06/11 08:44:14 oj 1.9.20.2: file format changes for connection-resource
2004/02/20 11:15:33 oj 1.9.20.1: #i25414# extend form file format for form:datasource
2004-08-02 13:13:56 +00:00
e7167518ab
INTEGRATION: CWS insight01 (1.27.8); FILE MERGED
...
2004/07/23 20:33:49 oj 1.27.8.7: merge problems
2004/07/23 13:23:28 oj 1.27.8.6: RESYNC: (1.32-1.34); FILE MERGED
2004/07/08 05:35:27 oj 1.27.8.5: merge conflicts
2004/07/06 09:21:58 oj 1.27.8.4: RESYNC: (1.31-1.32); FILE MERGED
2004/06/11 08:44:15 oj 1.27.8.3: file format changes for connection-resource
2004/05/28 10:40:58 oj 1.27.8.2: RESYNC: (1.27-1.31); FILE MERGED
2004/02/20 11:15:33 oj 1.27.8.1: #i25414# extend form file format for form:datasource
2004-08-02 13:13:42 +00:00
b10f500456
INTEGRATION: CWS gcc340fixes01 (1.4.334); FILE MERGED
...
2004/07/13 20:28:08 fa 1.4.334.1: #i31445# explicitly scope data member to satisfy gcc 3.4
2004-07-30 14:04:34 +00:00
0ae91bb98f
#i10000# Merge error: AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ) was missing in case of DBG_UTIL
2004-07-14 13:33:58 +00:00
caeb15ea7d
#i10000# Last time I obviously remove too much :-(
2004-07-14 12:59:37 +00:00
1386b8fdd5
#i10000# Wrongly resolved merge conflict: OColumnWrapperImport was implemented twice.
2004-07-14 08:23:48 +00:00
facc2c15b3
INTEGRATION: CWS oasis (1.17.62); FILE MERGED
...
2004/06/08 14:49:19 mib 1.17.62.1: - #i20153#: form controls
2004-07-13 07:31:11 +00:00
5c270c7ba2
INTEGRATION: CWS oasis (1.21.62); FILE MERGED
...
2004/06/12 19:41:47 mib 1.21.62.2: RESYNC: (1.21-1.22); FILE MERGED
2004/06/08 14:49:17 mib 1.21.62.1: - #i20153#: form controls
2004-07-13 07:30:15 +00:00
4252345c32
INTEGRATION: CWS oasis (1.37.62); FILE MERGED
...
2004/06/21 09:12:33 mib 1.37.62.5: #i20153#: meta generator, service names for chart and forms
2004/06/15 16:53:45 mib 1.37.62.4: #i20153#: merge conflicts + syntax
2004/06/14 09:07:10 mib 1.37.62.3: RESYNC: (1.37-1.38); FILE MERGED
2004/06/08 14:49:17 mib 1.37.62.2: - #i20153#: form controls
2004/05/28 16:37:59 mib 1.37.62.1: - #i20153#: Events
2004-07-13 07:29:16 +00:00
20a3d6357e
INTEGRATION: CWS oasis (1.13.62); FILE MERGED
...
2004/06/12 19:42:35 mib 1.13.62.2: RESYNC: (1.13-1.14); FILE MERGED
2004/06/08 14:49:20 mib 1.13.62.1: - #i20153#: form controls
2004-07-13 07:15:24 +00:00
96020a2b2c
INTEGRATION: CWS oasis (1.18.62); FILE MERGED
...
2004/06/14 09:07:22 mib 1.18.62.2: RESYNC: (1.18-1.19); FILE MERGED
2004/06/08 14:49:19 mib 1.18.62.1: - #i20153#: form controls
2004-07-13 07:15:07 +00:00
258b7d2d0d
INTEGRATION: CWS oasis (1.23.60); FILE MERGED
...
2004/06/08 14:49:19 mib 1.23.60.1: - #i20153#: form controls
2004-07-13 07:14:38 +00:00
025db149e2
INTEGRATION: CWS oasis (1.17.80); FILE MERGED
...
2004/06/12 19:42:26 mib 1.17.80.2: RESYNC: (1.17-1.18); FILE MERGED
2004/06/08 14:49:19 mib 1.17.80.1: - #i20153#: form controls
2004-07-13 07:14:21 +00:00
6f6c3d19a9
INTEGRATION: CWS oasis (1.12.66); FILE MERGED
...
2004/06/08 14:49:18 mib 1.12.66.1: - #i20153#: form controls
2004-07-13 07:14:05 +00:00
65c45d1fe4
INTEGRATION: CWS oasis (1.19.60); FILE MERGED
...
2004/06/12 19:42:19 mib 1.19.60.2: RESYNC: (1.19-1.20); FILE MERGED
2004/06/08 14:49:18 mib 1.19.60.1: - #i20153#: form controls
2004-07-13 07:13:41 +00:00
9d005d20dc
INTEGRATION: CWS oasis (1.21.162); FILE MERGED
...
2004/06/12 19:42:12 mib 1.21.162.2: RESYNC: (1.21-1.23); FILE MERGED
2004/06/08 14:49:18 mib 1.21.162.1: - #i20153#: form controls
2004-07-13 07:13:21 +00:00
2647c7f2de
INTEGRATION: CWS oasis (1.11.66); FILE MERGED
...
2004/06/08 14:49:18 mib 1.11.66.1: - #i20153#: form controls
2004-07-13 07:13:03 +00:00
48c2185856
INTEGRATION: CWS oasis (1.2.62); FILE MERGED
...
2004/06/02 10:53:57 mib 1.2.62.2: - #i20153#: continued events
2004/05/28 16:38:00 mib 1.2.62.1: - #i20153#: Events
2004-07-13 07:12:38 +00:00
d4fe677d3f
INTEGRATION: CWS oasis (1.13.62); FILE MERGED
...
2004/06/21 09:12:34 mib 1.13.62.2: #i20153#: meta generator, service names for chart and forms
2004/06/08 14:49:17 mib 1.13.62.1: - #i20153#: form controls
2004-07-13 07:12:19 +00:00
eb0a19542d
INTEGRATION: CWS oasis (1.27.62); FILE MERGED
...
2004/06/21 09:12:33 mib 1.27.62.3: #i20153#: meta generator, service names for chart and forms
2004/06/12 19:41:36 mib 1.27.62.2: RESYNC: (1.27-1.31); FILE MERGED
2004/06/08 14:49:17 mib 1.27.62.1: - #i20153#: form controls
2004-07-13 07:11:47 +00:00
8e11c5e07c
INTEGRATION: CWS oasis (1.18.62); FILE MERGED
...
2004/05/21 15:00:29 mib 1.18.62.2: - #i20153#: changed underline, line-through and tab-stop
2004/04/07 11:49:54 mib 1.18.62.1: splitted <properties>
2004-07-13 07:11:28 +00:00
b3fbf8b1bf
INTEGRATION: CWS frmcontrols04 (1.13.10); FILE MERGED
...
2004/06/15 21:34:25 fs 1.13.10.3: RESYNC: (1.13-1.15); FILE MERGED
2004/05/06 12:25:40 fs 1.13.10.2: #i26047# import and export of the ImagePosition property
2004/05/05 14:15:57 fs 1.13.10.1: #i24683# #i24685# #i24688# new attributes reflecting new properties
2004-07-05 15:10:23 +00:00
0071eac57b
INTEGRATION: CWS frmcontrols04 (1.17.96); FILE MERGED
...
2004/05/06 12:25:40 fs 1.17.96.1: #i26047# import and export of the ImagePosition property
2004-07-05 15:10:09 +00:00
45995cebf4
INTEGRATION: CWS frmcontrols04 (1.23.94); FILE MERGED
...
2004/05/06 12:25:39 fs 1.23.94.1: #i26047# import and export of the ImagePosition property
2004-07-05 15:09:54 +00:00
a4be8bf078
INTEGRATION: CWS frmcontrols04 (1.19.94); FILE MERGED
...
2004/06/15 21:34:44 fs 1.19.94.2: RESYNC: (1.19-1.20); FILE MERGED
2004/05/05 14:15:57 fs 1.19.94.1: #i24683# #i24685# #i24688# new attributes reflecting new properties
2004-07-05 15:09:35 +00:00
ec757a2d64
INTEGRATION: CWS frmcontrols04 (1.9.96); FILE MERGED
...
2004/05/06 12:25:39 fs 1.9.96.2: #i26047# import and export of the ImagePosition property
2004/05/05 14:15:57 fs 1.9.96.1: #i24683# #i24685# #i24688# new attributes reflecting new properties
2004-07-05 15:09:20 +00:00
a0aa9d0f11
INTEGRATION: CWS frmcontrols04 (1.11.96); FILE MERGED
...
2004/05/06 12:25:39 fs 1.11.96.2: #i26047# import and export of the ImagePosition property
2004/05/05 14:15:56 fs 1.11.96.1: #i24683# #i24685# #i24688# new attributes reflecting new properties
2004-07-05 15:09:05 +00:00
610905e0a6
INTEGRATION: CWS frmcontrols04 (1.9.96); FILE MERGED
...
2004/05/06 12:25:38 fs 1.9.96.2: #i26047# import and export of the ImagePosition property
2004/05/05 14:15:56 fs 1.9.96.1: #i24683# #i24685# #i24688# new attributes reflecting new properties
2004-07-05 15:08:51 +00:00
9e2a2c18e8
INTEGRATION: CWS frmcontrols04 (1.13.96); FILE MERGED
...
2004/05/05 14:15:56 fs 1.13.96.1: #i24683# #i24685# #i24688# new attributes reflecting new properties
2004-07-05 15:08:29 +00:00
49e897ad39
INTEGRATION: CWS frmcontrols04 (1.21.96); FILE MERGED
...
2004/06/15 21:35:27 fs 1.21.96.2: RESYNC: (1.21-1.22); FILE MERGED
2004/05/06 12:25:38 fs 1.21.96.1: #i26047# import and export of the ImagePosition property
2004-07-05 15:08:14 +00:00
698d0fd8c2
INTEGRATION: CWS frmcontrols04 (1.37.96); FILE MERGED
...
2004/06/15 21:34:33 fs 1.37.96.2: RESYNC: (1.37-1.38); FILE MERGED
2004/05/06 12:25:38 fs 1.37.96.1: #i26047# import and export of the ImagePosition property
2004-07-05 15:07:58 +00:00
ab2db1b422
INTEGRATION: CWS frmcontrols04 (1.9.98); FILE MERGED
...
2004/07/05 10:02:10 fs 1.9.98.2: RESYNC: (1.9-1.10); FILE MERGED
2004/05/06 12:25:37 fs 1.9.98.1: #i26047# import and export of the ImagePosition property
2004-07-05 15:07:41 +00:00
52e20d93ee
INTEGRATION: CWS frmcontrols04 (1.27.10); FILE MERGED
...
2004/07/05 09:56:46 fs 1.27.10.4: RESYNC: (1.31-1.32); FILE MERGED
2004/06/15 21:36:12 fs 1.27.10.3: RESYNC: (1.27-1.31); FILE MERGED
2004/05/06 12:25:37 fs 1.27.10.2: #i26047# import and export of the ImagePosition property
2004/05/05 14:15:56 fs 1.27.10.1: #i24683# #i24685# #i24688# new attributes reflecting new properties
2004-07-05 15:07:26 +00:00
7c71a79472
INTEGRATION: CWS frmcontrols04 (1.18.96); FILE MERGED
...
2004/04/29 13:54:40 fs 1.18.96.2: #i24694# control border color now exported as part of the fo:border attribute
2004/04/29 11:56:47 fs 1.18.96.1: #i24694# BorderColor
2004-07-05 15:07:11 +00:00
d7f1f94cf0
INTEGRATION: CWS frmcontrols04 (1.10.312); FILE MERGED
...
2004/04/29 13:54:40 fs 1.10.312.1: #i24694# control border color now exported as part of the fo:border attribute
2004-07-05 15:06:44 +00:00
0ad06296cf
INTEGRATION: CWS dba12 (1.9.106); FILE MERGED
...
2004/05/17 12:06:51 fs 1.9.106.1: #i29644# don't export current-value and list entries if they're not provided by the user, but implicitly obtained from another source (such as a database, or an external binding/list source supplier)
2004-06-28 16:04:51 +00:00
cd2896adca
INTEGRATION: CWS dba12 (1.29.30); FILE MERGED
...
2004/06/14 12:25:42 fs 1.29.30.2: RESYNC: (1.29-1.31); FILE MERGED
2004/05/17 12:06:52 fs 1.29.30.1: #i29644# don't export current-value and list entries if they're not provided by the user, but implicitly obtained from another source (such as a database, or an external binding/list source supplier)
2004-06-28 16:04:36 +00:00
abb42dd283
INTEGRATION: CWS dba09 (1.27.76); FILE MERGED
...
2004/04/27 07:59:49 fs 1.27.76.2: RESYNC: (1.27-1.29); FILE MERGED
2004/03/17 10:00:38 fs 1.27.76.1: #i23388# initialize m_eType
2004-05-10 12:11:36 +00:00
0bc3e33b82
INTEGRATION: CWS frmcontrols03 (1.13.52); FILE MERGED
...
2004/04/28 14:27:22 fs 1.13.52.2: RESYNC: (1.13-1.14); FILE MERGED
2004/03/02 09:51:22 fs 1.13.52.1: #i24387# proper im/export of a rich text control
2004-05-07 15:00:26 +00:00
13b06df7e2
INTEGRATION: CWS frmcontrols03 (1.13.52); FILE MERGED
...
2004/03/02 09:51:22 fs 1.13.52.1: #i24387# proper im/export of a rich text control
2004-05-07 15:00:15 +00:00
