Commit Graph

494 Commits

Author SHA1 Message Date
Pascal Junck
69a1000c89 INTEGRATION: CWS aw019 (1.1.1.1.580); FILE MERGED
2004/10/21 15:51:13 aw 1.1.1.1.580.2: #i34831#
2004/09/29 14:30:13 aw 1.1.1.1.580.1: #i11190#
2004-11-03 07:53:40 +00:00
Pascal Junck
080d4efd59 INTEGRATION: CWS aw019 (1.28.78); FILE MERGED
2004/10/18 16:52:10 aw 1.28.78.2: RESYNC: (1.28-1.29); FILE MERGED
2004/09/29 14:30:13 aw 1.28.78.1: #i11190#
2004-11-03 07:53:28 +00:00
Pascal Junck
cb3ad344ac INTEGRATION: CWS aw019 (1.70.80); FILE MERGED
2004/10/18 16:51:52 aw 1.70.80.2: RESYNC: (1.70-1.71); FILE MERGED
2004/09/29 14:30:12 aw 1.70.80.1: #i11190#
2004-11-03 07:53:14 +00:00
Pascal Junck
d384281917 INTEGRATION: CWS aw019 (1.4.564); FILE MERGED
2004/09/29 14:30:12 aw 1.4.564.1: #i11190#
2004-11-03 07:52:59 +00:00
Pascal Junck
c7f7621d2c INTEGRATION: CWS aw019 (1.6.448); FILE MERGED
2004/09/29 14:30:12 aw 1.6.448.1: #i11190#
2004-11-03 07:52:44 +00:00
Jens-Heiner Rechtien
3bdd484a49 INTEGRATION: CWS sj09 (1.36.66); FILE MERGED
2004/10/11 16:35:18 sj 1.36.66.2: RESYNC: (1.36-1.37); FILE MERGED
2004/09/06 18:56:14 sj 1.36.66.1: fontheight, changed default
2004-10-12 12:08:37 +00:00
Kurt Zenker
df470be5ab INTEGRATION: CWS mav09 (1.5.386); FILE MERGED
2004/04/14 14:11:54 mba 1.5.386.1: #i27773#: remove so3; new storage API
2004-10-04 17:17:06 +00:00
Kurt Zenker
47462abf32 INTEGRATION: CWS mav09 (1.5.82); FILE MERGED
2004/05/24 09:00:02 mav 1.5.82.4: #i27773# fix resync issues
2004/05/19 18:16:18 mav 1.5.82.3: #i27773# adopt to incompatible changes
2004/05/04 14:07:05 mba 1.5.82.2: #i27773#: remove so3
2004/04/14 14:11:54 mba 1.5.82.1: #i27773#: remove so3; new storage API
2004-10-04 17:16:53 +00:00
Kurt Zenker
f25366d086 INTEGRATION: CWS mav09 (1.26.60); FILE MERGED
2004/08/09 19:34:54 mav 1.26.60.7: RESYNC: (1.27-1.28); FILE MERGED
2004/06/01 08:10:59 mba 1.26.60.6: #i27773#: new embedding API
2004/05/19 18:16:17 mav 1.26.60.5: #i27773# adopt to incompatible changes
2004/05/04 14:07:04 mba 1.26.60.4: #i27773#: remove so3
2004/04/29 18:01:16 mav 1.26.60.3: RESYNC: (1.26-1.27); FILE MERGED
2004/04/27 17:01:49 mba 1.26.60.2: #i27773#: new embedding API
2004/04/14 14:11:53 mba 1.26.60.1: #i27773#: remove so3; new storage API
2004-10-04 17:16:40 +00:00
Kurt Zenker
ef904e7c44 INTEGRATION: CWS mav09 (1.21.60); FILE MERGED
2004/08/09 19:34:46 mav 1.21.60.7: RESYNC: (1.22-1.24); FILE MERGED
2004/06/01 08:10:58 mba 1.21.60.6: #i27773#: new embedding API
2004/05/26 16:39:26 mba 1.21.60.5: #i27773#: get Aspect from Client
2004/05/19 18:16:17 mav 1.21.60.4: #i27773# adopt to incompatible changes
2004/04/29 18:01:07 mav 1.21.60.3: RESYNC: (1.21-1.22); FILE MERGED
2004/04/27 17:01:49 mba 1.21.60.2: #i27773#: new embedding API
2004/04/14 14:11:53 mba 1.21.60.1: #i27773#: remove so3; new storage API
2004-10-04 17:16:28 +00:00
Kurt Zenker
2f6ab4c2ce INTEGRATION: CWS mav09 (1.66.54); FILE MERGED
2004/08/09 19:34:37 mav 1.66.54.4: RESYNC: (1.69-1.70); FILE MERGED
2004/05/17 17:50:30 mav 1.66.54.3: RESYNC: (1.68-1.69); FILE MERGED
2004/04/29 18:00:59 mav 1.66.54.2: RESYNC: (1.66-1.68); FILE MERGED
2004/04/14 14:11:52 mba 1.66.54.1: #i27773#: remove so3; new storage API
2004-10-04 17:16:14 +00:00
Rüdiger Timm
8f9458b36a INTEGRATION: CWS os19 (1.31.90); FILE MERGED
2004/09/12 14:36:10 os 1.31.90.3: RESYNC: (1.35-1.36); FILE MERGED
2004/04/29 17:55:45 os 1.31.90.2: RESYNC: (1.31-1.35); FILE MERGED
2003/11/10 10:42:36 af 1.31.90.1: #i22089# Adaption to new spell check dialog.
2004-09-17 12:46:25 +00:00
Oliver Bolte
c7d46344ed INTEGRATION: CWS encodingfix (1.56.90); FILE MERGED
2004/09/09 08:11:20 obo 1.56.90.1: #i31587# encoding problem for en-US
2004-09-09 08:00:44 +00:00
Kurt Zenker
5fac74ab33 INTEGRATION: CWS c02v1 (1.19.54); FILE MERGED
2004/08/13 12:48:09 cl 1.19.54.1: #i32639# use correct master page after loop in SetPresentationLayout
2004-08-31 12:48:34 +00:00
Oliver Bolte
6afa0a96bc INTEGRATION: CWS jmf2 (1.8.28); FILE MERGED
2004/07/15 15:41:54 ka 1.8.28.1: #i3316#: changes for m47 build
2004-08-12 08:14:08 +00:00
Oliver Bolte
9a8f394b01 INTEGRATION: CWS jmf2 (1.55.64); FILE MERGED
2004/07/29 07:14:07 ka 1.55.64.4: #i3316#: string finalization
2004/07/19 13:22:06 ka 1.55.64.3: #i3316#: added media objectbar
2004/07/14 00:53:41 ka 1.55.64.2: RESYNC: (1.55-1.56); FILE MERGED
2004/07/11 19:59:29 ka 1.55.64.1: media support
2004-08-12 08:13:54 +00:00
Jens-Heiner Rechtien
21480fca58 INTEGRATION: CWS impress19ea (1.45.8); FILE MERGED
2004/07/23 15:46:17 cl 1.45.8.1: #i31533# do not add presentation styles for handout page objects
2004-08-02 13:25:09 +00:00
Rüdiger Timm
fa5a16e2bf INTEGRATION: CWS impress2 (1.8.26); FILE MERGED
2004/06/08 12:45:07 af 1.8.26.3: #i22705# Fixed upper/lowercase of include directive.
2004/05/23 13:19:26 af 1.8.26.2: #i22705# Adaption to change in ViewShellBase.
2004/02/19 10:14:14 af 1.8.26.1: #i22705# Adaption to changes in ViewShellBase.
2004-07-13 12:45:54 +00:00
Rüdiger Timm
c887a0bac1 INTEGRATION: CWS impress2 (1.38.24); FILE MERGED
2004/06/18 00:14:44 af 1.38.24.3: RESYNC: (1.42-1.43); FILE MERGED
2004/05/19 18:20:08 af 1.38.24.2: RESYNC: (1.38-1.42); FILE MERGED
2004/02/19 10:12:21 af 1.38.24.1: #i22705# Added SetName() method that calls ActionChanged().
2004-07-13 12:45:35 +00:00
Rüdiger Timm
269ba66602 INTEGRATION: CWS impress2 (1.21.24); FILE MERGED
2004/05/19 18:19:45 af 1.21.24.2: RESYNC: (1.21-1.22); FILE MERGED
2004/02/19 10:07:26 af 1.21.24.1: #i22705# Preventing handout pages from being returned by GetPageByName().
2004-07-13 12:45:18 +00:00
Rüdiger Timm
9a746775d4 INTEGRATION: CWS impress2 (1.2.26); FILE MERGED
2004/07/06 08:28:59 af 1.2.26.5: #i22705# Extended debug messages when GetSdPage() is called with invalid page index.
2004/05/23 13:18:36 af 1.2.26.4: #i22705# Corrected error due to recent resync.
2004/05/19 18:19:27 af 1.2.26.3: RESYNC: (1.2-1.3); FILE MERGED
2004/03/05 09:34:22 af 1.2.26.2: #i22705# Added braces arround assertions to be compilable when not in DEBUG mode.
2004/03/03 17:19:09 af 1.2.26.1: #i22705# Moved assertions to avoid unnecessary comparisons and allow break points on them.
2004-07-13 12:45:01 +00:00
Rüdiger Timm
f972cee2e4 INTEGRATION: CWS aw013 (1.18.36); FILE MERGED
2004/06/28 14:57:45 aw 1.18.36.1: #117254#
2004-07-12 13:56:30 +00:00
Rüdiger Timm
05d49b7a50 INTEGRATION: CWS aw013 (1.43.26); FILE MERGED
2004/06/28 14:57:45 aw 1.43.26.2: #117254#
2004/06/11 16:14:36 aw 1.43.26.1: #114389#, #114394#
2004-07-12 13:56:14 +00:00
Rüdiger Timm
3f15d1b6bb INTEGRATION: CWS aw013 (1.35.118); FILE MERGED
2004/06/28 14:57:44 aw 1.35.118.1: #117254#
2004-07-12 13:55:57 +00:00
Rüdiger Timm
f6895a46bf INTEGRATION: CWS aw013 (1.27.68); FILE MERGED
2004/06/28 14:57:44 aw 1.27.68.1: #117254#
2004-07-12 13:55:42 +00:00
Rüdiger Timm
02e45cff01 INTEGRATION: CWS aw013 (1.22.66); FILE MERGED
2004/06/28 14:57:44 aw 1.22.66.1: #117254#
2004-07-12 13:55:25 +00:00
Rüdiger Timm
bba9e544bd INTEGRATION: CWS aw013 (1.69.34); FILE MERGED
2004/06/28 14:57:43 aw 1.69.34.1: #117254#
2004-07-12 13:55:03 +00:00
Oliver Bolte
1907330ea1 INTEGRATION: CWS docking1 (1.6.116); FILE MERGED
2004/05/02 00:06:20 cd 1.6.116.2: RESYNC: (1.6-1.7); FILE MERGED
2004/04/28 16:25:39 cd 1.6.116.1: #i26252# Fixes for toolbox controllers/items that used non-convertible items
2004-07-06 11:24:29 +00:00
Oliver Bolte
8624110ff8 INTEGRATION: CWS docking1 (1.2.390); FILE MERGED
2004/05/04 16:42:46 cd 1.2.390.1: #i26252# Adapt toolbox controller to new implementation
2004-07-06 11:24:14 +00:00
Hans-Joachim Lankenau
0e1e981109 INTEGRATION: CWS mergebuild (1.53.58); FILE MERGED
2004/05/21 16:51:49 hjs 1.53.58.6: #i8252# fix resync problems
2004/05/18 13:48:25 hjs 1.53.58.5: RESYNC: (1.54-1.55); FILE MERGED
2004/04/20 21:41:36 hjs 1.53.58.4: RESYNC: (1.53-1.54); FILE MERGED
2004/02/23 11:36:29 ihi 1.53.58.3: Merge-While-Build update
2003/11/11 19:21:57 ihi 1.53.58.2: en -> en-US
2003/11/10 17:39:45 ihi 1.53.58.1: #111234# Merge during build
2004-06-26 16:53:34 +00:00
Kurt Zenker
03d7c93dae INTEGRATION: CWS bmpres01 (1.38.18); FILE MERGED
2004/04/29 10:26:53 ka 1.38.18.3: syntax
2004/04/28 08:10:35 ka 1.38.18.2: RESYNC: (1.38-1.42); FILE MERGED
2004/02/12 14:13:04 ka 1.38.18.1: #i22149# support for alpha masks
2004-05-18 23:44:52 +00:00
Jens-Heiner Rechtien
5321da8400 INTEGRATION: CWS aw009 (1.66.68); FILE MERGED
2004/04/26 11:46:06 aw 1.66.68.1: #116235#, #116168#
2004-05-10 13:36:46 +00:00
Jens-Heiner Rechtien
83e4253488 INTEGRATION: CWS impress8ea1 (1.17.12); FILE MERGED
2004/04/21 17:04:04 cl 1.17.12.1: #i27556# added missing break on binary import
2004-05-10 10:54:15 +00:00
Rüdiger Timm
a0f6696069 #i10000# (SJ) 2004-04-05 11:34:12 +00:00
Rüdiger Timm
5ee3f36744 INTEGRATION: CWS sj05 (1.38.20); FILE MERGED
2004/03/15 13:04:08 sj 1.38.20.2: RESYNC: (1.38-1.39); FILE MERGED
2004/02/17 15:17:50 sj 1.38.20.1: fixed gpf if loading ppt documents with header&footer
2004-04-02 13:57:54 +00:00
Rüdiger Timm
bd415f3939 INTEGRATION: CWS sj05 (1.6.46); FILE MERGED
2004/01/23 17:19:20 cl 1.6.46.1: #i20484# adding autoshape ui
2004-04-02 12:20:59 +00:00
Rüdiger Timm
980c162657 INTEGRATION: CWS sj05 (1.53.52); FILE MERGED
2004/02/13 14:41:15 sj 1.53.52.2: RESYNC: (1.53-1.54); FILE MERGED
2004/01/23 17:19:19 cl 1.53.52.1: #i20484# adding autoshape ui
2004-04-02 12:20:38 +00:00
Rüdiger Timm
f84be06911 INTEGRATION: CWS sj05 (1.62.4); FILE MERGED
2004/02/13 14:41:51 sj 1.62.4.3: RESYNC: (1.62-1.66); FILE MERGED
2004/02/09 15:14:58 cl 1.62.4.2: #i20484# added new CustomShape ui
2003/12/04 20:14:08 sj 1.62.4.1: not crashing if creating unomodel if there is no docshell
2004-04-02 12:20:25 +00:00
Rüdiger Timm
083fc63b9d INTEGRATION: CWS interop12 (1.14.228); FILE MERGED
2004/02/13 22:27:53 cl 1.14.228.5: RESYNC: (1.15-1.16); FILE MERGED
2004/02/05 15:15:55 cl 1.14.228.4: #i20949# added header&footer support for impress
2003/12/09 23:38:23 cl 1.14.228.3: RESYNC: (1.14-1.15); FILE MERGED
2003/11/21 15:39:57 cl 1.14.228.2: #i20949# fixed binary format
2003/09/19 14:38:20 cl 1.14.228.1: #111385# initial version
2004-03-30 14:44:57 +00:00
Rüdiger Timm
e743163318 INTEGRATION: CWS interop12 (1.35.118); FILE MERGED
2004/03/24 18:09:17 cl 1.35.118.21: #i20949# correctly delete shapes from presobjlist
2004/03/23 18:29:44 cl 1.35.118.20: #i20949# correctly delete shapes from presobjlist
2004/03/22 14:35:48 cl 1.35.118.19: fixed a merge problem
2004/03/19 13:20:29 cl 1.35.118.18: fixed merge conflict
2004/03/17 10:23:17 cl 1.35.118.17: RESYNC: (1.38-1.39); FILE MERGED
2004/02/25 16:00:55 cl 1.35.118.16: #115632# remove disposed SdrObjects from the deletet presentation object list
2004/02/17 12:24:30 cl 1.35.118.15: fixed merge problems
2004/02/13 22:27:46 cl 1.35.118.14: RESYNC: (1.37-1.38); FILE MERGED
2004/02/05 15:15:54 cl 1.35.118.13: #i20949# added header&footer support for impress
2004/01/20 17:08:42 cl 1.35.118.12: #i20949# use SvxAdjustItem for header&footer
2004/01/20 16:13:01 cl 1.35.118.11: #i20949# use displayinfo
2003/12/09 23:37:57 cl 1.35.118.10: RESYNC: (1.35-1.37); FILE MERGED
2003/11/25 12:40:21 cl 1.35.118.9: fixed unix compiler problems
2003/11/24 15:25:48 cl 1.35.118.8: fixed unix compile problems
2003/11/20 12:16:47 cl 1.35.118.7: #i20949# added header&footer support for impress
2003/11/19 14:53:43 cl 1.35.118.6: #i20949# header objects on masterpage now have the default style
2003/11/07 09:13:13 cl 1.35.118.5: #i20949# added header&footer support for impress
2003/11/05 17:05:53 cl 1.35.118.4: #i20949# added support for header&footer
2003/11/04 16:38:03 cl 1.35.118.3: #i20949# added header&footer support for impress
2003/10/30 11:18:35 cl 1.35.118.2: #i20949# added header&footer support for impress
2003/09/19 14:38:20 cl 1.35.118.1: #111385# initial version
2004-03-30 14:44:43 +00:00
Rüdiger Timm
f0aedc25e9 INTEGRATION: CWS interop12 (1.25.6); FILE MERGED
2004/02/13 22:27:21 cl 1.25.6.2: RESYNC: (1.25-1.26); FILE MERGED
2004/02/05 15:15:53 cl 1.25.6.1: #i20949# added header&footer support for impress
2004-03-30 14:44:29 +00:00
Rüdiger Timm
c6fb6bb129 INTEGRATION: CWS interop12 (1.17.72); FILE MERGED
2004/02/17 12:24:30 cl 1.17.72.8: fixed merge problems
2004/02/13 22:27:14 cl 1.17.72.7: RESYNC: (1.20-1.21); FILE MERGED
2003/12/09 23:36:44 cl 1.17.72.6: RESYNC: (1.18-1.20); FILE MERGED
2003/11/07 15:03:38 cl 1.17.72.5: RESYNC: (1.17-1.18); FILE MERGED
2003/11/05 17:05:53 cl 1.17.72.4: #i20949# added support for header&footer
2003/11/04 16:38:03 cl 1.17.72.3: #i20949# added header&footer support for impress
2003/10/30 11:18:35 cl 1.17.72.2: #i20949# added header&footer support for impress
2003/09/19 14:38:19 cl 1.17.72.1: #111385# initial version
2004-03-30 14:44:14 +00:00
Rüdiger Timm
ca855c6977 INTEGRATION: CWS interop12 (1.60.72); FILE MERGED
2004/02/17 12:24:29 cl 1.60.72.5: fixed merge problems
2004/02/13 22:27:07 cl 1.60.72.4: RESYNC: (1.63-1.66); FILE MERGED
2003/12/09 23:36:07 cl 1.60.72.3: RESYNC: (1.61-1.63); FILE MERGED
2003/11/07 15:03:31 cl 1.60.72.2: RESYNC: (1.60-1.61); FILE MERGED
2003/09/19 14:38:19 cl 1.60.72.1: #111385# initial version
2004-03-30 14:43:59 +00:00
Rüdiger Timm
e1e85de5c2 INTEGRATION: CWS draw23master (1.37.22); FILE MERGED
2004/02/13 12:36:30 cl 1.37.22.1: #i24399# remove deleted objects from presobjlist if theire still there
2004-03-02 09:38:45 +00:00
Kurt Zenker
5395731f94 INTEGRATION: CWS impress3ea1 (1.2.2); FILE MERGED
2004/02/20 12:39:05 cl 1.2.2.1: #114240# removed assertion, false alarm
2004-02-26 13:32:16 +00:00
Jens-Heiner Rechtien
d86aa11c7b INTEGRATION: CWS ooo20031216 (1.63.6); FILE MERGED
2003/12/28 09:03:49 waratah 1.63.6.1: #i23913# remove TRY CATCH macros and unneeded header used
2004-02-04 13:19:04 +00:00
Jens-Heiner Rechtien
5aedeb1d5e INTEGRATION: CWS dialogdiet (1.31.102); FILE MERGED
2004/01/19 21:57:35 mba 1.31.102.3: RESYNC: (1.32-1.33); FILE MERGED
2003/12/01 17:55:56 mba 1.31.102.2: RESYNC: (1.31-1.32); FILE MERGED
2003/11/28 15:54:02 mba 1.31.102.1: #i22972#: obsolete include
2004-02-04 08:47:56 +00:00
Jens-Heiner Rechtien
efe14c2a3b INTEGRATION: CWS dialogdiet (1.61.8); FILE MERGED
2004/01/19 21:57:04 mba 1.61.8.4: RESYNC: (1.62-1.63); FILE MERGED
2003/12/07 13:10:59 cd 1.61.8.3: #i22972# fixed wrong include
2003/12/01 17:55:38 mba 1.61.8.2: RESYNC: (1.61-1.62); FILE MERGED
2003/11/28 15:53:50 mba 1.61.8.1: #i22972#: obsolete include
2004-02-03 19:10:21 +00:00
Oliver Bolte
21d18ca087 INTEGRATION: CWS impress1 (1.7.128); FILE MERGED
2004/01/16 14:10:27 af 1.7.128.2: #111996# DrawView.hxx renamed back to lowercase drawview.hxx.
2003/09/16 12:27:28 af 1.7.128.1: #111996# Renamed files and classes due to introduction of namespace sd.
2004-01-20 09:28:49 +00:00
Oliver Bolte
ac970048e8 INTEGRATION: CWS impress1 (1.14.218); FILE MERGED
2003/09/16 12:27:25 af 1.14.218.1: #111996# Renamed files and classes due to introduction of namespace sd.
2004-01-20 09:28:24 +00:00