Commit Graph

325 Commits

Author SHA1 Message Date
Rüdiger Timm
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
Rüdiger Timm
caeb15ea7d #i10000# Last time I obviously remove too much :-( 2004-07-14 12:59:37 +00:00
Rüdiger Timm
1386b8fdd5 #i10000# Wrongly resolved merge conflict: OColumnWrapperImport was implemented twice. 2004-07-14 08:23:48 +00:00
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Oliver Bolte
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
Hans-Joachim Lankenau
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
Hans-Joachim Lankenau
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
Jens-Heiner Rechtien
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
Rüdiger Timm
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
Rüdiger Timm
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
Rüdiger Timm
7eaddc7cd6 INTEGRATION: CWS frmcontrols03 (1.18.52); FILE MERGED
2004/03/02 09:51:21 fs 1.18.52.1: #i24387# proper im/export of a rich text control
2004-05-07 15:00:04 +00:00
Rüdiger Timm
98a89f2805 INTEGRATION: CWS frmcontrols03 (1.21.150); FILE MERGED
2004/02/17 15:39:08 fs 1.21.150.1: #i24387# analyze text styles of a rich text control
2004-05-07 14:59:52 +00:00
Rüdiger Timm
fbb4a8a70a INTEGRATION: CWS frmcontrols03 (1.21.52); FILE MERGED
2004/03/02 09:51:21 fs 1.21.52.2: #i24387# proper im/export of a rich text control
2004/02/17 15:38:38 fs 1.21.52.1: #i24387# import text paragraphs of a rich text control
2004-05-07 14:59:41 +00:00
Rüdiger Timm
1274855879 INTEGRATION: CWS frmcontrols03 (1.37.52); FILE MERGED
2004/03/02 09:51:21 fs 1.37.52.2: #i24387# proper im/export of a rich text control
2004/02/17 15:38:38 fs 1.37.52.1: #i24387# import text paragraphs of a rich text control
2004-05-07 14:59:30 +00:00
Rüdiger Timm
f114b49bcd INTEGRATION: CWS frmcontrols03 (1.27.52); FILE MERGED
2004/04/28 14:27:41 fs 1.27.52.4: RESYNC: (1.27-1.29); FILE MERGED
2004/04/15 06:59:58 fs 1.27.52.3: #i27729# don't export CharCrossedOut property for text areas
2004/03/02 09:51:20 fs 1.27.52.2: #i24387# proper im/export of a rich text control
2004/02/17 15:38:09 fs 1.27.52.1: #i24387# export text paragraphs of a rich text control
2004-05-07 14:59:18 +00:00
Rüdiger Timm
e8c19198f4 INTEGRATION: CWS binfilter (1.17.50); FILE MERGED
2004/02/05 15:02:53 aw 1.17.50.4: RESYNC: (1.18-1.19); FILE MERGED
2003/10/30 12:15:13 aw 1.17.50.3: RESYNC: (1.17-1.18); FILE MERGED
2003/07/08 17:32:55 aw 1.17.50.2: #110680#
2003/07/07 15:46:18 aw 1.17.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:35:32 +00:00
Rüdiger Timm
2cd87dc89b INTEGRATION: CWS binfilter (1.21.34); FILE MERGED
2003/07/08 17:32:54 aw 1.21.34.2: #110680#
2003/07/07 15:46:18 aw 1.21.34.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:35:19 +00:00
Jens-Heiner Rechtien
ac23628389 INTEGRATION: CWS frmcontrols02 (1.27.34); FILE MERGED
2004/02/02 08:01:30 fs 1.27.34.1: #i24409# explicitly care for navigation bars
2004-04-13 10:05:13 +00:00
Rüdiger Timm
5a9b830159 INTEGRATION: CWS frmvalidation (1.13.58); FILE MERGED
2004/03/12 08:28:58 fs 1.13.58.1: moved the services related to binding controls to external values from drafts.com.sun.star.form/component to com.sun.star.form.binding
2004-04-02 09:31:37 +00:00
Rüdiger Timm
fe6334e9a4 INTEGRATION: CWS frmvalidation (1.17.76); FILE MERGED
2004/03/12 08:28:57 fs 1.17.76.1: moved the services related to binding controls to external values from drafts.com.sun.star.form/component to com.sun.star.form.binding
2004-04-02 09:31:26 +00:00
Rüdiger Timm
9aabfd2c9a INTEGRATION: CWS frmvalidation (1.2.80); FILE MERGED
2004/03/12 08:28:56 fs 1.2.80.1: moved the services related to binding controls to external values from drafts.com.sun.star.form/component to com.sun.star.form.binding
2004-04-02 09:31:10 +00:00
Rüdiger Timm
8af709a7b1 INTEGRATION: CWS frmvalidation (1.3.54); FILE MERGED
2004/03/12 08:28:55 fs 1.3.54.1: moved the services related to binding controls to external values from drafts.com.sun.star.form/component to com.sun.star.form.binding
2004-04-02 09:30:57 +00:00
Rüdiger Timm
ad679bc577 INTEGRATION: CWS frmvalidation (1.27.58); FILE MERGED
2004/03/12 08:28:55 fs 1.27.58.1: moved the services related to binding controls to external values from drafts.com.sun.star.form/component to com.sun.star.form.binding
2004-04-02 09:30:45 +00:00