sd/source/ui/app/sdmod1.cxx | 2 +-
sd/source/ui/docshell/docshel3.cxx | 1 +
sd/source/ui/inc/slideshow.hxx | 9 ++++-----
sd/source/ui/slideshow/slideshow.cxx | 5 ++---
sd/source/ui/slideshow/slideshowviewimpl.hxx | 1 +
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 +-
sd/source/ui/view/drviewse.cxx | 1 +
7 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit ee6d4e2c79bd7d9b007518592f1a3ecc884660f1
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 15:05:00 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 29 08:33:16 2021 +0100
use comphelper::WeakComponentImplHelper in sd::SlideShow
Change-Id: I40f53eb70decec86564b658c3a0ebec5b44d14fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127645
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index f3ec8b3df514..7f8e44b6b1b1 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -23,7 +23,7 @@
#include <sfx2/viewfrm.hxx>
#include <unotools/moduleoptions.hxx>
#include <framework/FrameworkHelper.hxx>
-
+#include <osl/diagnose.h>
#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
#include <vcl/errinf.hxx>
diff --git a/sd/source/ui/docshell/docshel3.cxx
b/sd/source/ui/docshell/docshel3.cxx
index 5ed24657d9f1..875aa5b01347 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/i18n/TextConversionOption.hpp>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
#include <editeng/editeng.hxx>
+#include <osl/diagnose.h>
#include <sdmod.hxx>
#include <drawdoc.hxx>
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 926147a724b1..35b93afe8b05 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -26,8 +26,7 @@
#include <tools/link.hxx>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
#include <editeng/unoipset.hxx>
@@ -74,9 +73,9 @@ enum AnimationMode
ANIMATIONMODE_PREVIEW
};
-typedef ::cppu::WeakComponentImplHelper< css::presentation::XPresentation2,
css::lang::XServiceInfo > SlideshowBase;
+typedef comphelper::WeakComponentImplHelper<
css::presentation::XPresentation2, css::lang::XServiceInfo > SlideshowBase;
-class SlideShow final : private ::cppu::BaseMutex, public SlideshowBase
+class SlideShow final : public SlideshowBase
{
public:
/// used by the model to create a slideshow for it
@@ -110,7 +109,7 @@ public:
// uno api
- virtual void SAL_CALL disposing() override;
+ virtual void disposing(std::unique_lock<std::mutex>&) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index e6bb3f334e85..fa14c4de6527 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -132,8 +132,7 @@ static const SfxItemPropertyMapEntry*
ImplGetPresentationPropertyMap()
SlideShow::SlideShow( SdDrawDocument* pDoc )
-: SlideshowBase( m_aMutex )
-, maPropSet(ImplGetPresentationPropertyMap(),
SdrObject::GetGlobalDrawObjectItemPool())
+: maPropSet(ImplGetPresentationPropertyMap(),
SdrObject::GetGlobalDrawObjectItemPool())
, mbIsInStartup(false)
, mpDoc( pDoc )
, mpCurrentViewShellBase( nullptr )
@@ -886,7 +885,7 @@ Reference< XSlideShowController > SAL_CALL
SlideShow::getController( )
// XComponent
-void SAL_CALL SlideShow::disposing()
+void SlideShow::disposing(std::unique_lock<std::mutex>&)
{
SolarMutexGuard aGuard;
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx
b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 90d045998ef8..4cbb84aadf05 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/presentation/XSlideShowView.hpp>
#include <cppcanvas/spritecanvas.hxx>
+#include <cppuhelper/weakref.hxx>
#include <slideshow.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 8ade9b296462..107df47dc918 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -72,7 +72,7 @@
#include <svl/itempool.hxx>
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
#include <com/sun/star/drawing/XDrawPages.hpp>
-
+#include <osl/diagnose.h>
#include <memory>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index f0e76ec6a32f..28f1145e84fc 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -59,6 +59,7 @@
#include <svl/urihelper.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
+#include <osl/diagnose.h>
#include <DrawViewShell.hxx>
#include <slideshow.hxx>
