From a079e9010398ba2c33cf2509ff511e711b5e5b37 Mon Sep 17 00:00:00 2001 From: Noel Date: Tue, 23 Feb 2021 09:41:33 +0200 Subject: loplugin:refcounting in toolkit Change-Id: I4a65ee848eed7c48340c73d3144b4a1e29ab867c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111370 Tested-by: Jenkins Reviewed-by: Noel Grandin --- toolkit/inc/controls/accessiblecontrolcontext.hxx | 4 ++-- toolkit/inc/controls/geometrycontrolmodel.hxx | 2 ++ toolkit/inc/controls/roadmapentry.hxx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'toolkit/inc/controls') diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index 6a07e3e89865..ea4f959b853e 100644 --- a/toolkit/inc/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -58,14 +58,14 @@ namespace toolkit the uno control's XAccessible interface. This must be an XControl, from which an XControlModel can be retrieved. */ - static OAccessibleControlContext* create( + static rtl::Reference create( const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator ); - private: // XInterface DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) + private: // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; diff --git a/toolkit/inc/controls/geometrycontrolmodel.hxx b/toolkit/inc/controls/geometrycontrolmodel.hxx index 8c1109c30396..2d87f7cca2af 100644 --- a/toolkit/inc/controls/geometrycontrolmodel.hxx +++ b/toolkit/inc/controls/geometrycontrolmodel.hxx @@ -103,11 +103,13 @@ namespace com::sun::star { // XAggregation css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _aType ) override; + public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; + protected: // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; diff --git a/toolkit/inc/controls/roadmapentry.hxx b/toolkit/inc/controls/roadmapentry.hxx index 81aa9b74dff0..b8490439c99c 100644 --- a/toolkit/inc/controls/roadmapentry.hxx +++ b/toolkit/inc/controls/roadmapentry.hxx @@ -42,10 +42,10 @@ class ORoadmapEntry final : public ORoadmapEntry_Base public: ORoadmapEntry(); -private: DECLARE_XINTERFACE() // merge XInterface implementations DECLARE_XTYPEPROVIDER() // merge XTypeProvider implementations +private: /// @see css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; -- cgit