diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-03-28 20:51:06 -0430 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-13 18:42:10 +0200 |
| commit | c29542818295388db23652ec5a1c982496f66010 (patch) | |
| tree | 2eb5d1fab4ab50ec62775e797610c48438e48f4a /sd | |
| parent | 8adf70b289476eb5c204d3f1e9cbcb259e019194 (diff) | |
Remove deprecated List in ViewClipboard::InsertSlides.
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/ViewClipboard.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index d8cd5b2fbdae..2470adbfd40e 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -216,7 +216,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); // Prepare the insertion. - const List* pBookmarkList; + const std::vector<rtl::OUString> *pBookmarkList = NULL; DrawDocShell* pDataDocSh; if (rTransferable.HasPageBookmarks()) { @@ -224,7 +224,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( // pages are inserted. pBookmarkList = &rTransferable.GetPageBookmarks(); pDataDocSh = rTransferable.GetPageDocShell(); - nInsertPgCnt = (sal_uInt16)pBookmarkList->Count(); + nInsertPgCnt = (sal_uInt16)pBookmarkList->size(); } else { @@ -233,7 +233,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( SfxObjectShell* pShell = rTransferable.GetDocShell(); pDataDocSh = (DrawDocShell*) pShell; SdDrawDocument* pDataDoc = pDataDocSh->GetDoc(); - pBookmarkList = NULL; + if (pDataDoc!=NULL && pDataDoc->GetSdPageCount(PK_STANDARD)) nInsertPgCnt = pDataDoc->GetSdPageCount(PK_STANDARD); } @@ -246,9 +246,10 @@ sal_uInt16 ViewClipboard::InsertSlides ( if( bWait ) pWin->LeaveWait(); + std::vector<rtl::OUString> aExchangeList; rDoc.InsertBookmarkAsPage( - const_cast<List*>(pBookmarkList), - NULL, + *pBookmarkList, + aExchangeList, sal_False, sal_False, nInsertPosition, |