core.git: Branch 'libreoffice-25-8' - sd/source

[Xisco Fauli (via logerrit)]

 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 48b650d50070cd1bff391aef53f781c16899d92d
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Sep 11 17:17:34 2025 +0200
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Sep 17 18:58:06 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 <xiscofa...@libreoffice.org>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190877
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx 
b/sd/source/ui/inc/SlideSorterViewShell.hxx
index cb2533740b66..ef446ff12f06 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -65,7 +65,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 c709ffdb4733..6f9fa6fba559 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -4558,11 +4558,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 &mrSlideSorter = 
sd::slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase())->GetSlideSorter();
+    sd::slidesorter::SlideSorter &mrSlideSorter = 
pSlideSorterViewShell->GetSlideSorter();
     sd::slidesorter::model::PageEnumeration aSelectedPages (
         
sd::slidesorter::model::PageEnumerationProvider::CreateSelectedPagesEnumeration(mrSlideSorter.GetModel()));
     while (aSelectedPages.HasMoreElements())
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 55fcc2c1ba3b..1b77e8a51580 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();
         }