Commit Graph

25 Commits

Author SHA1 Message Date
Kurt Zenker
bd1ad7e450 INTEGRATION: CWS presenterview (1.23.52); FILE MERGED
2008/01/21 13:41:45 af 1.23.52.6: #i18486# Dropped the use of XDrawPage references by SlsCurrentSlideManager in order to properly work with slideshows that have multiple references to one slide.
2007/07/24 10:58:29 af 1.23.52.5: #i18486# Fixed resync problems.
2007/07/11 09:08:13 af 1.23.52.4: RESYNC: (1.24-1.25); FILE MERGED
2007/04/26 12:14:52 af 1.23.52.3: #i75317# Addaption to SlideSorterController reorganization.
2007/04/26 08:48:04 af 1.23.52.2: #i18486# Resolved resync problems.
2007/03/12 15:25:32 af 1.23.52.1: #i75317# Remove dependency between slide sorter and ViewShell.
2008-04-03 13:23:55 +00:00
Jens-Heiner Rechtien
af89c2e73b INTEGRATION: CWS impress122 (1.24.50); FILE MERGED
2007/06/13 15:25:23 af 1.24.50.1: #i76707# Made copy the default drop action for dragging pages to another document.
2007-06-27 14:45:20 +00:00
Rüdiger Timm
8796dfd542 INTEGRATION: CWS components1 (1.19.72); FILE MERGED
2007/01/25 15:18:18 af 1.19.72.5: RESYNC: (1.22-1.23); FILE MERGED
2006/11/21 16:22:47 af 1.19.72.4: RESYNC: (1.21-1.22); FILE MERGED
2006/11/21 09:39:52 af 1.19.72.3: RESYNC: (1.20-1.21); FILE MERGED
2006/09/25 17:23:02 af 1.19.72.2: RESYNC: (1.19-1.20); FILE MERGED
2006/08/22 11:39:01 af 1.19.72.1: #i68075# Adaption to change of signature of ViewShellBase::Get(Main)ViewShell().
2007-04-03 15:16:50 +00:00
Kurt Zenker
3ee9bb692a INTEGRATION: CWS sdwarningsbegone (1.20.34); FILE MERGED
2006/11/22 15:09:52 cl 1.20.34.2: RESYNC: (1.20-1.22); FILE MERGED
2006/11/22 12:42:11 cl 1.20.34.1: #i69285# warning free code changes for unxlngi6.pro
2006-12-12 17:23:00 +00:00
Ivo Hinkelmann
213eca5bbd INTEGRATION: CWS aw024 (1.10.4); FILE MERGED
2006/11/10 05:10:39 aw 1.10.4.10: RESYNC: (1.20-1.21); FILE MERGED
2006/09/21 23:24:16 aw 1.10.4.9: RESYNC: (1.19-1.20); FILE MERGED
2006/05/17 10:01:34 aw 1.10.4.8: changes after resync
2006/05/12 20:38:18 aw 1.10.4.7: RESYNC: (1.18-1.19); FILE MERGED
2006/01/26 20:12:28 aw 1.10.4.6: RESYNC: (1.16-1.18); FILE MERGED
2005/11/18 14:40:16 aw 1.10.4.5: RESYNC: (1.14-1.16); FILE MERGED
2005/09/17 13:14:36 aw 1.10.4.4: RESYNC: (1.13-1.14); FILE MERGED
2005/07/22 09:31:29 aw 1.10.4.3: RESYNC: (1.12-1.13); FILE MERGED
2005/05/13 14:32:14 aw 1.10.4.2: RESYNC: (1.10-1.12); FILE MERGED
2005/04/26 14:58:39 aw 1.10.4.1: #i39528#
2006-11-14 13:35:46 +00:00
Jens-Heiner Rechtien
d76672509b INTEGRATION: CWS impress108 (1.20.10); FILE MERGED
2006/09/28 09:59:45 af 1.20.10.1: #i69628# GetInsertionPosition() now takes insertion indicator into account.
2006-10-24 12:37:09 +00:00
Oliver Bolte
c228c54c18 INTEGRATION: CWS pchfix02 (1.19.120); FILE MERGED
2006/09/01 17:37:17 kaib 1.19.120.1: #i68856# Added header markers and pch files
2006-09-16 18:05:25 +00:00
Vladimir Glazounov
e19fd7693b INTEGRATION: CWS impress89 (1.18.66); FILE MERGED
2006/03/20 10:26:53 af 1.18.66.1: #132646# Using shared_ptr to slidesorter PageDescriptor.
2006-04-06 15:18:58 +00:00
Oliver Bolte
43bcadc677 INTEGRATION: CWS impress78 (1.16.46); FILE MERGED
2005/12/08 10:49:17 af 1.16.46.1: #i58768# Disabled Cut for master pages.
2006-01-19 12:02:55 +00:00
Rüdiger Timm
d5fa0e7467 INTEGRATION: CWS impressfunctions (1.15.28); FILE MERGED
2005/11/28 17:56:09 cl 1.15.28.2: RESYNC: (1.15-1.16); FILE MERGED
2005/10/28 11:00:51 cl 1.15.28.1: #125341# reworked FuPoor classes to use refcounting
2005-12-14 16:20:20 +00:00
Rüdiger Timm
a96937341d INTEGRATION: CWS cov2src (1.15.20); FILE MERGED
2005/10/18 12:38:37 rt 1.15.20.1: #126234# Join MWS COV680 m4 into SRC680
2005-10-19 11:25:42 +00:00
Jens-Heiner Rechtien
3437816e0a INTEGRATION: CWS impress57 (1.12.42); FILE MERGED
2005/05/30 15:52:50 af 1.12.42.2: #i40631# Added support for drag-and-drop of shapes into the slide sorter.
2005/05/27 09:44:33 af 1.12.42.1: #i49761# Disbled copy-and-paste and drag-and-drop of master pages.
2005-09-23 10:28:29 +00:00
Rüdiger Timm
fb2b634f78 INTEGRATION: CWS ooo19126 (1.13.68); FILE MERGED
2005/09/05 13:24:20 rt 1.13.68.1: #i54170# Change license header: remove SISSL
2005-09-09 05:13:27 +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
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
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
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
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
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
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
Rüdiger Timm
46b44c39a5 INTEGRATION: CWS presentationengine01 (1.2.12); FILE MERGED
2004/10/12 23:17:42 thb 1.2.12.2: RESYNC: (1.2-1.4); FILE MERGED
2004/08/28 22:54:37 cl 1.2.12.1: removed old presentation code
2004-11-26 19:21:24 +00:00
Oliver Bolte
7c862b02e4 INTEGRATION: CWS impress15 (1.4.8); FILE MERGED
2004/10/18 13:10:07 af 1.4.8.1: #i33707# Prevented draging last slide from a document.
2004-11-16 15:14:03 +00:00
Kurt Zenker
12f87116fa INTEGRATION: CWS mav09 (1.2.44); FILE MERGED
2004/09/21 16:58:24 mav 1.2.44.2: RESYNC: (1.2-1.3); FILE MERGED
2004/08/11 11:42:45 mav 1.2.44.1: #100000# resync problem
2004-10-04 17:37:41 +00:00
Rüdiger Timm
8343a1bde2 INTEGRATION: CWS impress21ea (1.2.60); FILE MERGED
2004/08/25 11:00:39 af 1.2.60.1: #i29458# Fixed index of insertion position for paste.
2004-09-20 12:33:52 +00:00
Rüdiger Timm
0a0f803f44 INTEGRATION: CWS impress2 (1.1.2); FILE ADDED
2004/07/04 13:31:30 af 1.1.2.5: #i22705# Removed locking the view.  Fixed index problem when dropping pages.  Insertion indicator switched off after a drop.
2004/05/05 12:07:02 af 1.1.2.4: #i22705# (last commit was an accident) update of paths of include files.
2004/05/05 11:04:00 af 1.1.2.3: #i22705#lidesorter\controller\SlideSorterController.cxx
2004/03/03 09:41:50 af 1.1.2.2: #i22705# Fixed index handling.
2004/02/13 12:20:23 af 1.1.2.1: #i22705# Initial revision.
2004-07-13 13:13:17 +00:00