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

[Noel Grandin (via logerrit)]

 vcl/source/uitest/uno/uiobject_uno.cxx |    1 -
 vcl/source/uitest/uno/uiobject_uno.hxx |    8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 89f98a2a9ae48ac79d65db5956522e754930f5b6
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Feb 23 15:11:17 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Feb 24 13:06:37 2023 +0000

    use comphelper::WeakComponentImplHelper for UIObjectUnoObj
    
    Change-Id: I5aa340e9bc8abc498f37636f191c47c738fa1c63
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147585
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx 
b/vcl/source/uitest/uno/uiobject_uno.cxx
index 06ec96a45ab6..a0a718096391 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -41,7 +41,6 @@ struct Notifier {
 }
 
 UIObjectUnoObj::UIObjectUnoObj(std::unique_ptr<UIObject> pObj):
-    UIObjectBase(m_aMutex),
     mpObj(std::move(pObj))
 {
 }
diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx 
b/vcl/source/uitest/uno/uiobject_uno.hxx
index 47fc54696832..e86ce1bfd289 100644
--- a/vcl/source/uitest/uno/uiobject_uno.hxx
+++ b/vcl/source/uitest/uno/uiobject_uno.hxx
@@ -9,8 +9,7 @@
 
 #pragma once
 
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/test/XUIObject.hpp>
 
@@ -18,12 +17,11 @@
 
 #include <vcl/uitest/uiobject.hxx>
 
-typedef ::cppu::WeakComponentImplHelper <
+typedef ::comphelper::WeakComponentImplHelper <
     css::ui::test::XUIObject, css::lang::XServiceInfo
     > UIObjectBase;
 
-class UIObjectUnoObj : public cppu::BaseMutex,
-    public UIObjectBase
+class UIObjectUnoObj : public UIObjectBase
 {
 private:
     std::unique_ptr<UIObject> mpObj;