diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 14:01:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 14:01:44 +0000 |
| commit | dcbe804bc9a1366ca0ec872653af5244f92d9b31 (patch) | |
| tree | 73b4666a9cf588e0148f805e4949d31ad0109d11 /sd/source/ui/view/sdview3.cxx | |
| parent | 0595f5be3af786993e57f7b280d31bd6c1e28d49 (diff) | |
INTEGRATION: CWS impress2 (1.49.26); FILE MERGED
2004/06/18 00:22:22 af 1.49.26.2: RESYNC: (1.49-1.50); FILE MERGED
2004/02/25 09:54:15 af 1.49.26.1: #i22705# Moved some code to ViewClipboard.cxx.
Diffstat (limited to 'sd/source/ui/view/sdview3.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 58 |
1 files changed, 4 insertions, 54 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 04c6da1a5a63..aefe6a2ee4a7 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview3.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: rt $ $Date: 2004-07-12 15:22:42 $ + * last change: $Author: rt $ $Date: 2004-07-13 15:01:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,6 +176,7 @@ #endif #include "strmname.h" #include "unomodel.hxx" +#include "ViewClipboard.hxx" #include <tools/stream.hxx> #include <vcl/cvtgrf.hxx> @@ -319,58 +320,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData->GetDocShell() && pOwnData->IsPageTransferable() && ISA( View ) ) { - USHORT nInsertPgCnt, nInsertPos = pDoc->GetSdPageCount( PK_STANDARD ) * 2 + 1; - USHORT nPgCnt = pDoc->GetSdPageCount( PK_STANDARD ); - BOOL bMergeMasterPages = !pOwnData->HasSourceDoc( pDoc ); - - for( USHORT nPage = 0; nPage < nPgCnt; nPage++ ) - { - SdPage* pPage = pDoc->GetSdPage( nPage, PK_STANDARD ); - - if( pPage->IsSelected() ) - nInsertPos = nPage * 2 + 3; - } - - if( pOwnData->HasPageBookmarks() ) - { - const List& rBookmarkList = pOwnData->GetPageBookmarks(); - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - const BOOL bWait = pWin && pWin->IsWait(); - - if( bWait ) - pWin->LeaveWait(); - - nInsertPgCnt = (USHORT) rBookmarkList.Count(); - pDoc->InsertBookmarkAsPage( const_cast< List* >( &rBookmarkList ), NULL, FALSE, FALSE, nInsertPos, - pOwnData == SD_MOD()->pTransferDrag, - pOwnData->GetPageDocShell(), TRUE, bMergeMasterPages, FALSE ); - - if( bWait ) - pWin->EnterWait(); - } - else - { - SvEmbeddedObject* pObj = pOwnData->GetDocShell(); - DrawDocShell* pDataDocSh = (DrawDocShell*) pObj; - SdDrawDocument* pDataDoc = pDataDocSh->GetDoc(); - - if( pDataDoc && pDataDoc->GetSdPageCount( PK_STANDARD ) ) - { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - const BOOL bWait = pWin && pWin->IsWait(); - - if( bWait ) - pWin->LeaveWait(); - - nInsertPgCnt = pDataDoc->GetSdPageCount( PK_STANDARD ); - pDoc->InsertBookmarkAsPage( NULL, NULL, FALSE, FALSE, nInsertPos, - pOwnData == SD_MOD()->pTransferDrag, - pDataDocSh, TRUE, bMergeMasterPages, FALSE ); - - if( bWait ) - pWin->EnterWait(); - } - } + mpClipboard->HandlePageDrop (*pOwnData); } else if( pSourceView ) { |