summaryrefslogtreecommitdiffstats
path: root/accessibility/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-01-27 10:23:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-01-27 10:23:48 +0100
commitcd5431c07118152d4c14cdd65af0e4dfc16b4473 (patch)
treea30b2c02f264ad66989f2400cfb040a922761166 /accessibility/source
parentlibreofficekit: password interaction optional and off by default (diff)
downloadcore-cd5431c07118152d4c14cdd65af0e4dfc16b4473.tar.gz
core-cd5431c07118152d4c14cdd65af0e4dfc16b4473.zip
Unwind trivial AccessibleExtendedComponentHelper_BASE typedefs
Change-Id: I74b30cba1359045873a3d7a3f0e72f857ffa0ed0
Diffstat (limited to 'accessibility/source')
-rw-r--r--accessibility/source/extended/accessibletabbar.cxx4
-rw-r--r--accessibility/source/extended/accessibletabbarbase.cxx4
-rw-r--r--accessibility/source/extended/accessibletabbarpage.cxx4
-rw-r--r--accessibility/source/extended/accessibletabbarpagelist.cxx4
-rw-r--r--accessibility/source/standard/accessiblemenubasecomponent.cxx8
5 files changed, 12 insertions, 12 deletions
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index b020513c7228..873a01370b0a 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 49d18dce8b4e..e103a0e818b8 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 8ce47ce1a61c..14df4a432f96 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 cc0fd4183abf..fce2aa4c6758 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 06aaeb3f99b3..6dfa824ac27f 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 )
{