From cb5d50619dea504c149d7c54918fad974896f4c9 Mon Sep 17 00:00:00 2001
From: Rafael Dominguez <venccsralph@gmail.com>
Date: Wed, 28 Mar 2012 19:43:00 -0430
Subject: Remove deprecated List usage in Clipboard::PasteTransferable.

---
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index f7f792200eaf..036946206bfd 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -344,13 +344,14 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition)
     sal_Int32 nInsertPageCount (0);
     if (pClipTransferable->HasPageBookmarks())
     {
-        const List& rBookmarkList = pClipTransferable->GetPageBookmarks();
+        std::vector<rtl::OUString> aExchangeList;
+        const std::vector<rtl::OUString> &rBookmarkList = pClipTransferable->GetPageBookmarks();
         const SolarMutexGuard aGuard;
 
-        nInsertPageCount = (sal_uInt16) rBookmarkList.Count();
+        nInsertPageCount = (sal_uInt16) rBookmarkList.size();
         rModel.GetDocument()->InsertBookmarkAsPage(
-            const_cast<List*>(&rBookmarkList),
-            NULL,
+            rBookmarkList,
+            aExchangeList,
             sal_False,
             sal_False,
             nInsertIndex,
@@ -369,13 +370,14 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition)
         if (pDataDoc!=NULL
             && pDataDoc->GetSdPageCount(PK_STANDARD))
         {
+            std::vector<rtl::OUString> aBookmarkList, aExchangeList;
             const SolarMutexGuard aGuard;
 
             bMergeMasterPages = (pDataDoc != rModel.GetDocument());
             nInsertPageCount = pDataDoc->GetSdPageCount( PK_STANDARD );
             rModel.GetDocument()->InsertBookmarkAsPage(
-                NULL,
-                NULL,
+                aBookmarkList,
+                aExchangeList,
                 sal_False,
                 sal_False,
                 nInsertIndex,
-- 
cgit v1.2.3