From cd5431c07118152d4c14cdd65af0e4dfc16b4473 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 27 Jan 2016 10:23:48 +0100 Subject: Unwind trivial AccessibleExtendedComponentHelper_BASE typedefs Change-Id: I74b30cba1359045873a3d7a3f0e72f857ffa0ed0 --- accessibility/inc/accessibility/extended/accessibletabbarbase.hxx | 7 +------ .../inc/accessibility/standard/accessiblemenubasecomponent.hxx | 5 +---- .../inc/accessibility/standard/accessiblemenucomponent.hxx | 3 --- 3 files changed, 2 insertions(+), 13 deletions(-) (limited to 'accessibility/inc') diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx index 2bf959173aa6..bf69535157bd 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx @@ -33,12 +33,7 @@ class VclWindowEvent; namespace accessibility { - - - -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; - -class AccessibleTabBarBase : public AccessibleExtendedComponentHelper_BASE +class AccessibleTabBarBase : public comphelper::OAccessibleExtendedComponentHelper { public: explicit AccessibleTabBarBase( TabBar* pTabBar ); diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx index 80bd7d8e787e..11cbf87ddb85 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx @@ -41,14 +41,11 @@ class AccessibleStateSetHelper; // class OAccessibleMenuBaseComponent - -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; - typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE; -class OAccessibleMenuBaseComponent : public AccessibleExtendedComponentHelper_BASE, +class OAccessibleMenuBaseComponent : public comphelper::OAccessibleExtendedComponentHelper, public OAccessibleMenuBaseComponent_BASE { friend class OAccessibleMenuItemComponent; diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx index c475d9ffca9e..308f6fd1f0af 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx @@ -28,9 +28,6 @@ // class OAccessibleMenuComponent - -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; - typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE; -- cgit