Kurt Zenker
a604a73d69
INTEGRATION: CWS impress111 (1.29.76); FILE MERGED
...
2006/12/01 12:46:08 af 1.29.76.1: #i43547# Added entry for ShowSlide.
2006-12-12 15:09:02 +00:00
Kurt Zenker
2294400345
INTEGRATION: CWS impress111 (1.25.10); FILE MERGED
...
2006/12/06 16:19:12 af 1.25.10.4: #i43547# Fixed some compiler problems.
2006/12/06 16:16:10 af 1.25.10.3: #i43547# Fixed some compiler problems.
2006/12/06 16:03:04 af 1.25.10.2: #i43547# Enabling both SID_HIDE_SLIDE and SID_SHOW_SLIDE for mixed selection.
2006/12/01 13:20:06 af 1.25.10.1: #i43547# Added SID_SHOW_SLIDE and updated handling of SID_HIDE_SLIDE to reflect recent spec changes.
2006-12-12 15:08:38 +00:00
Kurt Zenker
e134c990a5
INTEGRATION: CWS impress111 (1.7.48); FILE MERGED
...
2006/10/31 15:37:22 af 1.7.48.1: #i70773# Changed the scroll bar line size.
2006-12-12 15:08:19 +00:00
Kurt Zenker
19ebb6bc8e
INTEGRATION: CWS impress111 (1.4.258); FILE MERGED
...
2006/12/01 13:22:49 af 1.4.258.1: #i43547# Added SID_SHOW_SLIDE and updated handling of SID_HIDE_SLIDE to reflect recent spec changes.
2006-12-12 15:07:56 +00:00
Kurt Zenker
1a94b2b244
INTEGRATION: CWS impress111 (1.6.48); FILE MERGED
...
2006/12/01 13:21:46 af 1.6.48.1: #i43547# Added SID_SHOW_SLIDE and updated handling of SID_HIDE_SLIDE to reflect recent spec changes.
2006-12-12 15:07:27 +00:00
Kurt Zenker
66045eb888
INTEGRATION: CWS impress111 (1.36.10); FILE MERGED
...
2006/12/01 15:36:52 af 1.36.10.1: #i43547# Invalide the SID_SHOW_SLIDE and SID_HIDE_SLIDE slots when the selection changes.
2006-12-12 15:07:03 +00:00
Kurt Zenker
28240f267d
INTEGRATION: CWS impress111 (1.41.48); FILE MERGED
...
2006/11/27 13:24:01 af 1.41.48.1: #i69024# Using URL of first template in directory not that of directory itself to determine default entry.
2006-12-12 15:06:30 +00:00
Kurt Zenker
1fae5fc5db
INTEGRATION: CWS impress111 (1.36.318); FILE MERGED
...
2006/12/01 13:06:13 af 1.36.318.1: #i43547# Added MN_SHOW_PAGE entry to slide sorter popup menu.
2006-12-12 15:06:09 +00:00
Kurt Zenker
8212f5a89b
INTEGRATION: CWS impress111 (1.12.104); FILE MERGED
...
2006/12/01 13:02:09 af 1.12.104.1: #i43547# Modified mnemonic (en-US) for MN_MODIFY_PAGE.
2006-12-12 15:05:44 +00:00
Kurt Zenker
12db908b10
INTEGRATION: CWS impress111 (1.6.318); FILE MERGED
...
2006/12/01 12:59:53 af 1.6.318.1: #i43547# Added entry MN_SHOW_SLIDE.
2006-12-12 15:05:05 +00:00
Kurt Zenker
d6fb1dbeb6
INTEGRATION: CWS impress111 (1.94.20); FILE MERGED
...
2006/10/30 18:14:14 sj 1.94.20.1: #i39516# added patch, Closing parentasis misplaced on export to ppt
2006-12-12 15:04:47 +00:00
Kurt Zenker
d5c790b480
INTEGRATION: CWS impress111 (1.29.86); FILE MERGED
...
2006/12/04 09:32:04 af 1.29.86.1: #i43547# Added SID_SHOW_SLIDE entry.
2006-12-12 15:04:13 +00:00
Kurt Zenker
ec115e1f83
INTEGRATION: CWS impress111 (1.12.144); FILE MERGED
...
2006/12/01 13:24:27 af 1.12.144.1: #i43547# Added SID_SHOW_SLIDE.
2006-12-12 15:03:45 +00:00
Kurt Zenker
c2b2ee19ae
INTEGRATION: CWS impress111 (1.19.86); FILE MERGED
...
2006/12/01 13:23:37 af 1.19.86.1: #i43547# Added SID_SHOW_SLIDE.
2006-12-12 15:03:21 +00:00
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
a7451df547
INTEGRATION: CWS impress114 (1.10.78); FILE MERGED
...
2006/12/04 16:37:47 cl 1.10.78.1: #i70500# apply header&footer settings to new summary slide
2006-12-12 14:53:51 +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
Kurt Zenker
1eb9866087
INTEGRATION: CWS impress114 (1.19.352); FILE MERGED
...
2006/12/04 16:28:37 cl 1.19.352.1: #i69343# fixed untranslated strings, renamed en-us to en-US
2006-12-12 14:53:28 +00:00
Kurt Zenker
e6e98e5b5b
INTEGRATION: CWS aw037 (1.44.4); FILE MERGED
...
2006/11/22 16:50:40 aw 1.44.4.1: #i71727# made the case for leaving entered groups more precise
2006-12-12 14:53:18 +00:00
Kurt Zenker
901fb203c3
INTEGRATION: CWS impress114 (1.12.132); FILE MERGED
...
2006/12/04 16:28:37 cl 1.12.132.1: #i69343# fixed untranslated strings, renamed en-us to en-US
2006-12-12 14:52:56 +00:00
Kurt Zenker
ff5413bfd5
INTEGRATION: CWS aw037 (1.46.4); FILE MERGED
...
2006/11/27 16:38:17 aw 1.46.4.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:52:47 +00:00
Kurt Zenker
f2418c1397
INTEGRATION: CWS impress114 (1.6.344); FILE MERGED
...
2006/12/06 12:43:59 cl 1.6.344.2: #i65381# make more room for non english strings
2006/12/04 16:20:10 cl 1.6.344.1: #i65381# added patch to fix a german string
2006-12-12 14:52:36 +00:00
Kurt Zenker
59123d395d
INTEGRATION: CWS aw037 (1.40.4); FILE MERGED
...
2006/11/27 16:38:17 aw 1.40.4.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:52:31 +00:00
Kurt Zenker
9fed7dcec6
INTEGRATION: CWS impress114 (1.49.20); FILE MERGED
...
2006/12/04 16:51:44 cl 1.49.20.1: #i59257# changed default of SdrMeasureShowUnitItem for dimension style
2006-12-12 14:52:14 +00:00
Kurt Zenker
754f4e7f44
INTEGRATION: CWS aw037 (1.29.4); FILE MERGED
...
2006/11/27 16:38:16 aw 1.29.4.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:52:12 +00:00
Kurt Zenker
ddf3577b93
INTEGRATION: CWS aw037 (1.12.4); FILE MERGED
...
2006/11/27 16:38:16 aw 1.12.4.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:51:21 +00:00
Kurt Zenker
35ae514d48
INTEGRATION: CWS aw037 (1.53.4); FILE MERGED
...
2006/11/27 16:38:16 aw 1.53.4.1: #i65399# Some necessary cleanups/reworks of handles after aw024
2006-12-12 14:50:47 +00:00
Rüdiger Timm
3481979b26
#i71977# Missing include added (patch by pjanik).
2006-11-27 08:39:18 +00:00
Vladimir Glazounov
76bb3f0ff4
#100000# added missing include
2006-11-23 11:12:54 +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
Vladimir Glazounov
8d7586861a
INTEGRATION: CWS hr33 (1.7.30); FILE MERGED
...
2006/11/03 11:52:49 hr 1.7.30.2: RESYNC: (1.7-1.10); FILE MERGED
2006/05/03 16:18:37 hr 1.7.30.1: #i55967#: remove not needed STL includes
2006-11-22 09:44:35 +00:00
Vladimir Glazounov
9701b8662b
INTEGRATION: CWS pj65 (1.4.6); FILE MERGED
...
2006/10/31 13:17:15 pjanik 1.4.6.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
2006-11-21 16:27:54 +00:00
Vladimir Glazounov
d6fb120e26
INTEGRATION: CWS pj65 (1.11.6); FILE MERGED
...
2006/10/31 13:16:30 pjanik 1.11.6.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
2006-11-21 16:27:43 +00:00
Vladimir Glazounov
7602ae1c5d
INTEGRATION: CWS pj65 (1.8.6); FILE MERGED
...
2006/10/31 13:19:30 pjanik 1.8.6.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
2006-11-21 16:27:21 +00:00
Vladimir Glazounov
314397a6f3
INTEGRATION: CWS pj65 (1.5.12); FILE MERGED
...
2006/10/31 13:17:49 pjanik 1.5.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
2006-11-21 16:26:10 +00:00
Vladimir Glazounov
45e17ea129
INTEGRATION: CWS pj65 (1.8.6); FILE MERGED
...
2006/10/31 13:17:30 pjanik 1.8.6.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
2006-11-21 16:25:56 +00:00
Ivo Hinkelmann
0643799deb
INTEGRATION: CWS aw024 (1.38.22); FILE MERGED
...
2006/08/03 16:42:08 aw 1.38.22.7: RESYNC: (1.44-1.45); FILE MERGED
2006/07/04 14:57:18 aw 1.38.22.6: RESYNC: (1.43-1.44); FILE MERGED
2006/05/12 21:01:23 aw 1.38.22.5: RESYNC: (1.42-1.43); FILE MERGED
2006/01/26 20:26:01 aw 1.38.22.4: RESYNC: (1.40-1.42); FILE MERGED
2005/11/18 14:51:13 aw 1.38.22.3: RESYNC: (1.39-1.40); FILE MERGED
2005/09/17 14:21:35 aw 1.38.22.2: RESYNC: (1.38-1.39); FILE MERGED
2005/05/19 12:11:47 aw 1.38.22.1: #i39529#
2006-11-14 13:48:07 +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