sd/source/ui/inc/SlideSorterViewShell.hxx | 2 +- sd/source/ui/view/drviews2.cxx | 7 ++++++- sd/source/ui/view/drviewse.cxx | 7 +++---- 3 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit 75bd7f09459dea922196c230b56e899a8660d999 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Sep 11 17:17:34 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Sep 12 14:45:09 2025 +0200 sd: use SAL_RET_MAYBENULL in GetSlideSorter Change-Id: I2f71942aeaa7aa1cc78be69d63a94588099ad4d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190821 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index e36f643e0df7..d4644f6d2a54 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -66,7 +66,7 @@ public: returned. */ // Exported for unit test - SD_DLLPUBLIC static SlideSorterViewShell* GetSlideSorter(ViewShellBase& rBase); + SD_DLLPUBLIC SAL_RET_MAYBENULL static SlideSorterViewShell* GetSlideSorter(ViewShellBase& rBase); virtual SdPage* GetActualPage() override; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 5dd3a6fa325a..d17f82f19c41 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -4566,11 +4566,16 @@ SdPage* DrawViewShell::CreateOrDuplicatePage ( void DrawViewShell::DuplicateSelectedSlides (SfxRequest& rRequest) { + ::sd::slidesorter::SlideSorterViewShell* pSlideSorterViewShell = + sd::slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase()); + if (!pSlideSorterViewShell) + return; + // Create a list of the pages that are to be duplicated. The process of // duplication alters the selection. sal_Int32 nInsertPosition (0); ::std::vector<SdPage*> aPagesToDuplicate; - sd::slidesorter::SlideSorter &rSlideSorter = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase())->GetSlideSorter(); + sd::slidesorter::SlideSorter &rSlideSorter = pSlideSorterViewShell->GetSlideSorter(); sd::slidesorter::model::PageEnumeration aSelectedPages ( sd::slidesorter::model::PageEnumerationProvider::CreateSelectedPagesEnumeration(rSlideSorter.GetModel())); while (aSelectedPages.HasMoreElements()) diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index d6fa2747c539..39aabda91361 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -957,10 +957,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_PASTE_SLIDE: case SID_COPY_SLIDE: { - sd::slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase()) - ->GetSlideSorter() - .GetController() - .FuSupport(rReq); + if (::sd::slidesorter::SlideSorterViewShell* pSlideSorterViewShell = + sd::slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase())) + pSlideSorterViewShell->GetSlideSorter().GetController().FuSupport(rReq); Cancel(); rReq.Done(); }
