summaryrefslogtreecommitdiff
path: root/accessibility/inc/accessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-28 10:04:19 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-10-28 10:04:35 +0100
commit4a59a23101245d89dae4484ec425bb5023a4384b (patch)
tree10d2927b5c3b20f9e14440229b20e8f9f3799d82 /accessibility/inc/accessibility
parentbfd79be417358822023691cf7b7b2946906100ca (diff)
Get rid of some redundant base class typedefs
Change-Id: Ia11ec85cc172d1b81b494107306c0aee98ce2ab5
Diffstat (limited to 'accessibility/inc/accessibility')
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx8
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx6
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx6
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx9
-rw-r--r--accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx8
-rw-r--r--accessibility/inc/accessibility/extended/accessiblelistbox.hxx11
6 files changed, 22 insertions, 26 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 0e34d55fe953..a2b07a5cced5 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -189,11 +189,9 @@ private:
<p>The instance holds its XAccessibleContext with a hard reference, while
the context holds this instance weak.</p>
*/
-typedef ::cppu::WeakImplHelper< css::accessibility::XAccessible
- > AccessibleBrowseBoxAccess_Base;
-
-class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base
- ,public ::svt::IAccessibleBrowseBox
+class AccessibleBrowseBoxAccess:
+ public cppu::WeakImplHelper<css::accessibility::XAccessible>,
+ public ::svt::IAccessibleBrowseBox
{
private:
::osl::Mutex m_aMutex;
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index 2472a3f1eb70..529b4fe86086 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -33,8 +33,8 @@ namespace accessibility
{
class AccessibleToolPanelDeck_Impl;
- typedef VCLXAccessibleComponent AccessibleToolPanelDeck_Base;
- class AccessibleToolPanelDeck : public AccessibleToolPanelDeck_Base
+
+ class AccessibleToolPanelDeck: public VCLXAccessibleComponent
{
public:
AccessibleToolPanelDeck(
@@ -42,7 +42,7 @@ namespace accessibility
::svt::ToolPanelDeck& i_rPanelDeck
);
- using AccessibleToolPanelDeck_Base::NotifyAccessibleEvent;
+ using VCLXAccessibleComponent::NotifyAccessibleEvent;
protected:
virtual ~AccessibleToolPanelDeck();
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
index 02683a6947ff..dd38ff50ee32 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -34,8 +34,8 @@ namespace accessibility
{
class AccessibleToolPanelTabBar_Impl;
- typedef VCLXAccessibleComponent AccessibleToolPanelTabBar_Base;
- class AccessibleToolPanelTabBar : public AccessibleToolPanelTabBar_Base
+
+ class AccessibleToolPanelTabBar: public VCLXAccessibleComponent
{
public:
AccessibleToolPanelTabBar(
@@ -44,7 +44,7 @@ namespace accessibility
::svt::PanelTabBar& i_rTabBar
);
- using AccessibleToolPanelTabBar_Base::NotifyAccessibleEvent;
+ using VCLXAccessibleComponent::NotifyAccessibleEvent;
protected:
virtual ~AccessibleToolPanelTabBar();
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index 5d628fa31804..71aa2dd3bd37 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -34,8 +34,9 @@ namespace accessibility
{
class AccessibleToolPanelDeckTabBarItem_Impl;
- typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleToolPanelDeckTabBarItem_Base;
- class AccessibleToolPanelDeckTabBarItem : public AccessibleToolPanelDeckTabBarItem_Base
+
+ class AccessibleToolPanelDeckTabBarItem:
+ public comphelper::OAccessibleExtendedComponentHelper
{
public:
AccessibleToolPanelDeckTabBarItem(
@@ -45,8 +46,8 @@ namespace accessibility
const size_t i_nItemPos
);
- using AccessibleToolPanelDeckTabBarItem_Base::NotifyAccessibleEvent;
- using AccessibleToolPanelDeckTabBarItem_Base::lateInit;
+ using OAccessibleExtendedComponentHelper::NotifyAccessibleEvent;
+ using OAccessibleExtendedComponentHelper::lateInit;
protected:
virtual ~AccessibleToolPanelDeckTabBarItem();
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
index 59f94743503f..8ec563a65e8b 100644
--- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
@@ -94,12 +94,10 @@ namespace accessibility
// = EditBrowseBoxTableCell
- typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible
- > EditBrowseBoxTableCellAccess_Base;
// XAccessible providing an EditBrowseBoxTableCell
- class EditBrowseBoxTableCellAccess
- :public ::comphelper::OBaseMutex
- ,public EditBrowseBoxTableCellAccess_Base
+ class EditBrowseBoxTableCellAccess:
+ public comphelper::OBaseMutex,
+ public cppu::WeakComponentImplHelper<css::accessibility::XAccessible>
{
protected:
css::uno::WeakReference< css::accessibility::XAccessibleContext >
diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
index 2b5160442b67..a6e0c5cae09c 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
@@ -37,14 +37,13 @@ namespace accessibility
{
class AccessibleListBoxEntry;
-
- typedef ::cppu::ImplHelper2< css::accessibility::XAccessible
- , css::accessibility::XAccessibleSelection> AccessibleListBox_BASE;
-
/** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
*/
- class AccessibleListBox :public AccessibleListBox_BASE
- ,public VCLXAccessibleComponent
+ class AccessibleListBox:
+ public cppu::ImplHelper2<
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleSelection>,
+ public VCLXAccessibleComponent
{
protected: