Kurt Zenker
095e5706f8
INTEGRATION: CWS aw037 (1.61.2); FILE MERGED
...
2006/11/27 16:38:18 aw 1.61.2.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:55:26 +00:00
Kurt Zenker
853148adb9
INTEGRATION: CWS aw037 (1.33.2); FILE MERGED
...
2006/11/27 16:38:17 aw 1.33.2.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:54:41 +00:00
Kurt Zenker
a348bfba37
INTEGRATION: CWS impress114 (1.31.76); FILE MERGED
...
2006/12/05 15:33:24 af 1.31.76.1: #140703# In UpdateBorder check GetWindow(), too.
2006-12-12 14:54:23 +00:00
Kurt Zenker
465fee6a9f
INTEGRATION: CWS aw037 (1.48.4); FILE MERGED
...
2006/11/23 09:15:36 aw 1.48.4.1: #i71540# reimplemented SID_CONVERT_TO_BITMAP slot in DrawViewShell::FuTemporary() to support keeping Z-Order when converting objects to bitmap/metafile
2006-12-12 14:54:12 +00:00
Kurt Zenker
3083728bba
INTEGRATION: CWS aw037 (1.72.2); FILE MERGED
...
2006/11/27 16:38:17 aw 1.72.2.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:53:43 +00:00
Vladimir Glazounov
7caafa9de3
INTEGRATION: CWS impress113_SRC680 (1.59.14); FILE MERGED
...
2006/11/20 12:22:47 af 1.59.14.1: #i71646# Calling SetWindow(NULL) from Exit() while the main view shell state can still be detected.
2006-11-22 11:12:14 +00:00
Ivo Hinkelmann
5e8a6a1e97
INTEGRATION: CWS aw024 (1.56.4); FILE MERGED
...
2006/11/10 05:12:46 aw 1.56.4.6: RESYNC: (1.59-1.60); FILE MERGED
2006/09/21 23:51:19 aw 1.56.4.5: RESYNC: (1.58-1.59); FILE MERGED
2006/08/03 16:42:01 aw 1.56.4.4: RESYNC: (1.57-1.58); FILE MERGED
2006/07/07 16:04:57 aw 1.56.4.3: adaptions after resync SRC680m171->SRC680m174
2006/05/12 20:59:04 aw 1.56.4.2: RESYNC: (1.56-1.57); FILE MERGED
2006/02/02 14:11:36 aw 1.56.4.1: adaption to m154 after resync
2006-11-14 13:47:55 +00:00
Ivo Hinkelmann
581947bff1
INTEGRATION: CWS aw024 (1.38.12); FILE MERGED
...
2006/11/10 05:12:39 aw 1.38.12.10: RESYNC: (1.44-1.45); FILE MERGED
2006/09/21 23:51:05 aw 1.38.12.9: RESYNC: (1.43-1.44); FILE MERGED
2006/09/08 18:48:18 aw 1.38.12.8: RESYNC: (1.42-1.43); FILE MERGED
2006/06/09 13:46:22 aw 1.38.12.7: #114408# took back #i31551# and reactivated EnableChildTransparentMode after discussion with PL due to repaint errors with form controls
2006/05/12 20:58:45 aw 1.38.12.6: RESYNC: (1.41-1.42); FILE MERGED
2006/01/26 20:23:26 aw 1.38.12.5: RESYNC: (1.40-1.41); FILE MERGED
2005/11/18 14:49:18 aw 1.38.12.4: RESYNC: (1.39-1.40); FILE MERGED
2005/09/17 14:20:14 aw 1.38.12.3: RESYNC: (1.38-1.39); FILE MERGED
2005/05/26 11:24:52 aw 1.38.12.2: #i39531#
2005/05/19 12:11:46 aw 1.38.12.1: #i39529#
2006-11-14 13:47:34 +00:00
Ivo Hinkelmann
e15e425143
INTEGRATION: CWS aw024 (1.15.110); FILE MERGED
...
2006/09/21 23:50:48 aw 1.15.110.3: RESYNC: (1.16-1.17); FILE MERGED
2005/09/17 14:19:53 aw 1.15.110.2: RESYNC: (1.15-1.16); FILE MERGED
2005/05/19 12:11:46 aw 1.15.110.1: #i39529#
2006-11-14 13:47:21 +00:00
Ivo Hinkelmann
3f54635aeb
INTEGRATION: CWS aw024 (1.8.4); FILE MERGED
...
2006/09/21 23:50:21 aw 1.8.4.2: RESYNC: (1.8-1.9); FILE MERGED
2006/07/28 15:22:56 aw 1.8.4.1: #114408# adaptions for SW
2006-11-14 13:46:47 +00:00
Ivo Hinkelmann
bc0ec6f8b8
INTEGRATION: CWS aw024 (1.32.6); FILE MERGED
...
2006/09/21 23:50:14 aw 1.32.6.2: RESYNC: (1.32-1.33); FILE MERGED
2006/07/11 15:21:28 aw 1.32.6.1: adaptions after resync
2006-11-14 13:46:34 +00:00
Ivo Hinkelmann
99555ecaf1
INTEGRATION: CWS aw024 (1.22.12); FILE MERGED
...
2006/09/21 23:49:57 aw 1.22.12.10: RESYNC: (1.28-1.29); FILE MERGED
2006/05/12 20:58:20 aw 1.22.12.9: RESYNC: (1.27-1.28); FILE MERGED
2006/02/02 14:11:36 aw 1.22.12.8: adaption to m154 after resync
2006/01/26 20:22:39 aw 1.22.12.7: RESYNC: (1.24-1.27); FILE MERGED
2005/09/17 14:18:38 aw 1.22.12.6: RESYNC: (1.23-1.24); FILE MERGED
2005/08/03 11:45:47 sj 1.22.12.5: #i48467# changes for GraphicFilter progress bar
2005/05/26 11:24:51 aw 1.22.12.4: #i39531#
2005/05/19 12:11:45 aw 1.22.12.3: #i39529#
2005/05/13 14:43:01 aw 1.22.12.2: RESYNC: (1.22-1.23); FILE MERGED
2005/05/12 16:46:31 aw 1.22.12.1: #i39529#
2006-11-14 13:46:22 +00:00
Ivo Hinkelmann
c1eb7fa758
INTEGRATION: CWS aw024 (1.56.30); FILE MERGED
...
2006/11/10 05:12:33 aw 1.56.30.13: RESYNC: (1.67-1.69); FILE MERGED
2006/09/21 23:49:50 aw 1.56.30.12: RESYNC: (1.66-1.67); FILE MERGED
2006/08/03 16:41:46 aw 1.56.30.11: RESYNC: (1.65-1.66); FILE MERGED
2006/07/04 14:57:09 aw 1.56.30.10: RESYNC: (1.64-1.65); FILE MERGED
2006/05/12 20:58:13 aw 1.56.30.9: RESYNC: (1.62-1.64); FILE MERGED
2006/01/26 20:22:32 aw 1.56.30.8: RESYNC: (1.61-1.62); FILE MERGED
2005/11/22 14:23:16 aw 1.56.30.7: #b898147##
2005/11/18 14:49:08 aw 1.56.30.6: RESYNC: (1.60-1.61); FILE MERGED
2005/09/17 14:18:26 aw 1.56.30.5: RESYNC: (1.59-1.60); FILE MERGED
2005/05/26 11:24:51 aw 1.56.30.4: #i39531#
2005/05/19 12:11:44 aw 1.56.30.3: #i39529#
2005/03/23 20:17:53 aw 1.56.30.2: RESYNC: (1.56-1.59); FILE MERGED
2004/12/27 09:58:28 aw 1.56.30.1: #i39525
2006-11-14 13:46:09 +00:00
Ivo Hinkelmann
883957f881
INTEGRATION: CWS aw024 (1.42.4); FILE MERGED
...
2006/11/10 05:12:27 aw 1.42.4.12: RESYNC: (1.52-1.53); FILE MERGED
2006/09/21 23:49:43 aw 1.42.4.11: RESYNC: (1.51-1.52); FILE MERGED
2006/08/03 16:41:39 aw 1.42.4.10: RESYNC: (1.50-1.51); FILE MERGED
2006/07/04 14:56:58 aw 1.42.4.9: RESYNC: (1.49-1.50); FILE MERGED
2006/05/12 20:58:05 aw 1.42.4.8: RESYNC: (1.48-1.49); FILE MERGED
2006/01/26 20:22:23 aw 1.42.4.7: RESYNC: (1.46-1.48); FILE MERGED
2005/11/18 14:49:00 aw 1.42.4.6: RESYNC: (1.44-1.46); FILE MERGED
2005/09/17 14:16:41 aw 1.42.4.5: RESYNC: (1.43-1.44); FILE MERGED
2005/07/22 09:44:49 aw 1.42.4.4: RESYNC: (1.42-1.43); FILE MERGED
2005/05/26 11:24:50 aw 1.42.4.3: #i39531#
2005/05/19 12:11:44 aw 1.42.4.2: #i39529#
2005/05/12 16:46:31 aw 1.42.4.1: #i39529#
2006-11-14 13:45:56 +00:00
Ivo Hinkelmann
9e0cd937fa
INTEGRATION: CWS aw024 (1.40.12); FILE MERGED
...
2006/11/10 15:36:42 aw 1.40.12.15: RESYNC: (1.53-1.54); FILE MERGED
2006/11/10 05:12:20 aw 1.40.12.14: RESYNC: (1.51-1.53); FILE MERGED
2006/09/21 23:49:37 aw 1.40.12.13: RESYNC: (1.50-1.51); FILE MERGED
2006/08/03 16:41:31 aw 1.40.12.12: RESYNC: (1.49-1.50); FILE MERGED
2006/07/28 15:22:56 aw 1.40.12.11: #114408# adaptions for SW
2006/05/12 20:57:56 aw 1.40.12.10: RESYNC: (1.46-1.49); FILE MERGED
2006/02/02 14:11:35 aw 1.40.12.9: adaption to m154 after resync
2006/01/26 20:22:14 aw 1.40.12.8: RESYNC: (1.43-1.46); FILE MERGED
2005/11/18 14:48:51 aw 1.40.12.7: RESYNC: (1.42-1.43); FILE MERGED
2005/09/17 14:16:06 aw 1.40.12.6: RESYNC: (1.41-1.42); FILE MERGED
2005/08/03 11:49:54 sj 1.40.12.5: #i48467# changes for GraphicFilter progress bar
2005/05/26 11:24:50 aw 1.40.12.4: #i39531#
2005/05/19 12:11:44 aw 1.40.12.3: #i39529#
2005/05/13 14:42:52 aw 1.40.12.2: RESYNC: (1.40-1.41); FILE MERGED
2005/05/12 16:46:30 aw 1.40.12.1: #i39529#
2006-11-14 13:45:44 +00:00
Ivo Hinkelmann
1349791ad3
INTEGRATION: CWS aw024 (1.30.16); FILE MERGED
...
2006/11/10 05:12:14 aw 1.30.16.3: RESYNC: (1.31-1.32); FILE MERGED
2006/09/21 23:49:13 aw 1.30.16.2: RESYNC: (1.30-1.31); FILE MERGED
2006/07/07 16:04:56 aw 1.30.16.1: adaptions after resync SRC680m171->SRC680m174
2006-11-14 13:45:31 +00:00
Ivo Hinkelmann
d9f9c3da9d
INTEGRATION: CWS aw024 (1.35.10); FILE MERGED
...
2006/11/10 05:12:07 aw 1.35.10.7: RESYNC: (1.42-1.43); FILE MERGED
2006/09/21 23:49:06 aw 1.35.10.6: RESYNC: (1.41-1.42); FILE MERGED
2006/05/12 20:57:37 aw 1.35.10.5: RESYNC: (1.39-1.41); FILE MERGED
2006/01/26 20:21:54 aw 1.35.10.4: RESYNC: (1.38-1.39); FILE MERGED
2005/11/18 14:48:42 aw 1.35.10.3: RESYNC: (1.37-1.38); FILE MERGED
2005/09/17 14:15:29 aw 1.35.10.2: RESYNC: (1.35-1.37); FILE MERGED
2005/05/19 12:11:44 aw 1.35.10.1: #i39529#
2006-11-14 13:45:20 +00:00
Ivo Hinkelmann
69e44c944d
INTEGRATION: CWS aw024 (1.70.4); FILE MERGED
...
2006/09/21 23:48:59 aw 1.70.4.8: RESYNC: (1.81-1.82); FILE MERGED
2006/09/08 18:48:12 aw 1.70.4.7: RESYNC: (1.80-1.81); FILE MERGED
2006/05/12 20:57:28 aw 1.70.4.6: RESYNC: (1.77-1.80); FILE MERGED
2006/01/26 20:21:44 aw 1.70.4.5: RESYNC: (1.74-1.77); FILE MERGED
2005/11/18 14:48:33 aw 1.70.4.4: RESYNC: (1.73-1.74); FILE MERGED
2005/09/17 14:15:20 aw 1.70.4.3: RESYNC: (1.71-1.73); FILE MERGED
2005/07/22 09:44:38 aw 1.70.4.2: RESYNC: (1.70-1.71); FILE MERGED
2005/05/19 12:11:43 aw 1.70.4.1: #i39529#
2006-11-14 13:45:07 +00:00
Ivo Hinkelmann
df41a4fe22
INTEGRATION: CWS aw024 (1.4.176); FILE MERGED
...
2006/09/21 23:48:43 aw 1.4.176.4: RESYNC: (1.6-1.7); FILE MERGED
2006/09/08 18:48:05 aw 1.4.176.3: RESYNC: (1.5-1.6); FILE MERGED
2005/09/17 14:14:37 aw 1.4.176.2: RESYNC: (1.4-1.5); FILE MERGED
2005/04/26 14:58:43 aw 1.4.176.1: #i39528#
2006-11-14 13:44:55 +00:00
Ivo Hinkelmann
deef3fdfd9
INTEGRATION: CWS aw024 (1.24.32); FILE MERGED
...
2006/09/21 23:48:37 aw 1.24.32.7: RESYNC: (1.29-1.30); FILE MERGED
2005/11/18 14:48:03 aw 1.24.32.6: RESYNC: (1.28-1.29); FILE MERGED
2005/09/17 14:14:26 aw 1.24.32.5: RESYNC: (1.27-1.28); FILE MERGED
2005/07/22 09:44:20 aw 1.24.32.4: RESYNC: (1.25-1.27); FILE MERGED
2005/05/19 12:11:43 aw 1.24.32.3: #i39529#
2005/03/23 20:16:26 aw 1.24.32.2: RESYNC: (1.24-1.25); FILE MERGED
2004/12/27 09:58:28 aw 1.24.32.1: #i39525
2006-11-14 13:44:44 +00:00
Ivo Hinkelmann
8b6c35ce52
INTEGRATION: CWS aw024 (1.53.28); FILE MERGED
...
2006/11/10 05:11:52 aw 1.53.28.11: RESYNC: (1.61-1.62); FILE MERGED
2006/09/21 23:47:26 aw 1.53.28.10: RESYNC: (1.60-1.61); FILE MERGED
2006/08/03 16:40:55 aw 1.53.28.9: RESYNC: (1.58-1.60); FILE MERGED
2006/05/12 20:56:45 aw 1.53.28.8: RESYNC: (1.57-1.58); FILE MERGED
2006/01/26 20:21:12 aw 1.53.28.7: RESYNC: (1.55-1.57); FILE MERGED
2005/09/17 14:12:52 aw 1.53.28.6: RESYNC: (1.54-1.55); FILE MERGED
2005/07/22 09:44:10 aw 1.53.28.5: RESYNC: (1.53-1.54); FILE MERGED
2005/05/26 11:24:49 aw 1.53.28.4: #i39531#
2005/05/19 12:11:43 aw 1.53.28.3: #i39529#
2005/05/12 16:46:30 aw 1.53.28.2: #i39529#
2005/04/26 14:58:43 aw 1.53.28.1: #i39528#
2006-11-14 13:44:32 +00:00
Ivo Hinkelmann
73f3bbb045
INTEGRATION: CWS aw024 (1.7.56); FILE MERGED
...
2006/09/21 23:47:14 aw 1.7.56.3: RESYNC: (1.8-1.9); FILE MERGED
2005/09/17 14:12:42 aw 1.7.56.2: RESYNC: (1.7-1.8); FILE MERGED
2005/05/19 12:11:42 aw 1.7.56.1: #i39529#
2006-11-14 13:44:19 +00:00
Ivo Hinkelmann
4173802093
INTEGRATION: CWS aw024 (1.24.110); FILE MERGED
...
2006/09/21 23:47:07 aw 1.24.110.6: RESYNC: (1.27-1.28); FILE MERGED
2006/08/03 16:40:47 aw 1.24.110.5: RESYNC: (1.26-1.27); FILE MERGED
2006/01/26 20:21:03 aw 1.24.110.4: RESYNC: (1.25-1.26); FILE MERGED
2005/09/17 14:12:26 aw 1.24.110.3: RESYNC: (1.24-1.25); FILE MERGED
2005/05/19 12:11:42 aw 1.24.110.2: #i39529#
2005/05/12 16:46:30 aw 1.24.110.1: #i39529#
2006-11-14 13:44:07 +00:00
Ivo Hinkelmann
9aa8c1d114
INTEGRATION: CWS aw024 (1.20.110); FILE MERGED
...
2006/09/21 23:47:01 aw 1.20.110.6: RESYNC: (1.24-1.25); FILE MERGED
2006/05/12 20:56:35 aw 1.20.110.5: RESYNC: (1.22-1.24); FILE MERGED
2006/01/26 20:20:55 aw 1.20.110.4: RESYNC: (1.21-1.22); FILE MERGED
2005/09/17 14:12:16 aw 1.20.110.3: RESYNC: (1.20-1.21); FILE MERGED
2005/05/26 11:24:49 aw 1.20.110.2: #i39531#
2005/05/19 12:11:42 aw 1.20.110.1: #i39529#
2006-11-14 13:43:47 +00:00
Ivo Hinkelmann
f37bc62a4d
INTEGRATION: CWS aw024 (1.35.76); FILE MERGED
...
2006/09/21 23:46:54 aw 1.35.76.11: RESYNC: (1.42-1.43); FILE MERGED
2006/08/03 16:40:40 aw 1.35.76.10: RESYNC: (1.41-1.42); FILE MERGED
2006/05/12 20:56:27 aw 1.35.76.9: RESYNC: (1.40-1.41); FILE MERGED
2006/01/26 20:20:45 aw 1.35.76.8: RESYNC: (1.38-1.40); FILE MERGED
2005/11/18 14:47:53 aw 1.35.76.7: RESYNC: (1.37-1.38); FILE MERGED
2005/09/17 14:12:05 aw 1.35.76.6: RESYNC: (1.36-1.37); FILE MERGED
2005/07/22 09:44:00 aw 1.35.76.5: RESYNC: (1.35-1.36); FILE MERGED
2005/05/26 11:24:48 aw 1.35.76.4: #i39531#
2005/05/19 12:11:42 aw 1.35.76.3: #i39529#
2005/05/12 16:46:29 aw 1.35.76.2: #i39529#
2005/04/26 14:58:42 aw 1.35.76.1: #i39528#
2006-11-14 13:43:36 +00:00
Ivo Hinkelmann
dabbef98e7
INTEGRATION: CWS aw024 (1.13.110); FILE MERGED
...
2006/09/21 23:46:47 aw 1.13.110.7: RESYNC: (1.17-1.18); FILE MERGED
2006/08/03 16:40:26 aw 1.13.110.6: RESYNC: (1.16-1.17); FILE MERGED
2006/07/04 14:56:50 aw 1.13.110.5: RESYNC: (1.15-1.16); FILE MERGED
2006/01/26 20:20:35 aw 1.13.110.4: RESYNC: (1.14-1.15); FILE MERGED
2005/09/17 14:11:50 aw 1.13.110.3: RESYNC: (1.13-1.14); FILE MERGED
2005/05/26 11:24:48 aw 1.13.110.2: #i39531#
2005/05/19 12:11:41 aw 1.13.110.1: #i39529#
2006-11-14 13:43:22 +00:00
Ivo Hinkelmann
635631ace4
INTEGRATION: CWS aw024 (1.11.32); FILE MERGED
...
2006/09/21 23:46:40 aw 1.11.32.9: RESYNC: (1.16-1.17); FILE MERGED
2006/08/03 16:40:18 aw 1.11.32.8: RESYNC: (1.15-1.16); FILE MERGED
2006/05/17 10:01:35 aw 1.11.32.7: changes after resync
2006/01/26 20:20:27 aw 1.11.32.6: RESYNC: (1.13-1.15); FILE MERGED
2005/09/17 14:11:39 aw 1.11.32.5: RESYNC: (1.12-1.13); FILE MERGED
2005/05/26 11:24:48 aw 1.11.32.4: #i39531#
2005/05/19 12:11:41 aw 1.11.32.3: #i39529#
2005/05/13 14:41:50 aw 1.11.32.2: RESYNC: (1.11-1.12); FILE MERGED
2005/04/26 14:58:42 aw 1.11.32.1: #i39528#
2006-11-14 13:43:11 +00:00
Ivo Hinkelmann
1bb99ff3b3
INTEGRATION: CWS aw024 (1.58.28); FILE MERGED
...
2006/09/21 23:46:33 aw 1.58.28.8: RESYNC: (1.68-1.69); FILE MERGED
2006/08/03 16:40:10 aw 1.58.28.7: RESYNC: (1.66-1.68); FILE MERGED
2006/05/12 20:56:18 aw 1.58.28.6: RESYNC: (1.64-1.66); FILE MERGED
2006/01/26 20:20:18 aw 1.58.28.5: RESYNC: (1.61-1.64); FILE MERGED
2005/11/18 14:47:42 aw 1.58.28.4: RESYNC: (1.59-1.61); FILE MERGED
2005/09/17 14:11:30 aw 1.58.28.3: RESYNC: (1.58-1.59); FILE MERGED
2005/05/26 11:24:47 aw 1.58.28.2: #i39531#
2005/05/19 12:11:41 aw 1.58.28.1: #i39529#
2006-11-14 13:42:59 +00:00
Ivo Hinkelmann
106e6ffc84
INTEGRATION: CWS aw024 (1.19.56); FILE MERGED
...
2006/11/10 05:11:46 aw 1.19.56.7: RESYNC: (1.23-1.24); FILE MERGED
2006/09/21 23:46:27 aw 1.19.56.6: RESYNC: (1.22-1.23); FILE MERGED
2006/08/03 16:40:03 aw 1.19.56.5: RESYNC: (1.21-1.22); FILE MERGED
2006/01/26 20:20:09 aw 1.19.56.4: RESYNC: (1.20-1.21); FILE MERGED
2005/09/17 14:11:19 aw 1.19.56.3: RESYNC: (1.19-1.20); FILE MERGED
2005/05/26 11:24:47 aw 1.19.56.2: #i39531#
2005/05/19 12:11:41 aw 1.19.56.1: #i39529#
2006-11-14 13:42:38 +00:00
Ivo Hinkelmann
41eccac1c3
INTEGRATION: CWS aw024 (1.42.8); FILE MERGED
...
2006/09/21 23:46:20 aw 1.42.8.6: RESYNC: (1.45-1.46); FILE MERGED
2006/05/12 20:56:09 aw 1.42.8.5: RESYNC: (1.44-1.45); FILE MERGED
2006/01/26 20:20:00 aw 1.42.8.4: RESYNC: (1.43-1.44); FILE MERGED
2005/09/17 14:11:09 aw 1.42.8.3: RESYNC: (1.42-1.43); FILE MERGED
2005/05/26 11:24:46 aw 1.42.8.2: #i39531#
2005/05/19 12:11:40 aw 1.42.8.1: #i39529#
2006-11-14 13:42:28 +00:00
Ivo Hinkelmann
9ead051682
INTEGRATION: CWS aw024 (1.27.22); FILE MERGED
...
2006/09/21 23:46:05 aw 1.27.22.7: RESYNC: (1.33-1.34); FILE MERGED
2006/08/03 16:39:56 aw 1.27.22.6: RESYNC: (1.31-1.33); FILE MERGED
2006/05/12 20:55:59 aw 1.27.22.5: RESYNC: (1.30-1.31); FILE MERGED
2006/01/26 20:19:52 aw 1.27.22.4: RESYNC: (1.28-1.30); FILE MERGED
2005/09/17 14:10:53 aw 1.27.22.3: RESYNC: (1.27-1.28); FILE MERGED
2005/05/26 11:24:46 aw 1.27.22.2: #i39531#
2005/05/19 12:11:40 aw 1.27.22.1: #i39529#
2006-11-14 13:42:16 +00:00
Ivo Hinkelmann
93dacb9c62
INTEGRATION: CWS aw024 (1.32.56); FILE MERGED
...
2006/09/21 23:45:57 aw 1.32.56.8: RESYNC: (1.37-1.38); FILE MERGED
2006/08/03 16:39:48 aw 1.32.56.7: RESYNC: (1.36-1.37); FILE MERGED
2006/05/12 20:55:51 aw 1.32.56.6: RESYNC: (1.35-1.36); FILE MERGED
2006/01/26 20:19:41 aw 1.32.56.5: RESYNC: (1.34-1.35); FILE MERGED
2005/11/18 14:47:31 aw 1.32.56.4: RESYNC: (1.33-1.34); FILE MERGED
2005/09/17 14:10:44 aw 1.32.56.3: RESYNC: (1.32-1.33); FILE MERGED
2005/05/26 11:24:45 aw 1.32.56.2: #i39531#
2005/05/19 12:11:40 aw 1.32.56.1: #i39529#
2006-11-14 13:42:02 +00:00
Ivo Hinkelmann
3abba16834
INTEGRATION: CWS aw024 (1.40.84); FILE MERGED
...
2006/11/10 05:11:39 aw 1.40.84.7: RESYNC: (1.46-1.47); FILE MERGED
2006/09/21 23:45:50 aw 1.40.84.6: RESYNC: (1.45-1.46); FILE MERGED
2006/08/03 16:39:41 aw 1.40.84.5: RESYNC: (1.43-1.45); FILE MERGED
2006/01/26 20:19:31 aw 1.40.84.4: RESYNC: (1.41-1.43); FILE MERGED
2005/09/17 14:10:34 aw 1.40.84.3: RESYNC: (1.40-1.41); FILE MERGED
2005/05/26 11:24:45 aw 1.40.84.2: #i39531#
2005/05/19 12:11:40 aw 1.40.84.1: #i39529#
2006-11-14 13:41:49 +00:00
Ivo Hinkelmann
da52dffb61
INTEGRATION: CWS aw024 (1.53.48); FILE MERGED
...
2006/11/10 05:11:33 aw 1.53.48.13: RESYNC: (1.70-1.71); FILE MERGED
2006/09/21 23:45:44 aw 1.53.48.12: RESYNC: (1.69-1.70); FILE MERGED
2006/08/03 16:39:33 aw 1.53.48.11: RESYNC: (1.66-1.69); FILE MERGED
2006/07/07 16:04:56 aw 1.53.48.10: adaptions after resync SRC680m171->SRC680m174
2006/05/12 20:55:43 aw 1.53.48.9: RESYNC: (1.64-1.66); FILE MERGED
2006/01/26 20:19:22 aw 1.53.48.8: RESYNC: (1.61-1.64); FILE MERGED
2005/11/22 14:23:16 aw 1.53.48.7: #b898147##
2005/11/18 14:47:20 aw 1.53.48.6: RESYNC: (1.58-1.61); FILE MERGED
2005/09/17 14:10:23 aw 1.53.48.5: RESYNC: (1.57-1.58); FILE MERGED
2005/05/26 11:24:45 aw 1.53.48.4: #i39531#
2005/05/19 12:11:39 aw 1.53.48.3: #i39529#
2005/05/13 14:41:11 aw 1.53.48.2: RESYNC: (1.53-1.57); FILE MERGED
2005/05/12 16:46:29 aw 1.53.48.1: #i39529#
2006-11-14 13:41:38 +00:00
Ivo Hinkelmann
a1a6591df7
INTEGRATION: CWS aw024 (1.20.310); FILE MERGED
...
2006/09/21 23:45:37 aw 1.20.310.4: RESYNC: (1.24-1.25); FILE MERGED
2006/01/26 20:19:14 aw 1.20.310.3: RESYNC: (1.21-1.24); FILE MERGED
2005/09/17 14:10:09 aw 1.20.310.2: RESYNC: (1.20-1.21); FILE MERGED
2005/05/19 12:11:39 aw 1.20.310.1: #i39529#
2006-11-14 13:41:26 +00:00
Ivo Hinkelmann
dbf8bc63e4
INTEGRATION: CWS aw024 (1.6.112); FILE MERGED
...
2006/09/21 23:45:21 aw 1.6.112.6: RESYNC: (1.11-1.12); FILE MERGED
2006/08/03 16:39:16 aw 1.6.112.5: RESYNC: (1.10-1.11); FILE MERGED
2006/05/12 20:55:23 aw 1.6.112.4: RESYNC: (1.9-1.10); FILE MERGED
2006/01/26 20:18:56 aw 1.6.112.3: RESYNC: (1.7-1.9); FILE MERGED
2005/09/17 14:09:30 aw 1.6.112.2: RESYNC: (1.6-1.7); FILE MERGED
2005/04/26 14:58:41 aw 1.6.112.1: #i39528#
2006-11-14 13:41:07 +00:00
Ivo Hinkelmann
d07cfeb781
INTEGRATION: CWS aw024 (1.36.84); FILE MERGED
...
2006/09/21 23:45:14 aw 1.36.84.6: RESYNC: (1.40-1.41); FILE MERGED
2006/08/03 16:39:09 aw 1.36.84.5: RESYNC: (1.38-1.40); FILE MERGED
2006/01/26 20:18:48 aw 1.36.84.4: RESYNC: (1.37-1.38); FILE MERGED
2005/09/17 14:09:21 aw 1.36.84.3: RESYNC: (1.36-1.37); FILE MERGED
2005/05/26 11:24:44 aw 1.36.84.2: #i39531#
2005/05/19 12:11:39 aw 1.36.84.1: #i39529#
2006-11-14 13:40:55 +00:00
Ivo Hinkelmann
9e8b36d519
INTEGRATION: CWS aw024 (1.12.58); FILE MERGED
...
2006/09/21 23:44:30 aw 1.12.58.5: RESYNC: (1.15-1.16); FILE MERGED
2006/05/12 20:55:05 aw 1.12.58.4: RESYNC: (1.14-1.15); FILE MERGED
2005/09/17 14:07:41 aw 1.12.58.3: RESYNC: (1.13-1.14); FILE MERGED
2005/07/22 09:43:51 aw 1.12.58.2: RESYNC: (1.12-1.13); FILE MERGED
2005/05/19 12:11:39 aw 1.12.58.1: #i39529#
2006-11-14 13:40:43 +00:00
Ivo Hinkelmann
aefcd35fc8
INTEGRATION: CWS aw024 (1.3.110); FILE MERGED
...
2006/09/21 23:43:39 aw 1.3.110.5: RESYNC: (1.4-1.5); FILE MERGED
2005/09/17 14:06:27 aw 1.3.110.4: RESYNC: (1.3-1.4); FILE MERGED
2005/05/26 11:24:44 aw 1.3.110.3: #i39531#
2005/05/19 12:11:38 aw 1.3.110.2: #i39529#
2005/04/26 14:58:41 aw 1.3.110.1: #i39528#
2006-11-14 13:40:31 +00:00
Ivo Hinkelmann
89ad9f16d2
INTEGRATION: CWS aw024 (1.7.50); FILE MERGED
...
2006/11/10 05:11:08 aw 1.7.50.6: RESYNC: (1.10-1.11); FILE MERGED
2006/09/21 23:43:02 aw 1.7.50.5: RESYNC: (1.9-1.10); FILE MERGED
2006/08/07 11:14:03 aw 1.7.50.4: adaptions for changes in SdrPaintView, no more multi-PageViews
2006/08/03 16:38:52 aw 1.7.50.3: RESYNC: (1.8-1.9); FILE MERGED
2005/09/17 14:05:47 aw 1.7.50.2: RESYNC: (1.7-1.8); FILE MERGED
2005/04/26 14:58:41 aw 1.7.50.1: #i39528#
2006-11-14 13:40:19 +00:00
Ivo Hinkelmann
2ca125cb92
INTEGRATION: CWS aw024 (1.19.34); FILE MERGED
...
2006/09/21 23:42:23 aw 1.19.34.11: RESYNC: (1.26-1.28); FILE MERGED
2006/09/08 18:47:58 aw 1.19.34.10: RESYNC: (1.25-1.26); FILE MERGED
2006/08/03 16:38:23 aw 1.19.34.9: RESYNC: (1.24-1.25); FILE MERGED
2006/05/12 20:53:53 aw 1.19.34.8: RESYNC: (1.23-1.24); FILE MERGED
2006/02/02 14:11:34 aw 1.19.34.7: adaption to m154 after resync
2006/01/30 19:09:23 aw 1.19.34.6: RESYNC: (1.22-1.23); FILE MERGED
2006/01/26 20:18:11 aw 1.19.34.5: RESYNC: (1.21-1.22); FILE MERGED
2005/11/18 14:46:36 aw 1.19.34.4: RESYNC: (1.20-1.21); FILE MERGED
2005/09/17 14:04:28 aw 1.19.34.3: RESYNC: (1.19-1.20); FILE MERGED
2005/05/26 11:24:43 aw 1.19.34.2: #i39531#
2005/05/19 12:11:38 aw 1.19.34.1: #i39529#
2006-11-14 13:39:58 +00:00
Ivo Hinkelmann
92bb98c447
INTEGRATION: CWS aw024 (1.4.110); FILE MERGED
...
2006/09/21 23:41:41 aw 1.4.110.6: RESYNC: (1.7-1.8); FILE MERGED
2006/08/03 16:37:52 aw 1.4.110.5: RESYNC: (1.6-1.7); FILE MERGED
2006/05/12 20:53:24 aw 1.4.110.4: RESYNC: (1.5-1.6); FILE MERGED
2005/09/17 14:03:00 aw 1.4.110.3: RESYNC: (1.4-1.5); FILE MERGED
2005/05/26 11:24:43 aw 1.4.110.2: #i39531#
2005/05/19 12:11:38 aw 1.4.110.1: #i39529#
2006-11-14 13:39:46 +00:00
Kurt Zenker
b0a898c8a6
INTEGRATION: CWS pj64 (1.52.10); FILE MERGED
...
2006/10/23 17:06:23 pjanik 1.52.10.1: #i70601#: Do not crash after Del. Patch from Caolan.
2006-11-06 13:42:44 +00:00
Vladimir Glazounov
6404d79309
INTEGRATION: CWS inplaceobjects (1.58.38); FILE MERGED
...
2006/10/04 11:49:23 mba 1.58.38.3: #i66239#: force toolbar update after OLE deactivation
2006/09/28 12:39:26 mba 1.58.38.2: RESYNC: (1.58-1.59); FILE MERGED
2006/09/27 15:23:45 mba 1.58.38.1: #i66239#: make ToolbarManager aware of removed toolbars in Layoutmanager in case of OLEActivation
2006-11-01 17:05:37 +00:00
Vladimir Glazounov
5afd86bf9d
INTEGRATION: CWS inplaceobjects (1.66.50); FILE MERGED
...
2006/09/28 12:32:22 mba 1.66.50.3: RESYNC: (1.69-1.70); FILE MERGED
2006/08/21 14:33:09 mba 1.66.50.2: RESYNC: (1.66-1.69); FILE MERGED
2006/06/15 10:23:39 mba 1.66.50.1: #i66239#: centralize code for IP deactivation
2006-11-01 17:05:23 +00:00
Vladimir Glazounov
0afba3cb6d
INTEGRATION: CWS inplaceobjects (1.3.60); FILE MERGED
...
2006/09/28 12:29:04 mba 1.3.60.2: RESYNC: (1.3-1.4); FILE MERGED
2006/09/27 15:23:45 mba 1.3.60.1: #i66239#: make ToolbarManager aware of removed toolbars in Layoutmanager in case of OLEActivation
2006-11-01 17:05:01 +00:00
Vladimir Glazounov
e48c4aa8e6
INTEGRATION: CWS impress109 (1.51.20); FILE MERGED
...
2006/10/19 12:49:28 sj 1.51.20.2: RESYNC: (1.51-1.52); FILE MERGED
2006/10/13 08:09:37 cl 1.51.20.1: #133468# use weak reference for text edit object
2006-11-01 13:18:22 +00:00
Vladimir Glazounov
152cb6fbad
INTEGRATION: CWS impress109 (1.18.24); FILE MERGED
...
2006/10/10 15:06:23 cl 1.18.24.1: #134177# check if draw view is 0 before using it
2006-11-01 13:18:06 +00:00
Vladimir Glazounov
c16b502a36
INTEGRATION: CWS impress109 (1.61.20); FILE MERGED
...
2006/10/10 15:06:22 cl 1.61.20.1: #134177# check if draw view is 0 before using it
2006-11-01 13:17:47 +00:00
Vladimir Glazounov
7521ba9de9
INTEGRATION: CWS impress109 (1.23.22); FILE MERGED
...
2006/10/10 15:06:22 cl 1.23.22.1: #134177# check if draw view is 0 before using it
2006-11-01 13:17:33 +00:00