[Libreoffice-commits] core.git: slideshow/source

[Mike Kaganski (via logerrit)]

 slideshow/source/engine/slideshowimpl.cxx |    2 +-
 slideshow/source/engine/slideview.cxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d049a1439d7db9cc3c68bbec3b496a61e7a7b855
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Apr 23 20:14:48 2023 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Apr 30 22:36:18 2023 +0200

    Use getXWeak in slideshow
    
    Change-Id: Ica0290ee46286ff6d82634c378e40b3605d48a54
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150869
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/slideshow/source/engine/slideshowimpl.cxx 
b/slideshow/source/engine/slideshowimpl.cxx
index 9109bb6bb2e0..1d739ded44c7 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -668,7 +668,7 @@ void SlideShowImpl::disposing()
 
     // send all listeners a disposing() that we are going down:
     maListenerContainer.disposeAndClear(
-        lang::EventObject( static_cast<cppu::OWeakObject *>(this) ) );
+        lang::EventObject( getXWeak() ) );
 
     maViewContainer.dispose();
 
diff --git a/slideshow/source/engine/slideview.cxx 
b/slideshow/source/engine/slideview.cxx
index 8b527630bca3..6db623468ac7 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -1025,7 +1025,7 @@ struct WeakRefWrapper
 
     WeakRefWrapper(SlideView & rObj, std::function<void (SlideView&)> func)
         : m_rObj(rObj)
-        , m_wObj(static_cast<::cppu::OWeakObject*>(&rObj))
+        , m_wObj(rObj.getXWeak())
         , m_func(std::move(func))
     {
     }