diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-22 20:06:20 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-24 08:21:00 +0100 |
commit | 252dd254b5b29298457b889623783152e9bed534 (patch) | |
tree | 07583e1f12bacc6ab8e40b35f4832c27076b84da /drawinglayer | |
parent | 54115790926a5964534472dff7e4661ea34acb28 (diff) |
new comphelper::WeakImplComponentHelper
to replace the cppu:: equivalent with a lightweight version
that uses std::mutex instead of osl::Mutex
Change-Id: I1b7873a0c2d9cda21f529e43a4ac2fa7574c91a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127335
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/primitive2d/baseprimitive2d.cxx | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index b5590bce082c..29f4dc7fd473 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -29,66 +29,6 @@ using namespace css; -BasePrimitive2DImplBase::~BasePrimitive2DImplBase() {} - -css::uno::Any BasePrimitive2DImplBase::queryInterface(css::uno::Type const& rType) -{ - css::uno::Any aReturn = ::cppu::queryInterface( - rType, static_cast<uno::XWeak*>(this), static_cast<lang::XComponent*>(this), - static_cast<lang::XTypeProvider*>(this), static_cast<graphic::XPrimitive2D*>(this), - static_cast<util::XAccounting*>(this)); - if (aReturn.hasValue()) - return aReturn; - return OWeakObject::queryInterface(rType); -} - -void BasePrimitive2DImplBase::acquire() noexcept { OWeakObject::acquire(); } - -void BasePrimitive2DImplBase::release() noexcept -{ - if (osl_atomic_decrement(&m_refCount) != 0) - return; - - // ensure no other references are created, via the weak connection point, from now on - disposeWeakConnectionPoint(); - // restore reference count: - osl_atomic_increment(&m_refCount); - // if (! rBHelper.bDisposed) { - // try { - // dispose(); - // } - // catch (RuntimeException const& exc) { // don't break throw () - // SAL_WARN( "cppuhelper", exc ); - // } - // OSL_ASSERT( rBHelper.bDisposed ); - // } - OWeakObject::release(); -} - -void BasePrimitive2DImplBase::dispose() {} - -void BasePrimitive2DImplBase::addEventListener( - css::uno::Reference<css::lang::XEventListener> const&) -{ - assert(false); -} -void BasePrimitive2DImplBase::removeEventListener( - css::uno::Reference<css::lang::XEventListener> const&) -{ - assert(false); -} - -css::uno::Sequence<css::uno::Type> BasePrimitive2DImplBase::getTypes() -{ - static const css::uno::Sequence<uno::Type> aTypeList{ - cppu::UnoType<uno::XWeak>::get(), cppu::UnoType<lang::XComponent>::get(), - cppu::UnoType<lang::XTypeProvider>::get(), cppu::UnoType<graphic::XPrimitive2D>::get(), - cppu::UnoType<util::XAccounting>::get() - }; - - return aTypeList; -} - namespace drawinglayer::primitive2d { BasePrimitive2D::BasePrimitive2D() {} |