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.grandin@collabora.co.uk>
This commit is contained in:
@@ -41,7 +41,6 @@ struct Notifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UIObjectUnoObj::UIObjectUnoObj(std::unique_ptr<UIObject> pObj):
|
UIObjectUnoObj::UIObjectUnoObj(std::unique_ptr<UIObject> pObj):
|
||||||
UIObjectBase(m_aMutex),
|
|
||||||
mpObj(std::move(pObj))
|
mpObj(std::move(pObj))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@@ -9,8 +9,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <cppuhelper/compbase.hxx>
|
#include <comphelper/compbase.hxx>
|
||||||
#include <cppuhelper/basemutex.hxx>
|
|
||||||
#include <com/sun/star/lang/XServiceInfo.hpp>
|
#include <com/sun/star/lang/XServiceInfo.hpp>
|
||||||
#include <com/sun/star/ui/test/XUIObject.hpp>
|
#include <com/sun/star/ui/test/XUIObject.hpp>
|
||||||
|
|
||||||
@@ -18,12 +17,11 @@
|
|||||||
|
|
||||||
#include <vcl/uitest/uiobject.hxx>
|
#include <vcl/uitest/uiobject.hxx>
|
||||||
|
|
||||||
typedef ::cppu::WeakComponentImplHelper <
|
typedef ::comphelper::WeakComponentImplHelper <
|
||||||
css::ui::test::XUIObject, css::lang::XServiceInfo
|
css::ui::test::XUIObject, css::lang::XServiceInfo
|
||||||
> UIObjectBase;
|
> UIObjectBase;
|
||||||
|
|
||||||
class UIObjectUnoObj : public cppu::BaseMutex,
|
class UIObjectUnoObj : public UIObjectBase
|
||||||
public UIObjectBase
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<UIObject> mpObj;
|
std::unique_ptr<UIObject> mpObj;
|
||||||
|
Reference in New Issue
Block a user