diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-27 10:23:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-27 10:23:48 +0100 |
commit | cd5431c07118152d4c14cdd65af0e4dfc16b4473 (patch) | |
tree | a30b2c02f264ad66989f2400cfb040a922761166 /svtools | |
parent | 23a0ee3c01c3588472e1c19605909d6b9401253c (diff) |
Unwind trivial AccessibleExtendedComponentHelper_BASE typedefs
Change-Id: I74b30cba1359045873a3d7a3f0e72f857ffa0ed0
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/vclxaccessibleheaderbaritem.hxx | 4 | ||||
-rw-r--r-- | svtools/source/control/vclxaccessibleheaderbaritem.cxx | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index fea0fef803dc..88e257e53987 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -43,13 +43,11 @@ class AccessibleStateSetHelper; // class VCLXAccessibleHeaderBarItem // ---------------------------------------------------- -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; - typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE; -class VCLXAccessibleHeaderBarItem : public AccessibleExtendedComponentHelper_BASE, +class VCLXAccessibleHeaderBarItem : public comphelper::OAccessibleExtendedComponentHelper, public VCLXAccessibleHeaderBarItem_BASE { private: diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 77097b7f1d53..13883cc7c3de 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -47,7 +47,7 @@ using namespace ::comphelper; VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ) - :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ) + :OAccessibleExtendedComponentHelper( new VCLExternalSolarLock() ) ,m_pHeadBar( pHeadBar ) ,m_nIndexInParent(_nIndexInParent + 1) @@ -93,13 +93,13 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeExcept // XInterface -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem, AccessibleExtendedComponentHelper_BASE, VCLXAccessibleHeaderBarItem_BASE ) +IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE ) // XTypeProvider -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, AccessibleExtendedComponentHelper_BASE, VCLXAccessibleHeaderBarItem_BASE ) +IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE ) // XComponent @@ -107,7 +107,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, AccessibleExtende void VCLXAccessibleHeaderBarItem::disposing() { - AccessibleExtendedComponentHelper_BASE::disposing(); + OAccessibleExtendedComponentHelper::disposing(); } // XServiceInfo |