mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SD SlsClipboard: cleanup and preparation for tdf64588

Browse Source 
Isolating the patch itself from reorganization/optimization
of variables. No logic change intended.

Change-Id: I9e9008d57b4948372af138fb47224ebcf9c48ceb
Reviewed-on: https://gerrit.libreoffice.org/32480
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
This commit is contained in:
Justin Luth
2016-12-28 21:57:32 +03:00
parent d339feac2a
commit 87fce022c6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sd/source/ui/slidesorter/controller/SlsClipboard.cxx
View File

@@ -386,6 +386,9 @@ void Clipboard::CreateSlideTransferable (
model::PageEnumeration aSelectedPages
(model::PageEnumerationProvider::CreateSelectedPagesEnumeration(
mrSlideSorter.GetModel()));
SdDrawDocument* const pDocument = mrSlideSorter.GetModel().GetDocument();
DrawDocShell* const pDataDocSh = pDocument ? pDocument->GetDocSh() : nullptr;
while (aSelectedPages.HasMoreElements())
{
model::SharedPageDescriptor pDescriptor (aSelectedPages.GetNextElement());
@@ -417,7 +420,6 @@ void Clipboard::CreateSlideTransferable (
if (!aBookmarkList.empty())
{
mrSlideSorter.GetView().BrkAction();
SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
SdTransferable* pTransferable = TransferableData::CreateTransferable (
pDocument,
nullptr,
@@ -436,9 +438,8 @@ void Clipboard::CreateSlideTransferable (
pTransferable->GetWorkDocument()->GetDocSh()
->FillTransferableObjectDescriptor (aObjDesc);
if (pDocument->GetDocSh() != nullptr)
aObjDesc.maDisplayName = pDocument->GetDocSh()
->GetMedium()->GetURLObject().GetURLNoPass();
if (pDataDocSh != nullptr)
aObjDesc.maDisplayName = pDataDocSh->GetMedium()->GetURLObject().GetURLNoPass();
vcl::Window* pActionWindow = pWindow;
if (pActionWindow == nullptr)