sd/source/ui/framework/factories/BasicViewFactory.cxx | 5 ++---
sd/source/ui/framework/factories/BasicViewFactory.hxx | 10 ++++------
2 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit bc346f7add9cad9016466788be09a66c722f9a91
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 15:24:26 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 17:03:57 2021 +0100
use comphelper::WeakComponentImplHelper in BasicViewFactory
Change-Id: If4f9a2ac6fb182b35787b4615fdfb5722b4948c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127560
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx
b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 4293486fbb4d..425cb44467f8 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -83,8 +83,7 @@ public:
//===== ViewFactory ===========================================================
BasicViewFactory::BasicViewFactory ()
- : BasicViewFactoryInterfaceBase(m_aMutex),
- mpViewShellContainer(new ViewShellContainer()),
+ : mpViewShellContainer(new ViewShellContainer()),
mpBase(nullptr),
mpFrameView(nullptr),
mpWindow(VclPtr<WorkWindow>::Create(nullptr,WB_STDWORK)),
@@ -97,7 +96,7 @@ BasicViewFactory::~BasicViewFactory()
{
}
-void SAL_CALL BasicViewFactory::disposing()
+void BasicViewFactory::disposing(std::unique_lock<std::mutex>&)
{
// Disconnect from the frame view.
if (mpFrameView != nullptr)
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx
b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index ea932a156be5..ccd5cbbda9f9 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -22,8 +22,7 @@
#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <vcl/vclptr.hxx>
#include <memory>
@@ -41,7 +40,7 @@ namespace vcl { class Window; }
namespace sd::framework {
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory,
css::lang::XInitialization
> BasicViewFactoryInterfaceBase;
@@ -59,14 +58,13 @@ typedef ::cppu::WeakComponentImplHelper <
For some views in some panes this class also acts as a cache.
*/
class BasicViewFactory
- : private cppu::BaseMutex,
- public BasicViewFactoryInterfaceBase
+ : public BasicViewFactoryInterfaceBase
{
public:
BasicViewFactory ();
virtual ~BasicViewFactory() override;
- virtual void SAL_CALL disposing() override;
+ virtual void disposing(std::unique_lock<std::mutex>&) override;
// XViewFactory
