Commit Graph

96 Commits

Author SHA1 Message Date
Oliver Bolte
036f14a771 INTEGRATION: CWS impress62 (1.7.96); FILE MERGED
2005/06/28 16:29:34 af 1.7.96.1: #i49904# Updating edit mode when controller is exchanged.
2005-07-07 12:35:39 +00:00
Oliver Bolte
25aff2c5bf INTEGRATION: CWS impress62 (1.12.74); FILE MERGED
2005/06/28 16:01:04 af 1.12.74.1: #i49761# Disabled copy-and-paste and drag-and-drop of master pages.
2005-07-07 12:35:27 +00:00
Oliver Bolte
7df78ca790 INTEGRATION: CWS impress62 (1.18.74); FILE MERGED
2005/06/29 08:17:40 af 1.18.74.1: #i47879# Fixed the reentrance guard of the Paint() method.
2005-07-07 12:35:10 +00:00
Rüdiger Timm
efd72c7025 INTEGRATION: CWS impress56 (1.20.32); FILE MERGED
2005/05/17 09:24:17 af 1.20.32.1: #i47383# Added guard against mpHitDescriptor being NULL.
2005-05-20 11:01:20 +00:00
Oliver Bolte
186dcfb0e2 INTEGRATION: CWS impress48 (1.15.4); FILE MERGED
2005/04/21 12:10:16 af 1.15.4.1: #120092# Added support for SID_ASSIGN_LAYOUT.
2005-04-27 07:55:29 +00:00
Oliver Bolte
506f301148 INTEGRATION: CWS impress46 (1.14.14); FILE MERGED
2005/04/08 14:41:48 af 1.14.14.3: #i46907# Divided DeleteSelectedSlides() into methods specific to normal slides and master pages.
2005/04/07 17:54:20 af 1.14.14.2: #i46907# Fixed getting the page count in DeletedSelectedSlides().
2005/04/07 17:38:09 af 1.14.14.1: #i46907# Fixed DeleteSelectedSlide() to avoid crash when closing document.
2005-04-18 10:16:04 +00:00
Oliver Bolte
78ccd7e419 INTEGRATION: CWS impress47 (1.14.22); FILE MERGED
2005/04/13 12:05:15 af 1.14.22.2: #i47266# Integrating changes for issue 46675 (rev. 1.14.10.1).
2005/04/13 09:56:13 af 1.14.22.1: #i47266# Calling SlideSorterView::Rearrange() with true from Resize().
2005-04-18 09:30:04 +00:00
Oliver Bolte
d25a361cdc INTEGRATION: CWS impress44 (1.14.10); FILE MERGED
2005/04/06 13:21:23 af 1.14.10.2: #i46675# Fixed update code after changing the number of columns.
2005/04/05 09:19:12 af 1.14.10.1: #i46605# Handling SID_PAGES_PER_ROW now calls SlideSorterView::Resize() for porper layouting.
2005-04-12 15:57:39 +00:00
Oliver Bolte
b087b6d852 INTEGRATION: CWS impress44 (1.19.10); FILE MERGED
2005/04/06 13:17:09 af 1.19.10.2: #i46675# Leaving the slide sorter removes the mouse over indicator.
2005/04/05 11:53:15 af 1.19.10.1: #i46671# Rectangle selection now selects slides that lie partly in the rectangle.
2005-04-12 15:57:18 +00:00
Oliver Bolte
12d210c068 INTEGRATION: CWS impress44 (1.3.18); FILE MERGED
2005/04/06 13:19:59 af 1.3.18.2: #i46675# Fixed repaint problems caused by the scroll bars.
2005/04/05 11:52:13 af 1.3.18.1: #i46671# Prevent auto scrolling when visible area can not be scrolled any further in one direction.
2005-04-12 15:56:56 +00:00
Oliver Bolte
35142365eb INTEGRATION: CWS impress44 (1.11.10); FILE MERGED
2005/04/05 08:57:18 af 1.11.10.1: #i46672# Handling SID_DELETE differently from SID_CUT.
2005-04-12 15:56:40 +00:00
Oliver Bolte
df1b22f842 INTEGRATION: CWS impress44 (1.14.10); FILE MERGED
2005/04/06 13:18:57 af 1.14.10.1: #i46675# Integrated part of i43687. Added argument to Rearrange() method.
2005-04-12 15:56:22 +00:00
Jens-Heiner Rechtien
373d080b9d INTEGRATION: CWS impress43 (1.14.2); FILE MERGED
2005/03/31 12:39:31 af 1.14.2.1: #i46387# Fixed handling of scrolling while painting.
2005-04-08 15:17:29 +00:00
Vladimir Glazounov
21d7722a7c INTEGRATION: CWS impress37 (1.9.46); FILE MERGED
2005/03/09 12:48:10 af 1.9.46.2: #i44006# Code cleanup.
2005/03/07 09:16:46 af 1.9.46.1: #i43382# Added a ModelChangeLock in ExecuteDrop().
2005-03-23 13:11:38 +00:00
Vladimir Glazounov
295519b612 INTEGRATION: CWS impress37 (1.3.120); FILE MERGED
2005/03/09 12:53:28 af 1.3.120.1: #i44006# Added new SlsSelectionCommand.
2005-03-23 13:00:46 +00:00
Vladimir Glazounov
b1cbe2a224 INTEGRATION: CWS impress37 (1.13.46); FILE MERGED
2005/03/11 12:38:29 af 1.13.46.2: #i44781# Added Cancel() call to processing of SID_PRESENTATION slot.
2005/03/09 12:52:55 af 1.13.46.1: #i44006# Added support for executing asynchronous Commands via user events.
2005-03-23 13:00:11 +00:00
Vladimir Glazounov
33ebddb2c8 INTEGRATION: CWS impress37 (1.18.8); FILE MERGED
2005/03/09 12:51:37 af 1.18.8.2: #i44006# Support for copy while dragging.  Code clean up.
2005/03/07 09:54:15 af 1.18.8.1: #i44006# Removed unused code for showing page transition effects.
2005-03-23 12:59:55 +00:00
Vladimir Glazounov
1e1f991791 INTEGRATION: CWS impress37 (1.1.2); FILE ADDED
2005/03/09 12:43:03 af 1.1.2.1: #i44006# Initial revision.
2005-03-23 12:59:41 +00:00
Vladimir Glazounov
0d509f001b INTEGRATION: CWS impress37 (1.1.2); FILE ADDED
2005/03/09 12:37:35 af 1.1.2.1: #i44006# Initial revision.
2005-03-23 12:59:30 +00:00
Vladimir Glazounov
ca34dbf6cf INTEGRATION: CWS impress37 (1.4.18); FILE MERGED
2005/03/09 12:49:40 af 1.4.18.1: #i44006# Improved existing SetCurrentPage(PageDescriptor&). Added SetCurrentPage(const SdPage*).
2005-03-23 12:59:18 +00:00
Vladimir Glazounov
0e30646867 INTEGRATION: CWS impress37 (1.5.8); FILE MERGED
2005/03/04 14:55:21 af 1.5.8.1: #i43382# Added two new hint ids.
2005-03-23 12:59:05 +00:00
Vladimir Glazounov
5cc878a161 INTEGRATION: CWS impress37 (1.1.2); FILE ADDED
2005/03/09 12:44:24 af 1.1.2.1: #i44006# Initial revision.
2005-03-23 12:58:50 +00:00
Vladimir Glazounov
0374f55809 INTEGRATION: CWS impress37 (1.11.8); FILE MERGED
2005/03/11 14:02:34 af 1.11.8.2: #i44006# Workaround for missing auto_ptr cast on Linux.
2005/03/09 12:46:09 af 1.11.8.1: #i44006# Use the new SelectionCommand to select pages after moving them.
2005-03-23 12:58:32 +00:00
Vladimir Glazounov
4cf0b8b68e INTEGRATION: CWS impress39 (1.11.28); FILE MERGED
2005/03/18 09:41:21 af 1.11.28.1: #i45282# Fixed guard against deleting last page.
2005-03-23 08:07:04 +00:00
Kurt Zenker
e463be935a INTEGRATION: CWS impress36 (1.2.248); FILE MERGED
2005/02/23 13:12:47 af 1.2.248.1: #i43231# The vertical scroll is shown only when necessary.
2005-03-18 15:51:37 +00:00
Kurt Zenker
27bcb4b45b INTEGRATION: CWS impress36 (1.4.114); FILE MERGED
2005/03/08 14:00:53 cl 1.4.114.2: RESYNC: (1.4-1.5); FILE MERGED
2005/02/23 13:22:50 af 1.4.114.1: #i43231# Removed unnecessary call to SlideSorterController.MakeSelectionVisible().
2005-03-18 15:51:23 +00:00
Kurt Zenker
cd7744ffbb INTEGRATION: CWS impress36 (1.9.34); FILE MERGED
2005/02/25 15:42:06 af 1.9.34.1: #i43443# Factored out code from DoPaste() and DragFinished() into new methods SelectPages(),GetInsertionPosition(),PasteTransferable(), and SelectPageRange().
2005-03-18 15:51:10 +00:00
Kurt Zenker
b753bab964 INTEGRATION: CWS impress36 (1.9.42); FILE MERGED
2005/03/08 14:00:40 cl 1.9.42.4: RESYNC: (1.9-1.11); FILE MERGED
2005/02/28 16:43:19 af 1.9.42.3: #i43439# Reacting to DataChanged event.
2005/02/25 15:37:45 af 1.9.42.2: #i43231# Moved most code of Resize() to new Rearrange() method.  Added maTotalWindowArea member.
2005/02/23 13:10:34 af 1.9.42.1: #i43231# Modified scroll bar handling.  Returning early from some unnecessary HandleModelChange() and MakeSelectionVisible() calls.
2005-03-18 15:50:57 +00:00
Rüdiger Timm
d59b60f4fb #i10000# Avoid endless loop 2005-03-01 07:36:52 +00:00
Vladimir Glazounov
e219deda1f INTEGRATION: CWS impress34 (1.15.2); FILE MERGED
2005/02/11 15:01:30 af 1.15.2.2: #i42415# Fixed selection with selection frame.
2005/02/11 12:18:56 af 1.15.2.1: #i42445# Fixed implementation of GotoNextSlide().
2005-02-24 14:06:40 +00:00
Vladimir Glazounov
2a5ae12576 INTEGRATION: CWS impress34 (1.4.94); FILE MERGED
2005/02/11 14:29:14 af 1.4.94.1: #i42145# Update the page selection after view swtiches.
2005-02-24 14:06:22 +00:00
Vladimir Glazounov
24a57b9a19 INTEGRATION: CWS impress34 (1.9.12); FILE MERGED
2005/02/11 14:22:46 af 1.9.12.3: #i42145# Fixed making visible the selection after view switching.
2005/02/11 12:17:36 af 1.9.12.2: #i42445# Fixed implementation of GetActualPage() and MakeSelectionVisible().
2005/02/08 11:00:41 af 1.9.12.1: #i41559# Exchanged order of adding undo actions in DeleteSelectedPages().
2005-02-24 14:06:09 +00:00
Vladimir Glazounov
eb875a2596 INTEGRATION: CWS impress31 (1.3.16); FILE MERGED
2005/01/28 09:17:16 cl 1.3.16.1: #i32920# reworked FuPage to work with master pages without a slide
2005-02-17 09:04:57 +00:00
Vladimir Glazounov
140d855f9d INTEGRATION: CWS impress31 (1.12.14); FILE MERGED
2005/01/27 17:05:34 af 1.12.14.1: #i41474# Setting mbPageHit correctly for mouse clicks.
2005-02-17 08:44:16 +00:00
Vladimir Glazounov
f3dd510188 INTEGRATION: CWS impress33 (1.13.2); FILE MERGED
2005/02/03 16:25:16 af 1.13.2.1: #i41786# Using page anchor at PageSelector.
2005-02-16 16:06:14 +00:00
Vladimir Glazounov
e9c552e3ef INTEGRATION: CWS impress33 (1.3.120); FILE MERGED
2005/02/03 16:22:32 af 1.3.120.1: #i41786# Added mpSelectionAnchor member and GetSelectionAnchor() method.
2005-02-16 15:57:36 +00:00
Rüdiger Timm
85801e6eee INTEGRATION: CWS iha06 (1.10.38); FILE MERGED
2005/01/11 14:22:14 iha 1.10.38.1: #i39635# remove delete page warning
2005-01-31 13:59:42 +00:00
Rüdiger Timm
04a92062af INTEGRATION: CWS iha06 (1.3.6); FILE MERGED
2005/01/19 17:02:11 iha 1.3.6.1: crash during delete slide in slide sorter
2005-01-31 13:59:24 +00:00
Rüdiger Timm
ed4d8bc725 INTEGRATION: CWS iha06 (1.11.38); FILE MERGED
2005/01/18 18:11:29 iha 1.11.38.2: RESYNC: (1.11-1.12); FILE MERGED
2005/01/11 14:20:56 iha 1.11.38.1: #i39635# remove delete page warning
2005-01-31 13:53:30 +00:00
Rüdiger Timm
304785f06a INTEGRATION: CWS iha06 (1.6.40); FILE MERGED
2005/01/11 14:19:43 iha 1.6.40.1: #i39635# remove delete page warning
2005-01-31 13:53:04 +00:00
Rüdiger Timm
f6e6904b5d INTEGRATION: CWS impress30 (1.12.2); FILE MERGED
2005/01/19 10:51:24 af 1.12.2.1: #i40949# Added new member mbProcessingMouseButtonDown.
2005-01-28 14:42:01 +00:00
Rüdiger Timm
2e9017d0d5 INTEGRATION: CWS impress27 (1.10.28); FILE MERGED
2004/12/14 15:54:02 af 1.10.28.1: #i38391# Removed support for the preview window.
2005-01-27 13:18:00 +00:00
Rüdiger Timm
b6e5ccf266 INTEGRATION: CWS impress27 (1.7.28); FILE MERGED
2004/12/14 15:54:01 af 1.7.28.1: #i38391# Removed support for the preview window.
2005-01-27 13:17:41 +00:00
Oliver Bolte
4de4c1126b INTEGRATION: CWS impress29 (1.2.186); FILE MERGED
2005/01/13 16:50:19 af 1.2.186.2: #i39639# Guard code in HideFocusIndicator() against pDescriptor being NULL.
2005/01/13 10:16:28 af 1.2.186.1: #i32465# Added new SetFocusedPage() method in two variants.
2005-01-25 14:34:22 +00:00
Oliver Bolte
3cfb15988f INTEGRATION: CWS impress29 (1.10.42); FILE MERGED
2005/01/13 16:51:49 af 1.10.42.1: #i39639# Added support for SID_DELETE slot.
2005-01-25 14:18:09 +00:00
Oliver Bolte
a7ade5e385 INTEGRATION: CWS impress29 (1.11.42); FILE MERGED
2005/01/13 10:17:40 af 1.11.42.1: #i32465# PageUp/Down now sets the focused page along with the current page.
2005-01-25 14:17:50 +00:00
Oliver Bolte
abc6df7384 INTEGRATION: CWS impress29 (1.6.44); FILE MERGED
2005/01/13 16:46:47 af 1.6.44.1: #i39639# Added support for SID_DELETE slot.
2005-01-25 14:17:27 +00:00
Oliver Bolte
dcdc0dd51a INTEGRATION: CWS impress29 (1.7.42); FILE MERGED
2005/01/13 10:15:17 af 1.7.42.1: #i32465# Not showing the focus anymore when the window slidesorter gets the input focus.
2005-01-25 14:17:13 +00:00
Kurt Zenker
35f1f99fcf INTEGRATION: CWS impress23 (1.6.8); FILE MERGED
2004/12/13 16:49:40 af 1.6.8.1: #i38797# Fixed use of bMergeMasterPages flag.
2005-01-21 15:35:43 +00:00
Kurt Zenker
809378ef06 INTEGRATION: CWS impress26 (1.11.26); FILE MERGED
2004/12/15 13:16:15 af 1.11.26.1: #i39026# For mouse clicks set the focus to the page that was clicked on.
2005-01-13 16:28:33 +00:00