[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source include/toolkit svtools/inc svtools/source toolkit/source
Stephan Bergmann
sbergman at redhat.com
Wed Jan 27 01:24:24 PST 2016
accessibility/inc/accessibility/extended/accessibletabbarbase.hxx | 7 +------
accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx | 5 +----
accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx | 3 ---
accessibility/source/extended/accessibletabbar.cxx | 4 ++--
accessibility/source/extended/accessibletabbarbase.cxx | 4 ++--
accessibility/source/extended/accessibletabbarpage.cxx | 4 ++--
accessibility/source/extended/accessibletabbarpagelist.cxx | 4 ++--
accessibility/source/standard/accessiblemenubasecomponent.cxx | 8 ++++----
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 8 ++++----
basctl/source/accessibility/accessibledialogwindow.cxx | 8 ++++----
basctl/source/inc/accessibledialogcontrolshape.hxx | 5 +----
basctl/source/inc/accessibledialogwindow.hxx | 5 +----
include/toolkit/awt/vclxaccessiblecomponent.hxx | 5 +----
svtools/inc/vclxaccessibleheaderbaritem.hxx | 4 +---
svtools/source/control/vclxaccessibleheaderbaritem.cxx | 8 ++++----
toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 +++++-----
16 files changed, 35 insertions(+), 57 deletions(-)
New commits:
commit cd5431c07118152d4c14cdd65af0e4dfc16b4473
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 27 10:23:48 2016 +0100
Unwind trivial AccessibleExtendedComponentHelper_BASE typedefs
Change-Id: I74b30cba1359045873a3d7a3f0e72f857ffa0ed0
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
index 2bf9591..bf69535 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 80bd7d8..11cbf87 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 c475d9f..308f6fd 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;
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index b020513..873a013 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -162,13 +162,13 @@ namespace accessibility
// XInterface
- IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE )
+ IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE )
// XTypeProvider
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE )
+ IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, OAccessibleExtendedComponentHelper, AccessibleTabBar_BASE )
// XComponent
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index 49d18dc..e103a0e 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -30,7 +30,7 @@ namespace accessibility
AccessibleTabBarBase::AccessibleTabBarBase( TabBar* pTabBar ) :
- AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ),
+ OAccessibleExtendedComponentHelper( new VCLExternalSolarLock() ),
m_pTabBar( nullptr )
{
m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
@@ -69,7 +69,7 @@ void AccessibleTabBarBase::ProcessWindowEvent( const VclWindowEvent& rVclWindowE
void AccessibleTabBarBase::disposing()
{
- AccessibleExtendedComponentHelper_BASE::disposing();
+ OAccessibleExtendedComponentHelper::disposing();
ClearTabBarPointer();
}
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 8ce47ce..14df4a4 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -202,13 +202,13 @@ namespace accessibility
// XInterface
- IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE )
+ IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPage, OAccessibleExtendedComponentHelper, AccessibleTabBarPage_BASE )
// XTypeProvider
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE )
+ IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPage, OAccessibleExtendedComponentHelper, AccessibleTabBarPage_BASE )
// XComponent
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index cc0fd41..fce2aa4 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -344,13 +344,13 @@ namespace accessibility
// XInterface
- IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE )
+ IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList, OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
// XTypeProvider
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE )
+ IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList, OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
// XComponent
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 06aaeb3..6dfa824 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -45,7 +45,7 @@ using namespace ::comphelper;
OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu )
- :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
+ :OAccessibleExtendedComponentHelper( new VCLExternalSolarLock() )
,m_pMenu( pMenu )
,m_bEnabled( false )
,m_bFocused( false )
@@ -685,13 +685,13 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen
// XInterface
-IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE )
+IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuBaseComponent, OAccessibleExtendedComponentHelper, OAccessibleMenuBaseComponent_BASE )
// XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuBaseComponent, OAccessibleExtendedComponentHelper, OAccessibleMenuBaseComponent_BASE )
// XComponent
@@ -699,7 +699,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuBaseComponent, AccessibleExtend
void OAccessibleMenuBaseComponent::disposing()
{
- AccessibleExtendedComponentHelper_BASE::disposing();
+ OAccessibleExtendedComponentHelper::disposing();
if ( m_pMenu )
{
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 8f36275..30c0471 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -51,7 +51,7 @@ using namespace ::comphelper;
AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj)
- :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
+ :OAccessibleExtendedComponentHelper( new VCLExternalSolarLock() )
,m_pDialogWindow( pDialogWindow )
,m_pDlgEdObj( pDlgEdObj )
{
@@ -245,15 +245,15 @@ awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeExcep
}
// XInterface
-IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE )
+IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogControlShape, OAccessibleExtendedComponentHelper, AccessibleDialogControlShape_BASE )
// XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogControlShape, OAccessibleExtendedComponentHelper, AccessibleDialogControlShape_BASE )
// XComponent
void AccessibleDialogControlShape::disposing()
{
- AccessibleExtendedComponentHelper_BASE::disposing();
+ OAccessibleExtendedComponentHelper::disposing();
m_pDialogWindow = nullptr;
m_pDlgEdObj = nullptr;
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index e0a34ed..aeae71e 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -104,7 +104,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor&
AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWindow)
- : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
+ : OAccessibleExtendedComponentHelper( new VCLExternalSolarLock() )
, m_pDialogWindow(pDialogWindow)
, m_pDlgEditor(nullptr)
, m_pDlgEdModel(nullptr)
@@ -550,13 +550,13 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
// XInterface
-IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogWindow, AccessibleExtendedComponentHelper_BASE, AccessibleDialogWindow_BASE )
+IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogWindow, OAccessibleExtendedComponentHelper, AccessibleDialogWindow_BASE )
// XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogWindow, AccessibleExtendedComponentHelper_BASE, AccessibleDialogWindow_BASE )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogWindow, OAccessibleExtendedComponentHelper, AccessibleDialogWindow_BASE )
// XComponent
@@ -564,7 +564,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogWindow, AccessibleExtendedComp
void AccessibleDialogWindow::disposing()
{
- AccessibleExtendedComponentHelper_BASE::disposing();
+ OAccessibleExtendedComponentHelper::disposing();
if ( m_pDialogWindow )
{
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index bdf45d1..a4cbfdd 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -42,15 +42,12 @@ class DialogWindow;
// class AccessibleDialogControlShape
-
-typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE;
-
typedef ::cppu::ImplHelper3<
css::accessibility::XAccessible,
css::lang::XServiceInfo,
css::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE;
-class AccessibleDialogControlShape : public AccessibleExtendedComponentHelper_BASE,
+class AccessibleDialogControlShape : public comphelper::OAccessibleExtendedComponentHelper,
public AccessibleDialogControlShape_BASE
{
friend class AccessibleDialogWindow;
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 29c6fda..dfa5996 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -47,15 +47,12 @@ class DlgEdObj;
// class AccessibleDialogWindow
-
-typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE;
-
typedef ::cppu::ImplHelper3 <
css::accessibility::XAccessible,
css::accessibility::XAccessibleSelection,
css::lang::XServiceInfo > AccessibleDialogWindow_BASE;
-class AccessibleDialogWindow : public AccessibleExtendedComponentHelper_BASE,
+class AccessibleDialogWindow : public comphelper::OAccessibleExtendedComponentHelper,
public AccessibleDialogWindow_BASE,
public SfxListener
{
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 7025540..f5d65de 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -49,16 +49,13 @@ class AccessibleStateSetHelper;
// class VCLXAccessibleComponent
-
-typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE;
-
typedef ::cppu::ImplHelper1<
css::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
class VCLExternalSolarLock;
class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
- :public AccessibleExtendedComponentHelper_BASE
+ :public comphelper::OAccessibleExtendedComponentHelper
,public ::comphelper::OAccessibleImplementationAccess
,public VCLXAccessibleComponent_BASE
{
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index fea0fef..88e257e 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 77097b7..13883cc 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
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index bc9c5fa..b7a89fa 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
using namespace ::comphelper;
VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXWindow )
- : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
+ : OAccessibleExtendedComponentHelper( new VCLExternalSolarLock() )
, OAccessibleImplementationAccess( )
{
m_xVCLXWindow = pVCLXWindow;
@@ -92,8 +92,8 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent()
// @see OAccessibleContextHelper::OAccessibleContextHelper( IMutex* )
}
-IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
-IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
+IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
+IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException, std::exception)
{
@@ -348,7 +348,7 @@ void VCLXAccessibleComponent::disposing()
{
DisconnectEvents();
- AccessibleExtendedComponentHelper_BASE::disposing();
+ OAccessibleExtendedComponentHelper::disposing();
m_xVCLXWindow.clear();
}
@@ -557,7 +557,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) throw (uno::Ru
if ( xAcc.is() )
{ // we _do_ have a foreign-controlled parent -> use the base class' implementation,
// which goes the UNO way
- nIndex = AccessibleExtendedComponentHelper_BASE::getAccessibleIndexInParent( );
+ nIndex = OAccessibleExtendedComponentHelper::getAccessibleIndexInParent( );
}
else
{
More information about the Libreoffice-commits
mailing list