Commit Graph

348 Commits

Author SHA1 Message Date
34bef5a78e INTEGRATION: CWS mav09 (1.7.34); FILE MERGED
2004/08/26 15:03:56 mav 1.7.34.1: #i27773# do not store model, in future object could be stored here
2004-10-04 17:11:04 +00:00
f9fb3caaa3 INTEGRATION: CWS ooo20040704 (1.30.46); FILE MERGED
2004/08/09 14:58:41 vg 1.30.46.3: RESYNC MERGED 1.31 1.32
Everything below this line will be added to the revision comment.
2004/07/20 07:11:41 svesik 1.30.46.2: RESYNC: (1.30-1.31); FILE MERGED
2004/07/03 14:30:58 waratah 1.30.46.1: #i30874# Correct uninitiliased warnings
2004-09-08 13:57:03 +00:00
bb129db991 INTEGRATION: CWS dr12 (1.102.8); FILE MERGED
2004/08/27 07:37:56 sab 1.102.8.4: RESYNC: (1.106-1.107); FILE MERGED
2004/08/12 11:19:04 sab 1.102.8.3: RESYNC: (1.105-1.106); FILE MERGED
2004/07/26 11:26:46 sab 1.102.8.2: RESYNC: (1.102-1.105); FILE MERGED
2004/07/23 20:59:42 sab 1.102.8.1: #i21253#; add formatted notes
2004-09-08 12:39:22 +00:00
fc2a537a2a INTEGRATION: CWS swdrawobjapi (1.74.20); FILE MERGED
2004/08/12 06:06:10 od 1.74.20.3: RESYNC: (1.74-1.75); FILE MERGED
2004/08/11 14:15:30 od 1.74.20.2: #i28749# - move member <mbShapePositionInHoriL2R> from class <SvXMLImport>
	   to <SvXMLImport_Impl>
2004/08/10 09:07:46 od 1.74.20.1: #i28749# - initialize and retrieve value for new member <mbShapePositionInHoriL2R>
2004-08-23 06:58:18 +00:00
06dd912a72 INTEGRATION: CWS oasis2 (1.62.2); FILE MERGED
2004/08/17 15:49:10 mib 1.62.2.4: RESYNC: (1.62-1.68); FILE MERGED
2004/07/30 13:13:10 bm 1.62.2.3: #i32346# chart:symbol-type
2004/07/30 12:13:59 bm 1.62.2.2: +symbol-type
2004/07/30 12:07:10 bm 1.62.2.1: #i32339#, #i32346# additional tokens for chart Oasis format
2004-08-20 07:14:02 +00:00
1dca4a1753 INTEGRATION: CWS oasis2 (1.105.4); FILE MERGED
2004/07/30 14:45:55 sab 1.105.4.1: #i31189#; write body attributes no longer on body
2004-08-20 07:13:47 +00:00
17b8b22b4d INTEGRATION: CWS oasis2 (1.16.4); FILE MERGED
2004/08/02 12:39:41 mib 1.16.4.1: #i32363#: StandoloneDocInfo is now recognizes OASIS file format
2004-08-20 07:13:35 +00:00
0eb4cd1509 INTEGRATION: CWS aw017 (1.62.10); FILE MERGED
2004/07/29 14:21:51 aw 1.62.10.1: #i25616#
2004-08-03 12:33:14 +00:00
b1be9e6c08 INTEGRATION: CWS grouping (1.58.20); FILE MERGED
2004/07/27 10:39:53 nn 1.58.20.3: RESYNC: (1.60-1.62); FILE MERGED
2004/07/19 13:25:12 nn 1.58.20.2: RESYNC: (1.58-1.60); FILE MERGED
2004/07/19 12:58:08 sab 1.58.20.1: #i25110#; add grouping
2004-08-03 11:32:55 +00:00
826bdac2c1 INTEGRATION: CWS dr14 (1.51.4); FILE MERGED
2004/07/22 16:58:17 dr 1.51.4.7: RESYNC: (1.60-1.62); FILE MERGED
2004/07/12 18:42:05 dr 1.51.4.6: RESYNC: (1.58-1.60); FILE MERGED
2004/06/10 19:11:21 dr 1.51.4.5: RESYNC: (1.57-1.58); FILE MERGED
2004/06/04 18:28:49 dr 1.51.4.4: RESYNC: (1.56-1.57); FILE MERGED
2004/05/19 14:27:24 dr 1.51.4.3: RESYNC: (1.55-1.56); FILE MERGED
2004/04/21 11:10:26 dr 1.51.4.2: RESYNC: (1.51-1.55); FILE MERGED
2004/04/20 15:48:23 sab 1.51.4.1: #i23675#: add support of diagonal borders,shrink to fit and repeated content
2004-08-02 16:19:21 +00:00
b80434f277 INTEGRATION: CWS insight01 (1.26.74); FILE MERGED
2004/07/23 12:42:54 oj 1.26.74.6: RESYNC: (1.31-1.32); FILE MERGED
2004/07/06 09:16:59 oj 1.26.74.5: RESYNC: (1.30-1.31); FILE MERGED
2004/05/28 10:28:41 oj 1.26.74.4: RESYNC: (1.28-1.30); FILE MERGED
2004/01/02 20:31:39 oj 1.26.74.3: RESYNC: (1.27-1.28); FILE MERGED
2003/10/24 12:53:50 oj 1.26.74.2: RESYNC: (1.26-1.27); FILE MERGED
2003/10/24 06:50:56 oj 1.26.74.1: #i21643# changes for the db import filter
2004-08-02 13:13:17 +00:00
e2eca875c9 INTEGRATION: CWS insight01 (1.45.2); FILE MERGED
2004/07/27 07:42:08 oj 1.45.2.10: add database oasis namespace
2004/07/27 07:00:05 oj 1.45.2.9: remove double token
2004/07/23 12:43:58 oj 1.45.2.8: RESYNC: (1.58-1.62); FILE MERGED
2004/07/22 10:14:22 oj 1.45.2.7: #i30199# new element for db
2004/07/06 09:17:31 oj 1.45.2.6: RESYNC: (1.57-1.58); FILE MERGED
2004/05/28 10:29:31 oj 1.45.2.5: RESYNC: (1.50-1.57); FILE MERGED
2004/02/11 12:39:03 oj 1.45.2.4: RESYNC: (1.48-1.50); FILE MERGED
2004/01/02 20:32:30 oj 1.45.2.3: RESYNC: (1.46-1.48); FILE MERGED
2003/10/24 12:33:10 oj 1.45.2.2: #i21643# changes for the db import filter
2003/10/24 06:50:55 oj 1.45.2.1: #i21643# changes for the db import filter
2004-08-02 13:13:03 +00:00
09315d1c17 INTEGRATION: CWS insight01 (1.71.82); FILE MERGED
2004/07/23 12:43:39 oj 1.71.82.4: RESYNC: (1.73-1.74); FILE MERGED
2004/05/28 10:29:11 oj 1.71.82.3: RESYNC: (1.72-1.73); FILE MERGED
2004/01/02 20:32:05 oj 1.71.82.2: RESYNC: (1.71-1.72); FILE MERGED
2003/10/24 06:50:55 oj 1.71.82.1: #i21643# changes for the db import filter
2004-08-02 13:12:49 +00:00
e34f2c5f0c INTEGRATION: CWS insight01 (1.101.98); FILE MERGED
2004/07/27 12:02:53 oj 1.101.98.4: fix for export_oasis flag
2004/07/23 12:43:04 oj 1.101.98.3: RESYNC: (1.104-1.105); FILE MERGED
2004/05/28 10:28:50 oj 1.101.98.2: RESYNC: (1.101-1.104); FILE MERGED
2003/12/17 10:49:11 oj 1.101.98.1: #111075# changes for the new database export/import filter
2004-08-02 13:12:38 +00:00
16d5a04bd4 INTEGRATION: CWS insight01 (1.18.46); FILE MERGED
2004/07/23 12:43:49 oj 1.18.46.4: RESYNC: (1.20-1.21); FILE MERGED
2004/07/06 09:17:15 oj 1.18.46.3: RESYNC: (1.19-1.20); FILE MERGED
2004/05/28 10:29:20 oj 1.18.46.2: RESYNC: (1.18-1.19); FILE MERGED
2004/04/01 09:59:24 oj 1.18.46.1: remove dbg_Assert for exportSettings
2004-08-02 13:12:25 +00:00
64f5a31b04 INTEGRATION: CWS swobjpos04 (1.56.20); FILE MERGED
2004/08/02 10:40:49 od 1.56.20.3: RESYNC: (1.60-1.63); FILE MERGED
resolve merge conflict.
2004/07/12 13:29:37 od 1.56.20.2: RESYNC: (1.56-1.60); FILE MERGED
resolve merge conflict.
2004/05/07 14:47:19 od 1.56.20.1: #i28701# add tokens for new attribute 'WrapInfluenceOnPosition'
2004-08-02 12:48:47 +00:00
a1cf30fdf7 INTEGRATION: CWS tableoptions (1.58.22); FILE MERGED
2004/07/14 14:44:49 nn 1.58.22.2: RESYNC: (1.58-1.60); FILE MERGED
2004/07/14 13:50:26 sab 1.58.22.1: #i25111#; add table options
2004-07-23 11:57:18 +00:00
74971bffd4 #i31526# sync xmltoken list with header 2004-07-15 12:24:20 +00:00
8089e6ef83 INTEGRATION: CWS oasis (1.50.26); FILE MERGED
2004/06/24 15:46:50 sab 1.50.26.18: #i20153#; oasis changes
2004/06/24 14:52:16 mib 1.50.26.17: i20158#: spelling
2004/06/21 09:12:31 mib 1.50.26.16: #i20153#: meta generator, service names for chart and forms
2004/06/18 14:56:49 bm 1.50.26.15: #i20158#: Replace chart:splines with chart:interpolation
2004/06/18 08:39:06 bm 1.50.26.14: Replaces chart:splines with chart:interpolation (+ XML_INTERPOLATION)
2004/06/16 07:53:51 mib 1.50.26.13: #i20153#: new package URI schema, namespaced conditions
2004/06/14 09:06:05 mib 1.50.26.12: RESYNC: (1.50-1.58); FILE MERGED
2004/06/08 14:49:14 mib 1.50.26.11: - #i20153#: form controls
2004/05/28 16:37:54 mib 1.50.26.10: - #i20153#: Events
2004/05/24 12:43:41 mib 1.50.26.9: - #i20153#: some attributes renamed
2004/05/24 09:16:04 mib 1.50.26.8: - #i20153#: replaced transparency with opacity
2004/05/21 15:00:23 mib 1.50.26.7: - #i20153#: changed underline, line-through and tab-stop
2004/05/12 11:00:36 mib 1.50.26.6: - #i20153#: changed <office:annotation> and <office:change-info>
2004/05/06 13:31:28 bm 1.50.26.5: Oasis Chart token
2004/04/19 12:34:25 mib 1.50.26.4: - changed "graphics" style family to "graphic" (#i20153#)
- replaced "inch" with "in" (#i18170#)
2004/04/08 08:52:47 mib 1.50.26.3: - renamed <text:tab-stop> to <text:tab>
- replaced fo:score-spaces with style:text-underline-mode and
  style:text-line-through-mode
2004/04/07 11:49:52 mib 1.50.26.2: splitted <properties>
2004/03/31 14:23:43 mib 1.50.26.1: First steps of OASIS file format
2004-07-13 07:23:40 +00:00
e0929a659d INTEGRATION: CWS oasis (1.28.52); FILE MERGED
2004/06/15 16:53:43 mib 1.28.52.4: #i20153#: merge conflicts + syntax
2004/06/12 19:38:10 mib 1.28.52.3: RESYNC: (1.28-1.30); FILE MERGED
2004/05/07 11:59:53 mib 1.28.52.2: - #i20153#: encode/decode style names (ooo2oasis missing)
2004/04/19 12:34:25 mib 1.28.52.1: - changed "graphics" style family to "graphic" (#i20153#)
- replaced "inch" with "in" (#i18170#)
2004-07-13 07:07:21 +00:00
25d8523b2c INTEGRATION: CWS oasis (1.72.76); FILE MERGED
2004/06/17 16:29:19 mib 1.72.76.6: #i20153#: bug fixes
2004/06/16 07:53:51 mib 1.72.76.5: #i20153#: new package URI schema, namespaced conditions
2004/06/12 19:38:00 mib 1.72.76.4: RESYNC: (1.72-1.73); FILE MERGED
2004/05/28 16:37:54 mib 1.72.76.3: - #i20153#: Events
2004/05/11 11:11:21 mib 1.72.76.2: - #i20153#: encode/decode style names finished
2004/05/07 11:59:53 mib 1.72.76.1: - #i20153#: encode/decode style names (ooo2oasis missing)
2004-07-13 07:07:00 +00:00
5dccf6eba5 INTEGRATION: CWS oasis (1.101.172); FILE MERGED
2004/06/24 15:23:23 mib 1.101.172.10: i20158#: bug fixes for flat fileformat (OLE)
2004/06/22 14:03:19 mib 1.101.172.9: - #i20153#: auto text
2004/06/17 16:29:19 mib 1.101.172.8: #i20153#: bug fixes
2004/06/16 07:53:51 mib 1.101.172.7: #i20153#: new package URI schema, namespaced conditions
2004/06/14 09:05:53 mib 1.101.172.6: RESYNC: (1.101-1.104); FILE MERGED
2004/05/28 16:37:53 mib 1.101.172.5: - #i20153#: Events
2004/05/12 11:00:36 mib 1.101.172.4: - #i20153#: changed <office:annotation> and <office:change-info>
2004/05/07 11:59:53 mib 1.101.172.3: - #i20153#: encode/decode style names (ooo2oasis missing)
2004/04/19 12:34:25 mib 1.101.172.2: - changed "graphics" style family to "graphic" (#i20153#)
- replaced "inch" with "in" (#i18170#)
2004/03/31 14:23:43 mib 1.101.172.1: First steps of OASIS file format
2004-07-13 07:06:44 +00:00
2c0ec9df7e INTEGRATION: CWS oasis (1.6.276); FILE MERGED
2004/04/19 12:34:24 mib 1.6.276.1: - changed "graphics" style family to "graphic" (#i20153#)
- replaced "inch" with "in" (#i18170#)
2004-07-13 07:06:29 +00:00
d42f613536 INTEGRATION: CWS oasis (1.15.254); FILE MERGED
2004/06/22 14:03:18 mib 1.15.254.8: - #i20153#: auto text
2004/06/17 11:36:16 mib 1.15.254.7: #i20158#: OASIS file format for math
2004/05/27 12:49:45 mib 1.15.254.6: - #i20153#: OASIS File Format
2004/05/07 11:59:52 mib 1.15.254.5: - #i20153#: encode/decode style names (ooo2oasis missing)
2004/05/06 14:24:01 cl 1.15.254.4: new oasis filter for impress and draw
2004/05/05 13:09:27 bm 1.15.254.3: chart oasis components
2004/04/23 14:21:13 mib 1.15.254.2: - added draw/impress/calc/chart OOo import components (#i20153#)
- turned draw/impress/chart import/export components into OASIS components (#i20153#)
2004/03/31 14:23:43 mib 1.15.254.1: First steps of OASIS file format
2004-07-13 07:06:11 +00:00
17d1ccd271 INTEGRATION: CWS oasis (1.7.38); FILE MERGED
2004/04/08 08:52:47 mib 1.7.38.2: - renamed <text:tab-stop> to <text:tab>
- replaced fo:score-spaces with style:text-underline-mode and
  style:text-line-through-mode
2004/03/31 14:23:43 mib 1.7.38.1: First steps of OASIS file format
2004-07-13 07:05:56 +00:00
e53a924c2c INTEGRATION: CWS oasis (1.6.38); FILE MERGED
2004/06/24 15:23:23 mib 1.6.38.1: i20158#: bug fixes for flat fileformat (OLE)
2004-07-13 07:05:41 +00:00
6b84462c33 INTEGRATION: CWS oasis (1.19.36); FILE MERGED
2004/06/16 07:53:51 mib 1.19.36.1: #i20153#: new package URI schema, namespaced conditions
2004-07-13 07:05:27 +00:00
334a56eed9 INTEGRATION: CWS oasis (1.19.38); FILE MERGED
2004/06/16 07:53:50 mib 1.19.38.1: #i20153#: new package URI schema, namespaced conditions
2004-07-13 07:05:09 +00:00
9667c401dc INTEGRATION: CWS dba13 (1.58.6); FILE MERGED
2004/07/06 10:38:43 fs 1.58.6.2: MANUAL RESYNC: (1.58-1.59); FILE MERGED
2004/06/16 09:24:28 fs 1.58.6.1: #i29519# +SYMBOL_COLOR
2004-07-06 12:16:59 +00:00
de4fc2d6a0 INTEGRATION: CWS frmcontrols04 (1.52.4); FILE MERGED
2004/06/15 21:26:32 fs 1.52.4.3: RESYNC: (1.52-1.58); FILE MERGED
2004/05/06 12:25:18 fs 1.52.4.2: #i26047# image-position and image-align
2004/05/05 14:15:11 fs 1.52.4.1: #i24688# +XML_3D
2004-07-05 15:06:01 +00:00
eeeaa3765a INTEGRATION: CWS impress14ea (1.30.32); FILE MERGED
2004/06/07 13:47:29 cl 1.30.32.1: #i28076# skip whitespaces below ' ' also
2004-06-28 15:04:12 +00:00
abfc38ab8d INTEGRATION: CWS impress14ea (1.19.32); FILE MERGED
2004/06/07 13:48:45 cl 1.19.32.1: #i28076# there may be more locales than forbiden character rules
2004-06-28 15:03:58 +00:00
f4cd558f4f INTEGRATION: CWS fieldoptions (1.55.6); FILE MERGED
2004/05/19 11:11:34 dr 1.55.6.3: #100000# merge error
2004/05/18 09:43:11 dr 1.55.6.2: RESYNC: (1.55-1.56); FILE MERGED
2004/05/12 18:13:15 sab 1.55.6.1: #i23447#; add fieldoptions
2004-06-04 12:44:42 +00:00
cc0e3d0d3e INTEGRATION: CWS hbqea101 (1.52.8); FILE MERGED
2004/05/10 08:01:03 hbrinkm 1.52.8.3: #i21237# resolve error imposed by merge
2004/05/05 15:24:22 hbrinkm 1.52.8.2: RESYNC: (1.52-1.56); FILE MERGED
2004/05/05 09:41:33 hbrinkm 1.52.8.1: #i21237# new property for index tab stop entry: with-tab
2004-05-17 15:27:33 +00:00
fdc7e5e3cd #i10000# use hard reference for EventListener 2004-05-14 15:10:42 +00:00
c51bfe2e38 INTEGRATION: CWS binfilter (1.26.50); FILE MERGED
2004/02/05 15:08:54 aw 1.26.50.5: RESYNC: (1.27-1.28); FILE MERGED
2003/10/30 12:18:52 aw 1.26.50.4: RESYNC: (1.26-1.27); FILE MERGED
2003/08/19 15:46:26 aw 1.26.50.3: #110680#
Give ServiceManager as const reference and do not keep it as reference locally as member
2003/07/08 17:31:38 aw 1.26.50.2: #110680#
2003/07/07 15:46:13 aw 1.26.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:33:34 +00:00
a1a0d7ce87 INTEGRATION: CWS binfilter (1.71.34); FILE MERGED
2003/10/30 12:16:30 aw 1.71.34.4: RESYNC: (1.71-1.72); FILE MERGED
2003/08/19 15:46:25 aw 1.71.34.3: #110680#
Give ServiceManager as const reference and do not keep it as reference locally as member
2003/07/08 17:31:38 aw 1.71.34.2: #110680#
2003/07/07 15:46:13 aw 1.71.34.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:33:22 +00:00
3ea4cb01e1 INTEGRATION: CWS binfilter (1.101.50); FILE MERGED
2003/08/19 15:46:25 aw 1.101.50.3: #110680#
Give ServiceManager as const reference and do not keep it as reference locally as member
2003/07/08 17:31:38 aw 1.101.50.2: #110680#
2003/07/07 15:46:13 aw 1.101.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:33:10 +00:00
05c08ca698 INTEGRATION: CWS binfilter (1.4.122); FILE MERGED
2004/02/05 15:08:17 aw 1.4.122.4: RESYNC: (1.4-1.5); FILE MERGED
2003/10/06 15:25:00 aw 1.4.122.3: #111880#
Added fix from CL for flatXML OLE
2003/07/08 17:31:37 aw 1.4.122.2: #110680#
2003/07/07 15:46:12 aw 1.4.122.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:32:58 +00:00
c1179fe365 INTEGRATION: CWS binfilter (1.17.50); FILE MERGED
2003/10/30 12:16:23 aw 1.17.50.3: RESYNC: (1.17-1.18); FILE MERGED
2003/07/08 17:31:36 aw 1.17.50.2: #110680#
2003/07/07 15:46:12 aw 1.17.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:32:45 +00:00
c9961ad8ba INTEGRATION: CWS binfilter (1.17.50); FILE MERGED
2003/10/30 12:16:17 aw 1.17.50.4: RESYNC: (1.17-1.18); FILE MERGED
2003/08/19 15:46:25 aw 1.17.50.3: #110680#
Give ServiceManager as const reference and do not keep it as reference locally as member
2003/07/08 17:31:35 aw 1.17.50.2: #110680#
2003/07/07 15:46:11 aw 1.17.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
2004-05-03 12:32:29 +00:00
d7610564f1 INTEGRATION: CWS tl01 (1.101.74); FILE MERGED
2003/09/12 10:08:58 tl 1.101.74.1: #110762# make textconversion dictionaries read/write XML
2004-04-27 14:58:12 +00:00
d031208df2 fixed order of xml token 2004-04-23 08:31:22 +00:00
9f69588313 INTEGRATION: CWS pagefields (1.49.18); FILE MERGED
2004/03/30 14:35:34 sab 1.49.18.3: RESYNC: (1.50-1.52); FILE MERGED
2004/03/03 09:43:11 sab 1.49.18.2: RESYNC: (1.49-1.50); FILE MERGED
2004/02/27 14:49:51 sab 1.49.18.1: #i22164#; add Page fields
2004-04-13 12:01:59 +00:00
89a3d18ac8 INTEGRATION: CWS sj05 (1.26.72); FILE MERGED
2004/02/13 18:53:11 sj 1.26.72.4: RESYNC: (1.27-1.28); FILE MERGED
2003/11/27 19:31:06 sj 1.26.72.3: RESYNC: (1.26-1.27); FILE MERGED
2003/11/13 10:05:46 sj 1.26.72.2: fixed wrong return value of convertVector3D, added conversion for Position3D
2003/10/31 17:20:48 sj 1.26.72.1: added conversion for point3d
2004-04-02 12:52:18 +00:00
ec91058494 INTEGRATION: CWS sj05 (1.46.2); FILE MERGED
2004/03/09 13:55:22 sj 1.46.2.10: added same letter heights property for fontwork
2004/02/13 18:53:02 sj 1.46.2.9: RESYNC: (1.47-1.50); FILE MERGED
2004/02/06 10:08:45 sj 1.46.2.8: name changes
2004/01/27 20:39:32 sj 1.46.2.7: fixed typo: verical -> vertical
2004/01/20 18:13:21 sj 1.46.2.6: ashapes: added wordwrap and autogrowsize attribute
2003/12/18 18:54:23 sj 1.46.2.5: added TextRotateAngle attribute
2003/12/09 11:24:33 sj 1.46.2.4: changed autoshape handle properties, it is now possible to use unlimited handle ranges
2003/11/27 19:31:00 sj 1.46.2.3: RESYNC: (1.46-1.47); FILE MERGED
2003/11/07 17:46:21 sj 1.46.2.2: added some tokens
2003/10/31 17:20:34 sj 1.46.2.1: added tokens for autoshape
2004-04-02 12:52:06 +00:00
1f6b65dff3 INTEGRATION: CWS interop12 (1.46.8); FILE MERGED
2004/03/17 09:58:36 cl 1.46.8.5: RESYNC: (1.50-1.51); FILE MERGED
2004/02/13 17:45:24 cl 1.46.8.4: RESYNC: (1.48-1.50); FILE MERGED
2003/12/09 15:21:37 cl 1.46.8.3: RESYNC: (1.47-1.48); FILE MERGED
2003/11/07 13:37:03 cl 1.46.8.2: RESYNC: (1.46-1.47); FILE MERGED
2003/10/30 10:54:17 cl 1.46.8.1: #i20949# added tokens for header&footer support in impress
2004-03-30 15:18:43 +00:00
a9232bb320 INTEGRATION: CWS sab008 (1.47.14); FILE MERGED
2004/03/15 11:21:27 dr 1.47.14.4: RESYNC: (1.50-1.51); FILE MERGED
2004/02/11 12:07:50 sab 1.47.14.3: RESYNC: (1.49-1.50); FILE MERGED
2004/01/26 09:41:42 sab 1.47.14.2: RESYNC: (1.47-1.49); FILE MERGED
2004/01/23 11:10:05 sab 1.47.14.1: #i8868#; add scale to x and scale to y
2004-03-19 15:01:48 +00:00
f7ea922b1a INTEGRATION: CWS swobjpos03 (1.47.2); FILE MERGED
2004/02/16 10:51:04 od 1.47.2.2: RESYNC: (1.47-1.50); FILE MERGED
2003/10/27 12:49:32 od 1.47.2.1: merging changes from cws swobjpos02
2004-03-08 13:10:01 +00:00
7f374d5f33 INTEGRATION: CWS ooo20031216 (1.6.114); FILE MERGED
2003/12/13 14:07:19 waratah 1.6.114.1: #i1858# test for previous definition of macro to remove warning
2004-02-04 13:15:30 +00:00