Skip to content

C
core
Kaydet (Commit) c2954281 authored tarafından Rafael Dominguez's avatar Rafael Dominguez Kaydeden (comit) Luboš Luňák
Dosyalara gözat
Seçenekler

Remove deprecated List in ViewClipboard::InsertSlides.

üst 8adf70b2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
sd/source/ui/view/ViewClipboard.cxx
Dosyayı görüntüle @ c2954281
...@@ -216,7 +216,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( ...@@ -216,7 +216,7 @@ sal_uInt16 ViewClipboard::InsertSlides (
sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc );
// Prepare the insertion. // Prepare the insertion.
const List* pBookmarkList; const std::vector<rtl::OUString> *pBookmarkList = NULL;
DrawDocShell* pDataDocSh; DrawDocShell* pDataDocSh;
if (rTransferable.HasPageBookmarks()) if (rTransferable.HasPageBookmarks())
{ {
...@@ -224,7 +224,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( ...@@ -224,7 +224,7 @@ sal_uInt16 ViewClipboard::InsertSlides (
// pages are inserted. // pages are inserted.
pBookmarkList = &rTransferable.GetPageBookmarks(); pBookmarkList = &rTransferable.GetPageBookmarks();
pDataDocSh = rTransferable.GetPageDocShell(); pDataDocSh = rTransferable.GetPageDocShell();
nInsertPgCnt = (sal_uInt16)pBookmarkList->Count(); nInsertPgCnt = (sal_uInt16)pBookmarkList->size();
} }
else else
{ {
...@@ -233,7 +233,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( ...@@ -233,7 +233,7 @@ sal_uInt16 ViewClipboard::InsertSlides (
SfxObjectShell* pShell = rTransferable.GetDocShell(); SfxObjectShell* pShell = rTransferable.GetDocShell();
pDataDocSh = (DrawDocShell*) pShell; pDataDocSh = (DrawDocShell*) pShell;
SdDrawDocument* pDataDoc = pDataDocSh->GetDoc(); SdDrawDocument* pDataDoc = pDataDocSh->GetDoc();
pBookmarkList = NULL;
if (pDataDoc!=NULL && pDataDoc->GetSdPageCount(PK_STANDARD)) if (pDataDoc!=NULL && pDataDoc->GetSdPageCount(PK_STANDARD))
nInsertPgCnt = pDataDoc->GetSdPageCount(PK_STANDARD); nInsertPgCnt = pDataDoc->GetSdPageCount(PK_STANDARD);
} }
...@@ -246,9 +246,10 @@ sal_uInt16 ViewClipboard::InsertSlides ( ...@@ -246,9 +246,10 @@ sal_uInt16 ViewClipboard::InsertSlides (
if( bWait ) if( bWait )
pWin->LeaveWait(); pWin->LeaveWait();
std::vector<rtl::OUString> aExchangeList;
rDoc.InsertBookmarkAsPage( rDoc.InsertBookmarkAsPage(
const_cast<List*>(pBookmarkList), *pBookmarkList,
NULL, aExchangeList,
sal_False, sal_False,
sal_False, sal_False,
nInsertPosition, nInsertPosition,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment