[Libreoffice-commits] core.git: accessibility/inc accessibility/source
Stephan Bergmann
sbergman at redhat.com
Wed Oct 28 02:04:56 PDT 2015
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 8 ++-----
accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx | 6 ++---
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx | 6 ++---
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx | 9 ++++----
accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx | 8 ++-----
accessibility/inc/accessibility/extended/accessiblelistbox.hxx | 11 ++++------
accessibility/source/extended/AccessibleToolPanelDeck.cxx | 6 ++---
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 6 ++---
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 2 -
accessibility/source/extended/accessiblelistbox.cxx | 4 +--
10 files changed, 31 insertions(+), 35 deletions(-)
New commits:
commit 4a59a23101245d89dae4484ec425bb5023a4384b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 28 10:04:19 2015 +0100
Get rid of some redundant base class typedefs
Change-Id: Ia11ec85cc172d1b81b494107306c0aee98ce2ab5
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 0e34d55..a2b07a5 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 2472a3f..529b4fe 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 02683a6..dd38ff5 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 5d628fa..71aa2dd 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 59f9474..8ec563a 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 2b516044..a6e0c5c 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:
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index 5c19544..66ad434 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -226,7 +226,7 @@ namespace accessibility
// AccessibleToolPanelDeck
AccessibleToolPanelDeck::AccessibleToolPanelDeck( const Reference< XAccessible >& i_rAccessibleParent,
::svt::ToolPanelDeck& i_rPanelDeck )
- :AccessibleToolPanelDeck_Base( i_rPanelDeck.GetWindowPeer() )
+ :VCLXAccessibleComponent( i_rPanelDeck.GetWindowPeer() )
,m_xImpl( new AccessibleToolPanelDeck_Impl( *this, i_rAccessibleParent, i_rPanelDeck ) )
{
}
@@ -328,7 +328,7 @@ namespace accessibility
void SAL_CALL AccessibleToolPanelDeck::disposing()
{
- AccessibleToolPanelDeck_Base::disposing();
+ VCLXAccessibleComponent::disposing();
m_xImpl->dispose();
}
@@ -342,7 +342,7 @@ namespace accessibility
void AccessibleToolPanelDeck::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
{
- AccessibleToolPanelDeck_Base::FillAccessibleStateSet( i_rStateSet );
+ VCLXAccessibleComponent::FillAccessibleStateSet( i_rStateSet );
if ( m_xImpl->isDisposed() )
{
i_rStateSet.AddState( AccessibleStateType::DEFUNC );
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 14509f6..a3bd054 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -269,7 +269,7 @@ namespace accessibility
// AccessibleToolPanelTabBar
AccessibleToolPanelTabBar::AccessibleToolPanelTabBar( const Reference< XAccessible >& i_rAccessibleParent,
::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
- :AccessibleToolPanelTabBar_Base( i_rTabBar.GetWindowPeer() )
+ :VCLXAccessibleComponent( i_rTabBar.GetWindowPeer() )
,m_xImpl( new AccessibleToolPanelTabBar_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar ) )
{
}
@@ -370,7 +370,7 @@ namespace accessibility
void SAL_CALL AccessibleToolPanelTabBar::disposing()
{
- AccessibleToolPanelTabBar_Base::disposing();
+ VCLXAccessibleComponent::disposing();
m_xImpl->dispose();
}
@@ -384,7 +384,7 @@ namespace accessibility
void AccessibleToolPanelTabBar::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
{
- AccessibleToolPanelTabBar_Base::FillAccessibleStateSet( i_rStateSet );
+ VCLXAccessibleComponent::FillAccessibleStateSet( i_rStateSet );
i_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
ENSURE_OR_RETURN_VOID( !m_xImpl->isDisposed(), "AccessibleToolPanelTabBar::FillAccessibleStateSet: already disposed!" );
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index dac4abe..1b8b5f5 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -165,7 +165,7 @@ namespace accessibility
const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible,
const Reference< XWindow >& _rxFocusWindow,
IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos )
- :EditBrowseBoxTableCellAccess_Base( m_aMutex )
+ :WeakComponentImplHelper( m_aMutex )
,m_xParent( _rxParent )
,m_xControlAccessible( _rxControlAccessible )
,m_xFocusWindow( _rxFocusWindow )
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 1e21f01..3287b9a 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -64,8 +64,8 @@ namespace accessibility
dispose();
}
}
- IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE)
- IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE)
+ IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, ImplHelper2)
+ IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, VCLXAccessibleComponent, ImplHelper2)
void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
More information about the Libreoffice-commits
mailing list