diff options
5 files changed, 6 insertions, 22 deletions
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index 233e7277cb27..9827f9ba6b67 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -21,6 +21,7 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> +#include <cppuhelper/implbase1.hxx> #include <vcl/tabctrl.hxx> #include <vcl/vclptr.hxx> diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index 0b2908d1dc32..352c3c07edfa 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -22,6 +22,7 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <vcl/toolbox.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> +#include <cppuhelper/implbase1.hxx> diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index f9f3599bb4b4..18835b50b95d 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -168,7 +168,7 @@ namespace accessibility throw RuntimeException("getAccessibleChild: Entry " + OUString::number(i) + " not found", static_cast<css::lang::XTypeProvider*>( - static_cast<VCLXAccessibleComponent_BASE*>(this))); + static_cast<VCLXAccessibleComponent*>(this))); return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this ); } diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 24003d5500f5..d3aaa30f5646 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -22,7 +22,7 @@ #include <toolkit/dllapi.h> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/accessiblecomponenthelper.hxx> @@ -41,12 +41,9 @@ class AccessibleRelationSetHelper; -typedef ::cppu::ImplHelper1< - css::lang::XServiceInfo > VCLXAccessibleComponent_BASE; - class TOOLKIT_DLLPUBLIC SAL_LOPLUGIN_ANNOTATE("crosscast") VCLXAccessibleComponent - :public comphelper::OAccessibleExtendedComponentHelper - ,public VCLXAccessibleComponent_BASE + :public cppu::ImplInheritanceHelper< + comphelper::OAccessibleExtendedComponentHelper, css::lang::XServiceInfo> { private: rtl::Reference<VCLXWindow> m_xVCLXWindow; @@ -77,11 +74,6 @@ public: virtual void SAL_CALL disposing() override; - // css::uno::XInterface - DECLARE_XINTERFACE() - // css::lang::XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 26dcde5e1b01..2c9565fec9a7 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -79,16 +79,6 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent() DisconnectEvents(); } -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, VCLXAccessibleComponent_BASE ) -css::uno::Sequence< css::uno::Type > SAL_CALL VCLXAccessibleComponent::getTypes() -{ - return ::comphelper::concatSequences( - OAccessibleExtendedComponentHelper::getTypes(), - VCLXAccessibleComponent_BASE::getTypes() - ); -} -IMPLEMENT_GET_IMPLEMENTATION_ID( VCLXAccessibleComponent ) - OUString VCLXAccessibleComponent::getImplementationName() { return "com.sun.star.comp.toolkit.AccessibleWindow"; |