summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter/controller
diff options
context:
space:
mode:
authorRafael Dominguez <venccsralph@gmail.com>2012-04-14 21:37:36 -0430
committerLuboš Luňák <l.lunak@suse.cz>2012-04-16 18:44:00 +0200
commitae7ad6dab30463f961798f3203ef10c69b76c632 (patch)
treec474b1bddafd839af3e728113f73bf0700a888bd /sd/source/ui/slidesorter/controller
parent6242b36b78a563823d45aeb1e757bcb88ca03b69 (diff)
Make an out argument a pointer instead of a reference.
- Fix some style issues.
Diffstat (limited to 'sd/source/ui/slidesorter/controller')
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index ec3ea1d2e435..0ff1eb0339a0 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -344,14 +344,13 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition)
sal_Int32 nInsertPageCount (0);
if (pClipTransferable->HasPageBookmarks())
{
- std::vector<rtl::OUString> aExchangeList;
const std::vector<rtl::OUString> &rBookmarkList = pClipTransferable->GetPageBookmarks();
const SolarMutexGuard aGuard;
nInsertPageCount = (sal_uInt16) rBookmarkList.size();
rModel.GetDocument()->InsertBookmarkAsPage(
rBookmarkList,
- aExchangeList,
+ NULL,
sal_False,
sal_False,
nInsertIndex,
@@ -370,14 +369,13 @@ 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(
- aBookmarkList,
- aExchangeList,
+ std::vector<rtl::OUString>(),
+ NULL,
sal_False,
sal_False,
nInsertIndex,