diff options
Diffstat (limited to 'sd')
6 files changed, 2 insertions, 11 deletions
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 83f949fa91d3..fae76ff19fdd 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -115,7 +115,6 @@ public: */ static std::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, - ViewShell* pViewShell, vcl::Window& rParentWindow); /** Return the control of the vertical scroll bar. diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 42f91e1a3ce1..b65926d52844 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -436,8 +436,6 @@ void Clipboard::CreateSlideTransferable ( mrSlideSorter.GetView().BrkAction(); SdTransferable* pTransferable = TransferableData::CreateTransferable ( pDocument, - nullptr, - false, dynamic_cast<SlideSorterViewShell*>(mrSlideSorter.GetViewShell()), aRepresentatives); diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index 946e54bf86af..e02d8363dcaa 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -26,12 +26,10 @@ namespace sd { namespace slidesorter { namespace controller { SdTransferable* TransferableData::CreateTransferable ( SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, - bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<Representative>& rRepresentatives) { - SdTransferable* pTransferable = new SdTransferable (pSrcDoc, pWorkView, bInitOnGetData); + SdTransferable* pTransferable = new SdTransferable (pSrcDoc, nullptr, false/*bInitOnGetData*/); std::shared_ptr<TransferableData> pData (new TransferableData(pViewShell, rRepresentatives)); pTransferable->AddUserData(pData); return pTransferable; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index bfc0be13bb71..ae4c84f7c55e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -58,8 +58,6 @@ public: static SdTransferable* CreateTransferable ( SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, - bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<TransferableData::Representative>& rRepresentatives); diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index af850c64b6ff..398cc2a0edc3 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -89,13 +89,12 @@ std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter( std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, - ViewShell* pViewShell, vcl::Window& rParentWindow) { std::shared_ptr<SlideSorter> pSlideSorter( new SlideSorter( rBase, - pViewShell, + nullptr, rParentWindow)); pSlideSorter->Init(); return pSlideSorter; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index afe884dde902..df1b20bcc53c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -96,7 +96,6 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) if (pBase != nullptr && pParentWindow) mpSlideSorter = SlideSorter::CreateSlideSorter( *pBase, - nullptr, *pParentWindow); Resize(); |