Commit graph

98 commits

Author SHA1 Message Date
Rüdiger Timm
06010c637d INTEGRATION: CWS changefileheader (1.14.52); FILE MERGED
2008/03/31 13:58:56 rt 1.14.52.1: #i87441# Change license header to LPGL v3.
2008-04-10 21:17:21 +00:00
Rüdiger Timm
8274234365 INTEGRATION: CWS changefileheader (1.20.52); FILE MERGED
2008/04/01 15:35:58 thb 1.20.52.2: #i85898# Stripping all external header guards
2008/03/31 13:58:56 rt 1.20.52.1: #i87441# Change license header to LPGL v3.
2008-04-10 21:17:06 +00:00
Rüdiger Timm
777b7a293b INTEGRATION: CWS changefileheader (1.7.234); FILE MERGED
2008/04/01 15:35:58 thb 1.7.234.2: #i85898# Stripping all external header guards
2008/03/31 13:58:56 rt 1.7.234.1: #i87441# Change license header to LPGL v3.
2008-04-10 21:16:48 +00:00
Rüdiger Timm
4f44f4cf75 INTEGRATION: CWS changefileheader (1.5.298); FILE MERGED
2008/03/31 13:58:56 rt 1.5.298.1: #i87441# Change license header to LPGL v3.
2008-04-10 21:16:33 +00:00
Rüdiger Timm
bbb0ad1e9b INTEGRATION: CWS changefileheader (1.9.358); FILE MERGED
2008/03/31 13:58:56 rt 1.9.358.1: #i87441# Change license header to LPGL v3.
2008-04-10 21:15:58 +00:00
Rüdiger Timm
7a0732f9af INTEGRATION: CWS changefileheader (1.5.358); FILE MERGED
2008/03/31 13:58:55 rt 1.5.358.1: #i87441# Change license header to LPGL v3.
2008-04-10 21:15:40 +00:00
Kurt Zenker
e7da5542a8 #i87920# mrSlideSorter 2008-04-07 11:10:45 +00:00
Kurt Zenker
4cfbe80234 INTEGRATION: CWS presenterview (1.21.54); FILE MERGED
2008/03/03 17:05:15 af 1.21.54.8: #i18486# Reinserted TYPEINIT definition.
2008/02/26 12:30:15 af 1.21.54.7: #i18486# Dropped the use of templates for implementing cache classes.
2008/02/26 09:03:29 af 1.21.54.6: RESYNC: (1.22-1.23); FILE MERGED
2007/08/01 11:43:24 af 1.21.54.5: #i18486# Tell highlight object about modified device transformation.
2007/07/25 14:38:40 af 1.21.54.4: #i18486# Added AddSdrObject() method.
2007/07/11 09:09:12 af 1.21.54.3: RESYNC: (1.21-1.22); FILE MERGED
2007/04/27 11:07:17 af 1.21.54.2: #i75317# Separation of SlideSorter and ViewShell.
2007/03/12 15:35:37 af 1.21.54.1: #i75317# Remove dependecy of slide sorter on SlideSorterViewShell.
2008-04-03 13:57:24 +00:00
Kurt Zenker
8c60d5f917 INTEGRATION: CWS presenterview (1.7.8); FILE MERGED
2008/02/26 12:45:34 af 1.7.8.2: #i18486# Added SlsViewCacheContext.
2007/07/25 12:26:17 af 1.7.8.1: #i18486# Added HighlightObject.
2008-04-03 13:45:40 +00:00
Kurt Zenker
9244986c6c INTEGRATION: CWS presenterview (1.12.54); FILE MERGED
2008/02/27 09:14:42 af 1.12.54.4: #i18486# Resolved resync problems.
2008/02/26 09:03:37 af 1.12.54.3: RESYNC: (1.13-1.14); FILE MERGED
2007/04/26 08:48:06 af 1.12.54.2: #i18486# Resolved resync problems.
2007/03/12 15:35:38 af 1.12.54.1: #i75317# Remove dependecy of slide sorter on SlideSorterViewShell.
2008-04-03 13:45:26 +00:00
Kurt Zenker
cd361fde6a INTEGRATION: CWS presenterview (1.1.2); FILE ADDED
2008/02/26 12:44:50 af 1.1.2.1: #i18486# Initial revision.
2008-04-03 13:45:13 +00:00
Kurt Zenker
1d9d01690e INTEGRATION: CWS presenterview (1.1.2); FILE ADDED
2008/02/26 12:44:38 af 1.1.2.1: #i18486# Initial revision.
2008-04-03 13:45:03 +00:00
Kurt Zenker
3c40cce099 INTEGRATION: CWS presenterview (1.18.52); FILE MERGED
2008/02/27 09:14:42 af 1.18.52.11: #i18486# Resolved resync problems.
2008/02/26 09:03:33 af 1.18.52.10: RESYNC: (1.19-1.20); FILE MERGED
2007/09/25 08:00:32 af 1.18.52.9: #i18486# Removed shortwiring return from PaintBackground().
2007/09/11 12:48:55 af 1.18.52.8: #i18486# Do not paint selection or focus indicators when corresponding flags are set.
2007/08/13 09:25:54 af 1.18.52.7: #i18486# Use new Colors in Properties.
2007/08/01 11:46:01 af 1.18.52.6: #i18486# Added opacity argument to GetColor() method.
2007/07/25 12:27:41 af 1.18.52.5: #i18486# Disabled PaintBackground().
2007/07/24 10:58:29 af 1.18.52.4: #i18486# Fixed resync problems.
2007/07/20 09:51:56 af 1.18.52.3: #i75317# Removed dependency on ObjectContactOfPageView.
2007/07/11 09:09:24 af 1.18.52.2: RESYNC: (1.18-1.19); FILE MERGED
2007/04/26 14:18:39 af 1.18.52.1: #i75317# Using shared_ptr for PageDescriptor.  Current slide can be painted highlighted.
2008-04-03 13:44:53 +00:00
Kurt Zenker
aa4fa50532 INTEGRATION: CWS presenterview (1.7.22); FILE MERGED
2007/04/26 12:54:18 af 1.7.22.1: #i75317# Using shared_ptr for PageDescriptor.
2008-04-03 13:44:38 +00:00
Kurt Zenker
ae4a5071e5 INTEGRATION: CWS presenterview (1.5.54); FILE MERGED
2007/04/26 12:49:11 af 1.5.54.1: #i75317# Using shared_ptr for PageDescriptor.
2008-04-03 13:44:24 +00:00
Kurt Zenker
21b4af1688 INTEGRATION: CWS presenterview (1.9.122); FILE MERGED
2007/04/27 11:14:31 af 1.9.122.3: #i75317# Renamed ...Desired... to ...Preferred...
2007/04/27 11:12:30 af 1.9.122.2: #i75317# Removed unused method.
2007/03/12 15:35:38 af 1.9.122.1: #i75317# Remove dependecy of slide sorter on SlideSorterViewShell.
2008-04-03 13:44:08 +00:00
Kurt Zenker
f0c96746a2 INTEGRATION: CWS impress139 (1.23.22); FILE MERGED
2008/03/26 15:06:19 cl 1.23.22.1: #i87250# fixed assertion
2008-04-02 08:48:54 +00:00
Vladimir Glazounov
5d96972084 INTEGRATION: CWS aw054 (1.13.138); FILE MERGED
2007/10/17 13:26:32 af 1.13.138.1: #i82710# Using overlay support of drawing layer for painting overlays.
2008-02-12 15:29:19 +00:00
Vladimir Glazounov
438752a682 INTEGRATION: CWS aw054 (1.19.84); FILE MERGED
2007/10/17 13:25:19 af 1.19.84.1: #i82710# GetBoundingBox() replaces all bounding box related query methods.  Made PaintMouseOverEffect() public.
2008-02-12 15:29:06 +00:00
Vladimir Glazounov
ce101a43c0 INTEGRATION: CWS aw054 (1.22.124); FILE MERGED
2007/10/17 13:24:13 af 1.22.124.1: #i82710# Removed HideAndSave() and Restore() methods from the overlay manager.  Replaced GetFadeEffectIndicatorArea() with GetBoundingBox() in PageObjectViewObjectContact.
2008-02-12 15:28:53 +00:00
Jens-Heiner Rechtien
fc42e2f18a INTEGRATION: CWS aw046 (1.18.88); FILE MERGED
2007/04/03 11:09:10 aw 1.18.88.1: #i74769# Added support for PaintBuffer
2007-06-26 10:47:12 +00:00
Kurt Zenker
f85d95c6b8 INTEGRATION: CWS pchfix04 (1.21.6); FILE MERGED
2006/12/22 14:16:29 hjs 1.21.6.1: #i72801# make gcc 3.4.1 survive pch
2007-05-10 14:32:48 +00:00
Rüdiger Timm
688e70e905 INTEGRATION: CWS components1 (1.12.38); FILE MERGED
2007/01/31 13:52:30 af 1.12.38.1: #i68075# UpdateLockManager stored as shared_ptr.
2007-04-03 15:19:27 +00:00
Rüdiger Timm
754fec534e INTEGRATION: CWS components1 (1.4.148); FILE MERGED
2006/11/21 16:23:20 af 1.4.148.3: RESYNC: (1.5-1.6); FILE MERGED
2006/09/25 17:26:33 af 1.4.148.2: RESYNC: (1.4-1.5); FILE MERGED
2006/08/22 11:49:35 af 1.4.148.1: #i68075# Added ActionChanged() method.
2007-04-03 15:19:16 +00:00
Vladimir Glazounov
b875915c63 INTEGRATION: CWS ause074 (1.6.376); FILE MERGED
2007/02/01 11:41:11 hjs 1.6.376.1: #i74024#,#i73801# remove obsolete include
2007-02-06 12:14:53 +00:00
Kurt Zenker
a5913c91f7 INTEGRATION: CWS sdwarningsbegone (1.4.38); FILE MERGED
2006/11/22 12:42:14 cl 1.4.38.1: #i69285# warning free code changes for unxlngi6.pro
2006-12-12 17:41:26 +00:00
Kurt Zenker
ab48bb4ba1 INTEGRATION: CWS sdwarningsbegone (1.11.4); FILE MERGED
2006/11/27 15:15:04 cl 1.11.4.1: #i69285# warning free code changes for sd project
2006-12-12 17:39:08 +00:00
Kurt Zenker
0ae1a389e0 INTEGRATION: CWS sdwarningsbegone (1.16.34); FILE MERGED
2006/11/22 15:10:43 cl 1.16.34.2: RESYNC: (1.16-1.17); FILE MERGED
2006/11/22 12:42:14 cl 1.16.34.1: #i69285# warning free code changes for unxlngi6.pro
2006-12-12 17:38:50 +00:00
Kurt Zenker
e35ebee9ac INTEGRATION: CWS sdwarningsbegone (1.19.34); FILE MERGED
2006/11/22 15:10:14 cl 1.19.34.2: RESYNC: (1.19-1.20); FILE MERGED
2006/11/22 12:42:13 cl 1.19.34.1: #i69285# warning free code changes for unxlngi6.pro
2006-12-12 17:37:54 +00:00
Ivo Hinkelmann
1772110da6 INTEGRATION: CWS aw024 (1.7.34); FILE MERGED
2006/09/21 23:28:23 aw 1.7.34.4: RESYNC: (1.9-1.10); FILE MERGED
2006/05/12 20:42:53 aw 1.7.34.3: RESYNC: (1.8-1.9); FILE MERGED
2005/09/17 13:31:43 aw 1.7.34.2: RESYNC: (1.7-1.8); FILE MERGED
2005/05/19 12:11:34 aw 1.7.34.1: #i39529#
2006-11-14 13:37:02 +00:00
Ivo Hinkelmann
5133a9be95 INTEGRATION: CWS aw024 (1.8.56); FILE MERGED
2006/09/21 23:28:17 aw 1.8.56.7: RESYNC: (1.15-1.16); FILE MERGED
2006/05/12 20:42:43 aw 1.8.56.6: RESYNC: (1.14-1.15); FILE MERGED
2006/01/26 20:14:56 aw 1.8.56.5: RESYNC: (1.13-1.14); FILE MERGED
2005/11/18 14:43:10 aw 1.8.56.4: RESYNC: (1.11-1.13); FILE MERGED
2005/09/17 13:31:30 aw 1.8.56.3: RESYNC: (1.10-1.11); FILE MERGED
2005/07/22 09:36:23 aw 1.8.56.2: RESYNC: (1.8-1.10); FILE MERGED
2005/05/19 12:11:34 aw 1.8.56.1: #i39529#
2006-11-14 13:36:48 +00:00
Ivo Hinkelmann
b5b762489d INTEGRATION: CWS aw024 (1.2.176); FILE MERGED
2006/09/21 23:28:10 aw 1.2.176.4: RESYNC: (1.4-1.5); FILE MERGED
2006/01/26 20:14:48 aw 1.2.176.3: RESYNC: (1.3-1.4); FILE MERGED
2005/09/17 13:31:22 aw 1.2.176.2: RESYNC: (1.2-1.3); FILE MERGED
2005/05/19 12:11:34 aw 1.2.176.1: #i39529#
2006-11-14 13:36:35 +00:00
Ivo Hinkelmann
ff10002b83 INTEGRATION: CWS aw024 (1.7.4); FILE MERGED
2006/09/21 23:27:24 aw 1.7.4.10: RESYNC: (1.18-1.19); FILE MERGED
2006/05/12 20:42:34 aw 1.7.4.9: RESYNC: (1.14-1.18); FILE MERGED
2006/01/26 20:14:32 aw 1.7.4.8: RESYNC: (1.13-1.14); FILE MERGED
2005/11/18 14:42:44 aw 1.7.4.7: RESYNC: (1.12-1.13); FILE MERGED
2005/09/17 13:30:31 aw 1.7.4.6: RESYNC: (1.11-1.12); FILE MERGED
2005/07/22 09:35:56 aw 1.7.4.5: RESYNC: (1.10-1.11); FILE MERGED
2005/05/26 11:24:40 aw 1.7.4.4: #i39531#
2005/05/19 12:11:34 aw 1.7.4.3: #i39529#
2005/05/13 14:35:46 aw 1.7.4.2: RESYNC: (1.7-1.10); FILE MERGED
2005/05/12 16:46:27 aw 1.7.4.1: #i39529#
2006-11-14 13:36:22 +00:00
Oliver Bolte
c8b783b74c INTEGRATION: CWS pchfix02 (1.9.120); FILE MERGED
2006/09/01 17:37:21 kaib 1.9.120.1: #i68856# Added header markers and pch files
2006-09-16 18:11:43 +00:00
Oliver Bolte
62a1a61bd2 INTEGRATION: CWS pchfix02 (1.15.88); FILE MERGED
2006/09/01 17:37:20 kaib 1.15.88.1: #i68856# Added header markers and pch files
2006-09-16 18:11:29 +00:00
Oliver Bolte
05199acd45 INTEGRATION: CWS pchfix02 (1.4.196); FILE MERGED
2006/09/01 17:37:20 kaib 1.4.196.1: #i68856# Added header markers and pch files
2006-09-16 18:11:14 +00:00
Oliver Bolte
4e84b5f02c INTEGRATION: CWS pchfix02 (1.3.282); FILE MERGED
2006/09/01 17:37:20 kaib 1.3.282.1: #i68856# Added header markers and pch files
2006-09-16 18:10:58 +00:00
Oliver Bolte
e682a3ebd9 INTEGRATION: CWS pchfix02 (1.8.248); FILE MERGED
2006/09/01 17:37:20 kaib 1.8.248.1: #i68856# Added header markers and pch files
2006-09-16 18:10:25 +00:00
Oliver Bolte
283b32b8b1 INTEGRATION: CWS pchfix02 (1.4.282); FILE MERGED
2006/09/01 17:37:20 kaib 1.4.282.1: #i68856# Added header markers and pch files
2006-09-16 18:10:11 +00:00
Oliver Bolte
84627292cd INTEGRATION: CWS pchfix02 (1.18.88); FILE MERGED
2006/09/01 17:37:20 kaib 1.18.88.1: #i68856# Added header markers and pch files
2006-09-16 18:09:58 +00:00
Rüdiger Timm
617ec6512c INTEGRATION: CWS impress92 (1.14.104); FILE MERGED
2006/04/26 13:16:37 af 1.14.104.1: #i63668# Using correct style settings from device.  PaintMouseOverEffect() restores the draw mode after temporarily changing it.
2006-05-05 09:07:02 +00:00
Rüdiger Timm
04210b9e50 INTEGRATION: CWS impress92 (1.16.8); FILE MERGED
2006/04/26 13:14:51 af 1.16.8.1: #i63668# Added HandleDrawModeChange() method.
2006-05-05 09:06:46 +00:00
Rüdiger Timm
60ed2edcad INTEGRATION: CWS impress93 (1.15.46); FILE MERGED
2006/04/28 11:59:59 af 1.15.46.2: #133945# Resolved conflicts of comming merge with rev. 1.16
2006/04/20 11:35:44 cl 1.15.46.1: #133945# Added more guards against GetWindow() returning NULL.
2006-04-28 14:04:25 +00:00
Vladimir Glazounov
3197fffb88 INTEGRATION: CWS impress89 (1.8.154); FILE MERGED
2006/03/20 11:01:50 af 1.8.154.1: #132646# Using shared_ptr to slidesorter PageDescriptor.
2006-04-06 15:28:14 +00:00
Vladimir Glazounov
662b4ffb98 INTEGRATION: CWS impress89 (1.15.24); FILE MERGED
2006/03/20 11:00:32 af 1.15.24.1: #132646# Using shared_ptr to slidesorter PageDescriptor.
2006-04-06 15:27:38 +00:00
Rüdiger Timm
c12810bda8 INTEGRATION: CWS impress86 (1.14.24); FILE MERGED
2006/02/08 16:15:46 af 1.14.24.1: #i61768# Reinserted code that was accidentally removed.
2006-02-09 16:20:55 +00:00
Oliver Bolte
c63852512e INTEGRATION: CWS impress78 (1.13.44); FILE MERGED
2005/12/15 16:48:09 af 1.13.44.2: #i57918# Using correct box for focus indicator.
2005/12/08 09:32:38 af 1.13.44.1: #127723# Remove contact object from queue.
2006-01-19 11:55:08 +00:00
Oliver Bolte
96b4ee80f4 INTEGRATION: CWS impress78 (1.3.82); FILE MERGED
2005/12/12 13:07:57 af 1.3.82.1: #i58769# Added destructor.
2006-01-19 11:54:53 +00:00
Oliver Bolte
2f836308fe INTEGRATION: CWS impress78 (1.13.44); FILE MERGED
2005/12/12 13:01:22 af 1.13.44.1: #i58769# PageNumberArea and ModelBorder stored in view instead of page objects.
2006-01-19 11:54:11 +00:00
Rüdiger Timm
12543a0429 INTEGRATION: CWS impress69 (1.10.72); FILE MERGED
2005/10/18 09:39:26 af 1.10.72.4: #i54589# ActionChanged() now invalidates the cached bitmap always.
2005/10/14 11:19:28 af 1.10.72.3: RESYNC: (1.10-1.12); FILE MERGED
2005/09/22 08:09:25 af 1.10.72.2: #i54916# Support for bitmap compression.
2005/09/14 11:39:53 af 1.10.72.1: #i54589# Added support for persistent caches.
2005-10-24 06:45:00 +00:00