diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-04-14 21:37:36 -0430 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-16 18:44:00 +0200 |
| commit | ae7ad6dab30463f961798f3203ef10c69b76c632 (patch) | |
| tree | c474b1bddafd839af3e728113f73bf0700a888bd /sd/source/ui | |
| parent | 6242b36b78a563823d45aeb1e757bcb88ca03b69 (diff) | |
Make an out argument a pointer instead of a reference.
- Fix some style issues.
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/func/fuinsfil.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewClipboard.cxx | 5 |
4 files changed, 7 insertions, 11 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 2f4c93f67d2c..fe168f7f73bf 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -724,9 +724,8 @@ void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBo if( bPersistent ) { - std::vector<rtl::OUString> aExchangeList; mpSdDrawDocument->CreateFirstPages(mpSourceDoc); - mpSdDrawDocument->InsertBookmarkAsPage( rPageBookmarks, aExchangeList, sal_False, sal_True, 1, sal_True, + mpSdDrawDocument->InsertBookmarkAsPage( rPageBookmarks, NULL, sal_False, sal_True, 1, sal_True, mpSourceDoc->GetDocSh(), sal_True, sal_True, sal_False ); } else diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index dce5dd67e2d1..624f309ccbdb 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -401,7 +401,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) bNameOK = mpView->GetExchangeList( aExchangeList, aBookmarkList, 0 ); if( bNameOK ) - bOK = mpDoc->InsertBookmarkAsPage( aBookmarkList, aExchangeList, + bOK = mpDoc->InsertBookmarkAsPage( aBookmarkList, &aExchangeList, bLink, bReplace, nPos, sal_False, NULL, sal_True, sal_True, sal_False ); 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, diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index 2470adbfd40e..7c03b8c57a19 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -246,10 +246,9 @@ sal_uInt16 ViewClipboard::InsertSlides ( if( bWait ) pWin->LeaveWait(); - std::vector<rtl::OUString> aExchangeList; rDoc.InsertBookmarkAsPage( - *pBookmarkList, - aExchangeList, + pBookmarkList ? *pBookmarkList : std::vector<rtl::OUString>(), + NULL, sal_False, sal_False, nInsertPosition, |