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

[Noel Grandin (via logerrit)]

 sd/source/ui/slideshow/slideshowimpl.cxx |    8 ++++----
 sd/source/ui/slideshow/slideshowimpl.hxx |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 60d8f836a33aa3bf0e7fcaa04a4d64ce3228ee71
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 13:49:22 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 28 17:38:47 2021 +0100

    use comphelper::WeakComponentImplHelper in SlideshowImpl
    
    Change-Id: I5adfe14dfb6d466f288c4ab665aa1642d8fd175f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127632
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 085a274ff631..83bd0511e758 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -487,8 +487,7 @@ constexpr OUStringLiteral gsBookmark( u"Bookmark" );
 constexpr OUStringLiteral gsVerb( u"Verb" );
 
 SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& 
xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, 
vcl::Window* pParentWindow )
-: SlideshowImplBase( m_aMutex )
-, mxModel(pDoc->getUnoModel(),UNO_QUERY_THROW)
+: mxModel(pDoc->getUnoModel(),UNO_QUERY_THROW)
 , maUpdateTimer("SlideShowImpl maUpdateTimer")
 , maInputFreezeTimer("SlideShowImpl maInputFreezeTimer")
 , maDeactivateTimer("SlideShowImpl maDeactivateTimer")
@@ -566,11 +565,12 @@ SlideshowImpl::~SlideshowImpl()
     if( !mbDisposed )
     {
         OSL_FAIL("SlideshowImpl::~SlideshowImpl(), component was not 
disposed!");
-        disposing();
+        std::unique_lock g(m_aMutex);
+        disposing(g);
     }
 }
 
-void SAL_CALL SlideshowImpl::disposing()
+void SlideshowImpl::disposing(std::unique_lock<std::mutex>&)
 {
 #ifdef ENABLE_SDREMOTE
     RemoteServer::presentationStopped();
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx 
b/sd/source/ui/slideshow/slideshowimpl.hxx
index a453d12ab389..33d74d60c7cc 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -21,7 +21,7 @@
 
 #include <memory>
 #include <sal/config.h>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/interfacecontainer3.hxx>
@@ -122,9 +122,9 @@ private:
     css::uno::Reference< css::presentation::XSlideShow > mxSlideShow;
 };
 
-typedef ::cppu::WeakComponentImplHelper< 
css::presentation::XSlideShowController, css::container::XIndexAccess > 
SlideshowImplBase;
+typedef comphelper::WeakComponentImplHelper< 
css::presentation::XSlideShowController, css::container::XIndexAccess > 
SlideshowImplBase;
 
-class SlideshowImpl final : private ::cppu::BaseMutex, public SlideshowImplBase
+class SlideshowImpl final : public SlideshowImplBase
 {
 friend class SlideShow;
 friend class SlideShowView;
@@ -207,7 +207,7 @@ private:
     // This function is called upon disposing the component,
     // if your component needs special work when it becomes
     // disposed, do it here.
-    virtual void SAL_CALL disposing() override;
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
 
     // internal
     bool startShow( PresentationSettingsEx const * pPresSettings );