From 6d9b8d423ad59ff6c1164d06277d1aac842a2c98 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Fri, 2 Oct 2026 14:19:55 +0200
Subject: [PATCH] svx: Switch GalleryPreview::mpParent to reference

... and rename accordingly. This makes clear it's
always non-null.

Change-Id: I33b68dcf3f6cff8680249671121efe25333bbd61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211742
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 include/svx/galctrl.hxx          |  5 ++---
 svx/source/gallery2/galbrws1.cxx |  2 +-
 svx/source/gallery2/galctrl.cxx  | 25 +++++++++++++------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 899af1fc4e15..917f6de652ed 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -40,7 +40,7 @@ private:
     std::unique_ptr<weld::ScrolledWindow> mxScrolledWindow;
     GraphicObject m_aGraphicObj;
     tools::Rectangle m_aPreviewRect;
-    GalleryBrowser* mpParent;
+    GalleryBrowser& mrParent;
     GalleryTheme* mpTheme;
 
     bool             ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const;
@@ -53,8 +53,7 @@ private:
     virtual bool     KeyInput( const KeyEvent& rKEvt ) override;
 
 public:
-
-    GalleryPreview(GalleryBrowser* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow);
+    GalleryPreview(GalleryBrowser& rParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow);
     void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
     virtual ~GalleryPreview() override;
 
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 53df45b87bda..5687032ed23e 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -137,7 +137,7 @@ GalleryBrowser::GalleryBrowser(
     , mxIconView(new GalleryIconView(*this, rBuilder.weld_scrolled_window(u"galleryscroll"_ustr, true)))
     , mxIconViewWin(new weld::CustomWeld(rBuilder, u"gallery"_ustr, *mxIconView))
     , mxListView(rBuilder.weld_tree_view(u"gallerylist"_ustr))
-    , mxPreview(new GalleryPreview(this, rBuilder.weld_scrolled_window(u"previewscroll"_ustr)))
+    , mxPreview(new GalleryPreview(*this, rBuilder.weld_scrolled_window(u"previewscroll"_ustr)))
     , mxPreviewWin(new weld::CustomWeld(rBuilder, u"preview"_ustr, *mxPreview))
     , mxIconButton(rBuilder.weld_toggle_button(u"icon"_ustr))
     , mxListButton(rBuilder.weld_toggle_button(u"list"_ustr))
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 66598284de5a..054c62ffa2ce 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -38,9 +38,10 @@
 #include <bitmaps.hlst>
 #include <svl/itemset.hxx>
 
-GalleryPreview::GalleryPreview(GalleryBrowser* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow)
+GalleryPreview::GalleryPreview(GalleryBrowser& rParent,
+                               std::unique_ptr<weld::ScrolledWindow> xScrolledWindow)
     : mxScrolledWindow(std::move(xScrolledWindow))
-    , mpParent(pParent)
+    , mrParent(rParent)
     , mpTheme(nullptr)
 {
 }
@@ -68,7 +69,7 @@ void GalleryPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea)
     pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
     SetOutputSizePixel(aSize);
 
-    mxDragDropTargetHelper.reset(new GalleryDragDrop(mpParent, pDrawingArea->get_drop_target()));
+    mxDragDropTargetHelper.reset(new GalleryDragDrop(&mrParent, pDrawingArea->get_drop_target()));
 }
 
 namespace
@@ -132,7 +133,7 @@ void GalleryPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
 bool GalleryPreview::MouseButtonDown(const MouseEvent& rMEvt)
 {
     if (mpTheme && (rMEvt.GetClicks() == 2))
-        mpParent->TogglePreview();
+        mrParent.TogglePreview();
     return true;
 }
 
@@ -140,7 +141,7 @@ bool GalleryPreview::Command(const CommandEvent& rCEvt)
 {
     if (mpTheme && (rCEvt.GetCommand() == CommandEventId::ContextMenu))
     {
-        mpParent->ShowContextMenu(rCEvt);
+        mrParent.ShowContextMenu(rCEvt);
         return true;
     }
     return false;
@@ -153,30 +154,30 @@ bool GalleryPreview::KeyInput(const KeyEvent& rKEvt)
         switch( rKEvt.GetKeyCode().GetCode() )
         {
             case KEY_BACKSPACE:
-                mpParent->TogglePreview();
+                mrParent.TogglePreview();
             break;
 
             case KEY_HOME:
-                mpParent->Travel(GalleryBrowserTravel::First);
+                mrParent.Travel(GalleryBrowserTravel::First);
             break;
 
             case KEY_END:
-                mpParent->Travel(GalleryBrowserTravel::Last);
+                mrParent.Travel(GalleryBrowserTravel::Last);
             break;
 
             case KEY_LEFT:
             case KEY_UP:
-                mpParent->Travel(GalleryBrowserTravel::Previous);
+                mrParent.Travel(GalleryBrowserTravel::Previous);
             break;
 
             case KEY_RIGHT:
             case KEY_DOWN:
-                mpParent->Travel(GalleryBrowserTravel::Next);
+                mrParent.Travel(GalleryBrowserTravel::Next);
             break;
 
             default:
             {
-                if (!mpParent->KeyInput(rKEvt))
+                if (!mrParent.KeyInput(rKEvt))
                     return false;
             }
             break;
@@ -190,7 +191,7 @@ bool GalleryPreview::KeyInput(const KeyEvent& rKEvt)
 bool GalleryPreview::StartDrag()
 {
     if (mpTheme)
-        return mpParent->StartDrag();
+        return mrParent.StartDrag();
     return true;
 }