diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-23 17:09:52 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-24 19:57:25 +0000 |
commit | 5747634948fcb0f3430a2ce7647e128712cbba66 (patch) | |
tree | 2d3832f787018afefe8680514956f0fc37e845e5 /include/comphelper/accessiblecomponenthelper.hxx | |
parent | 21fbb4b952c7ba5d580c71150ffe9423aaf57f9e (diff) |
Use ImplInheritanceHelper in OAccessibleExtendedComponentHelper
(Explicitly deleting the special member functions is needed to avoid MSVC
> include\cppuhelper/implbase.hxx(152): error C2280: 'comphelper::OCommonAccessibleComponent::OCommonAccessibleComponent(const comphelper::OCommonAccessibleComponent &)': attempting to reference a deleted function
> include\comphelper/accessiblecomponenthelper.hxx(176): note: compiler has generated 'comphelper::OCommonAccessibleComponent::OCommonAccessibleComponent' here
> include\comphelper/accessiblecomponenthelper.hxx(176): note: 'comphelper::OCommonAccessibleComponent::OCommonAccessibleComponent(const comphelper::OCommonAccessibleComponent &)': function was implicitly deleted because a base class invokes a deleted or inaccessible function 'cppu::BaseMutex::BaseMutex(const cppu::BaseMutex &)'
> include\cppuhelper/basemutex.hxx(43): note: 'cppu::BaseMutex::BaseMutex(const cppu::BaseMutex &)': function was implicitly deleted because a data member invokes a deleted or inaccessible function 'osl::Mutex::Mutex(const osl::Mutex &)'
> include\osl/mutex.hxx(107): note: 'osl::Mutex::Mutex(const osl::Mutex &)': function was explicitly deleted
> include\comphelper/accessiblecomponenthelper.hxx(228): note: see reference to function template instantiation 'cppu::ImplInheritanceHelper<comphelper::OCommonAccessibleComponent,com::sun::star::accessibility::XAccessibleExtendedComponent>::ImplInheritanceHelper<cppu::ImplInheritanceHelper<comphelper::OCommonAccessibleComponent,com::sun::star::accessibility::XAccessibleExtendedComponent>>(cppu::ImplInheritanceHelper<comphelper::OCommonAccessibleComponent,com::sun::star::accessibility::XAccessibleExtendedComponent> &&)' being compiled
> include\comphelper/accessiblecomponenthelper.hxx(228): note: see reference to function template instantiation 'cppu::ImplInheritanceHelper<comphelper::OCommonAccessibleComponent,com::sun::star::accessibility::XAccessibleExtendedComponent>::ImplInheritanceHelper<cppu::ImplInheritanceHelper<comphelper::OCommonAccessibleComponent,com::sun::star::accessibility::XAccessibleExtendedComponent>>(cppu::ImplInheritanceHelper<comphelper::OCommonAccessibleComponent,com::sun::star::accessibility::XAccessibleExtendedComponent> &&)' being compiled
)
Change-Id: Ia5a7b244dd018c1a63cc2940dba197c43827d563
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146062
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/comphelper/accessiblecomponenthelper.hxx')
-rw-r--r-- | include/comphelper/accessiblecomponenthelper.hxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index def0b9e2fecb..2a840ea9e36e 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase1.hxx> #include <comphelper/uno3.hxx> #include <comphelper/comphelperdllapi.h> @@ -209,24 +208,23 @@ namespace comphelper //= OAccessibleExtendedComponentHelper - typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleExtendedComponent - > OAccessibleExtendedComponentHelper_Base; - /** a helper class for implementing an AccessibleContext which at the same time supports an XAccessibleExtendedComponent interface. */ class COMPHELPER_DLLPUBLIC OAccessibleExtendedComponentHelper - :public OCommonAccessibleComponent - ,public OAccessibleExtendedComponentHelper_Base + :public cppu::ImplInheritanceHelper< + OCommonAccessibleComponent, css::accessibility::XAccessibleExtendedComponent> { + private: + OAccessibleExtendedComponentHelper(OAccessibleExtendedComponentHelper const &) = delete; + OAccessibleExtendedComponentHelper(OAccessibleExtendedComponentHelper &&) = delete; + void operator =(OAccessibleExtendedComponentHelper const &) = delete; + void operator =(OAccessibleExtendedComponentHelper &&) = delete; + protected: OAccessibleExtendedComponentHelper( ); public: - // XInterface - DECLARE_XINTERFACE( ) - DECLARE_XTYPEPROVIDER( ) - // XAccessibleComponent - default implementations virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; virtual css::awt::Point SAL_CALL getLocation( ) override; |