core.git: Branch 'distro/collabora/co-25.04' - sd/source

[Szymon Kłos (via logerrit)]

 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |    5 +++--
 sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 4ce7ecccb2b6471cf8580896b1ddba889fa9a759
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 26 08:14:24 2025 +0000
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Aug 26 10:57:22 2025 +0200

    notebookbar: correctly remove listeners in master page selector
    
    followup for commit f7192928b6fd9fde2dd4a2bc029d8d98da40a087
    notebookbar: move master slides pane from sidebar
    
    Change-Id: Ief0eef0066538475bbae925802d700580085daa3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190203
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx 
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index c1ac330b7314..421fa343d7b0 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -70,7 +70,8 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector(
 {
     Link<sd::tools::EventMultiplexerEvent&, void> aLink(
         LINK(this, CurrentMasterPagesSelector, EventMultiplexerListener));
-    rBase.GetEventMultiplexer()->AddEventListener(aLink);
+    mpEventMultiplexer = rBase.GetEventMultiplexer();
+    mpEventMultiplexer->AddEventListener(aLink);
 }
 
 CurrentMasterPagesSelector::~CurrentMasterPagesSelector()
@@ -85,7 +86,7 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector()
     }
 
     Link<sd::tools::EventMultiplexerEvent&,void> aLink 
(LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
-    mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
+    mpEventMultiplexer->RemoveEventListener(aLink);
 }
 
 void CurrentMasterPagesSelector::LateInit()
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx 
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index 5b2ad3114e2c..5b30405f92c7 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -23,7 +23,7 @@
 
 #include "MasterPagesSelector.hxx"
 
-namespace sd::tools { class EventMultiplexerEvent; }
+namespace sd::tools { class EventMultiplexer; class EventMultiplexerEvent; }
 
 namespace sd::sidebar {
 
@@ -70,6 +70,7 @@ private:
     virtual void LateInit() override;
 
     DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, 
void);
+    std::shared_ptr<sd::tools::EventMultiplexer> mpEventMultiplexer;
 };
 
 } // end of namespace sd::sidebar