sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 5 ++---
sd/source/ui/framework/factories/BasicToolBarFactory.hxx | 10 ++++------
sd/source/ui/presenter/PresenterCanvas.cxx | 10 ++++++----
sd/source/ui/presenter/PresenterCanvas.hxx | 10 ++++------
4 files changed, 16 insertions(+), 19 deletions(-)
New commits:
commit 73644ddc5a1c997d8dd415ac3df8f35088cc8465
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 15:34:46 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 19:37:56 2021 +0100
use comphelper::WeakComponentImplHelper in PresenterCanvas
Change-Id: If6ffeee67c1064da68e64748d4c30b1eef1f9116
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127565
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx
b/sd/source/ui/presenter/PresenterCanvas.cxx
index 017fed5c7bd8..044bbefc1b03 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -102,8 +102,7 @@ PresenterCanvas::PresenterCanvas (
const Reference<rendering::XCanvas>& rxSharedCanvas,
const Reference<awt::XWindow>& rxSharedWindow,
const Reference<awt::XWindow>& rxWindow)
- : PresenterCanvasInterfaceBase(m_aMutex),
- mxUpdateCanvas(rxUpdateCanvas),
+ : mxUpdateCanvas(rxUpdateCanvas),
mxUpdateWindow(rxUpdateWindow),
mxSharedCanvas(rxSharedCanvas),
mxSharedWindow(rxSharedWindow),
@@ -123,10 +122,13 @@ PresenterCanvas::~PresenterCanvas()
{
}
-void SAL_CALL PresenterCanvas::disposing()
+void PresenterCanvas::disposing(std::unique_lock<std::mutex>&)
{
if (mxWindow.is())
+ {
mxWindow->removeWindowListener(this);
+ mxWindow.clear();
+ }
}
//----- XCanvas ---------------------------------------------------------------
@@ -680,7 +682,7 @@ Reference<rendering::XPolyPolygon2D>
PresenterCanvas::UpdateSpriteClip (
void PresenterCanvas::ThrowIfDisposed()
{
- if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is())
+ if (m_bDisposed || ! mxSharedCanvas.is())
{
throw lang::DisposedException ("PresenterCanvas object has already
been disposed",
static_cast<uno::XWeak*>(this));
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx
b/sd/source/ui/presenter/PresenterCanvas.hxx
index 574265180b72..da2f51a7990f 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -24,8 +24,7 @@
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <memory>
namespace sd::presenter { class CanvasUpdateRequester; }
@@ -34,7 +33,7 @@ namespace com::sun::star::geometry { struct AffineMatrix2D; }
namespace sd::presenter {
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
css::rendering::XSpriteCanvas,
css::rendering::XBitmap,
css::awt::XWindowListener
@@ -53,8 +52,7 @@ typedef ::cppu::WeakComponentImplHelper <
construction. This allows the shared canvas to be a canvas of sprite
itself.
*/
class PresenterCanvas
- : private ::cppu::BaseMutex,
- public PresenterCanvasInterfaceBase
+ : public PresenterCanvasInterfaceBase
{
public:
/** This constructor is used when a PresenterCanvas object is created
@@ -94,7 +92,7 @@ public:
PresenterCanvas(const PresenterCanvas&) = delete;
PresenterCanvas& operator=(const PresenterCanvas&) = delete;
- virtual void SAL_CALL disposing() override;
+ virtual void disposing(std::unique_lock<std::mutex>&) override;
css::awt::Point GetOffset (const css::uno::Reference<css::awt::XWindow>&
rxBaseWindow);
commit 8e70d7a5ecd7fe96890753e02d3837067c57453a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 15:25:41 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 19:37:47 2021 +0100
use comphelper::WeakComponentImplHelper in BasicToolBarFactory
Change-Id: I2c8bc3ea8226cb1145b52a37e37d6c245e9bbeee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127561
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 42a1d0a0fb77..af79a88ea23b 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -38,7 +38,6 @@ namespace sd::framework {
//===== BasicToolBarFactory ===================================================
BasicToolBarFactory::BasicToolBarFactory ()
- : BasicToolBarFactoryInterfaceBase(m_aMutex)
{
}
@@ -46,7 +45,7 @@ BasicToolBarFactory::~BasicToolBarFactory()
{
}
-void SAL_CALL BasicToolBarFactory::disposing()
+void BasicToolBarFactory::disposing(std::unique_lock<std::mutex>&)
{
Shutdown();
}
@@ -142,7 +141,7 @@ void SAL_CALL BasicToolBarFactory::releaseResource (
void BasicToolBarFactory::ThrowIfDisposed() const
{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
+ if (m_bDisposed)
{
throw lang::DisposedException ("BasicToolBarFactory object has already
been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index 717edceb24b8..fdaf92788b6d 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -21,8 +21,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
namespace com::sun::star::frame { class XController; }
namespace com::sun::star::drawing::framework { class XResourceId; }
@@ -30,7 +29,7 @@ namespace com::sun::star::drawing::framework { class
XConfigurationController; }
namespace sd::framework {
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory,
css::lang::XInitialization,
css::lang::XEventListener
@@ -40,14 +39,13 @@ typedef ::cppu::WeakComponentImplHelper <
private:resource/toolbar/ViewTabBar
*/
class BasicToolBarFactory
- : protected ::cppu::BaseMutex,
- public BasicToolBarFactoryInterfaceBase
+ : public BasicToolBarFactoryInterfaceBase
{
public:
BasicToolBarFactory ();
virtual ~BasicToolBarFactory() override;
- virtual void SAL_CALL disposing() override;
+ virtual void disposing(std::unique_lock<std::mutex>&) override;
// ToolBarFactory
