summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx6
-rw-r--r--accessibility/inc/standard/vclxaccessibletabpage.hxx5
-rw-r--r--accessibility/inc/standard/vclxaccessibletoolboxitem.hxx4
-rw-r--r--accessibility/source/standard/vclxaccessiblestatusbaritem.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessibletabpage.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessibletoolboxitem.cxx2
6 files changed, 6 insertions, 15 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 0ab119fe19eb..9556f961d140 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -28,12 +28,8 @@
#include <vcl/vclptr.hxx>
-
-
-typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
-
class VCLXAccessibleStatusBarItem final : public cppu::ImplInheritanceHelper<
- AccessibleTextHelper_BASE,
+ comphelper::OAccessibleTextHelper,
css::accessibility::XAccessible,
css::lang::XServiceInfo>
{
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx
index bb3d720055a0..efdc75e2c677 100644
--- a/accessibility/inc/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -30,11 +30,8 @@
class TabControl;
-
-typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
-
class VCLXAccessibleTabPage final : public cppu::ImplInheritanceHelper<
- AccessibleTextHelper_BASE,
+ comphelper::OAccessibleTextHelper,
css::accessibility::XAccessible,
css::lang::XServiceInfo>
{
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 4ba54023f163..6fbfc1e55138 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -30,10 +30,8 @@
#include <vcl/vclptr.hxx>
-typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
-
class VCLXAccessibleToolBoxItem final : public cppu::ImplInheritanceHelper<
- AccessibleTextHelper_BASE,
+ comphelper::OAccessibleTextHelper,
css::accessibility::XAccessible,
css::accessibility::XAccessibleAction,
css::accessibility::XAccessibleValue,
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index eab26ee708d3..db5e6cf140fe 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -181,7 +181,7 @@ void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_
void VCLXAccessibleStatusBarItem::disposing()
{
- AccessibleTextHelper_BASE::disposing();
+ comphelper::OAccessibleTextHelper::disposing();
m_pStatusBar = nullptr;
m_sItemName.clear();
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index ff37087366d5..dad454ab0021 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -224,7 +224,7 @@ void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32&
void VCLXAccessibleTabPage::disposing()
{
- AccessibleTextHelper_BASE::disposing();
+ comphelper::OAccessibleTextHelper::disposing();
m_pTabControl = nullptr;
m_sPageText.clear();
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index d338ec78e045..064d2ebb3037 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -249,7 +249,7 @@ Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType )
void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
{
- AccessibleTextHelper_BASE::disposing();
+ comphelper::OAccessibleTextHelper::disposing();
m_pToolBox = nullptr;
}