svtools/source/control/accessibletabbar.cxx | 563 ++++++-------
svtools/source/control/accessibletabbar.hxx | 96 +-
svtools/source/control/accessibletabbarbase.cxx | 9
svtools/source/control/accessibletabbarbase.hxx | 8
svtools/source/control/accessibletabbarpage.cxx | 450 +++++------
svtools/source/control/accessibletabbarpage.hxx | 127 +--
svtools/source/control/accessibletabbarpagelist.cxx | 816 +++++++++-----------
svtools/source/control/accessibletabbarpagelist.hxx | 135 +--
8 files changed, 1075 insertions(+), 1129 deletions(-)
New commits:
commit c76e7c317e5a959024829fa3839fc69925d99c4c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue May 13 15:24:58 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 06:47:16 2025 +0200
svtools a11y: Deduplicate XAccessible implementations
Let the base class, AccessibleTabBarBase implement
the XAccessible interface, instead of having all
subclasses doing it separately.
Change-Id: I0cd169a0b015514f5ba59e820d72688a041ab27c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185267
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/svtools/source/control/accessibletabbar.cxx
b/svtools/source/control/accessibletabbar.cxx
index f56a2438dc6d..d391a72bc88b 100644
--- a/svtools/source/control/accessibletabbar.cxx
+++ b/svtools/source/control/accessibletabbar.cxx
@@ -187,18 +187,6 @@ Sequence< OUString >
AccessibleTabBar::getSupportedServiceNames()
return { u"com.sun.star.awt.AccessibleTabBar"_ustr };
}
-
-// XAccessible
-
-
-Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( )
-{
- OExternalLockGuard aGuard( this );
-
- return this;
-}
-
-
// XAccessibleContext
diff --git a/svtools/source/control/accessibletabbar.hxx
b/svtools/source/control/accessibletabbar.hxx
index fa723f6fe5e2..641b149993b0 100644
--- a/svtools/source/control/accessibletabbar.hxx
+++ b/svtools/source/control/accessibletabbar.hxx
@@ -30,10 +30,8 @@
namespace accessibility
{
-class AccessibleTabBar final : public cppu::ImplInheritanceHelper<
- AccessibleTabBarBase,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo>
+class AccessibleTabBar final
+ : public cppu::ImplInheritanceHelper<AccessibleTabBarBase,
css::lang::XServiceInfo>
{
std::vector<css::uno::Reference<css::accessibility::XAccessible>>
m_aAccessibleChildren;
@@ -54,9 +52,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/svtools/source/control/accessibletabbarbase.cxx
b/svtools/source/control/accessibletabbarbase.cxx
index 8f1c6e438d6d..bfd6721c3bde 100644
--- a/svtools/source/control/accessibletabbarbase.cxx
+++ b/svtools/source/control/accessibletabbarbase.cxx
@@ -20,6 +20,7 @@
#include "accessibletabbarbase.hxx"
#include "accessibletabbarpagelist.hxx"
+#include <comphelper/accessiblecontexthelper.hxx>
#include <svtools/tabbar.hxx>
#include <vcl/vclevent.hxx>
@@ -39,6 +40,14 @@ AccessibleTabBarBase::~AccessibleTabBarBase()
ClearTabBarPointer();
}
+css::uno::Reference<css::accessibility::XAccessibleContext>
+AccessibleTabBarBase::getAccessibleContext()
+{
+ comphelper::OExternalLockGuard aGuard(this);
+
+ return this;
+}
+
IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent,
void )
{
vcl::Window* pEventWindow = rEvent.GetWindow();
diff --git a/svtools/source/control/accessibletabbarbase.hxx
b/svtools/source/control/accessibletabbarbase.hxx
index 806cd311ee62..d39d7c77c38d 100644
--- a/svtools/source/control/accessibletabbarbase.hxx
+++ b/svtools/source/control/accessibletabbarbase.hxx
@@ -30,12 +30,18 @@ class VclWindowEvent;
namespace accessibility
{
-class AccessibleTabBarBase : public comphelper::OAccessibleComponentHelper
+class AccessibleTabBarBase
+ : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
+ css::accessibility::XAccessible>
{
public:
explicit AccessibleTabBarBase( TabBar* pTabBar );
virtual ~AccessibleTabBarBase() override;
+ // XAccessible
+ virtual css::uno::Reference<css::accessibility::XAccessibleContext>
+ SAL_CALL getAccessibleContext() override;
+
protected:
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
diff --git a/svtools/source/control/accessibletabbarpage.cxx
b/svtools/source/control/accessibletabbarpage.cxx
index 1d17a86b2b36..f99574eaeb38 100644
--- a/svtools/source/control/accessibletabbarpage.cxx
+++ b/svtools/source/control/accessibletabbarpage.cxx
@@ -214,18 +214,6 @@ Sequence< OUString >
AccessibleTabBarPage::getSupportedServiceNames()
return { u"com.sun.star.awt.AccessibleTabBarPage"_ustr };
}
-
-// XAccessible
-
-
-Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext( )
-{
- OExternalLockGuard aGuard( this );
-
- return this;
-}
-
-
// XAccessibleContext
diff --git a/svtools/source/control/accessibletabbarpage.hxx
b/svtools/source/control/accessibletabbarpage.hxx
index f9d9bfa3d7c0..bbf3b86edd3a 100644
--- a/svtools/source/control/accessibletabbarpage.hxx
+++ b/svtools/source/control/accessibletabbarpage.hxx
@@ -28,10 +28,8 @@
namespace accessibility
{
-class AccessibleTabBarPage final : public cppu::ImplInheritanceHelper<
- AccessibleTabBarBase,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo>
+class AccessibleTabBarPage final
+ : public cppu::ImplInheritanceHelper<AccessibleTabBarBase,
css::lang::XServiceInfo>
{
friend class AccessibleTabBarPageList;
@@ -68,9 +66,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/svtools/source/control/accessibletabbarpagelist.cxx
b/svtools/source/control/accessibletabbarpagelist.cxx
index 77430b89b16e..08d1ce6eb9c2 100644
--- a/svtools/source/control/accessibletabbarpagelist.cxx
+++ b/svtools/source/control/accessibletabbarpagelist.cxx
@@ -347,21 +347,8 @@ Sequence< OUString >
AccessibleTabBarPageList::getSupportedServiceNames()
return { u"com.sun.star.awt.AccessibleTabBarPageList"_ustr };
}
-
-// XAccessible
-
-
-Reference< XAccessibleContext >
AccessibleTabBarPageList::getAccessibleContext( )
-{
- OExternalLockGuard aGuard( this );
-
- return this;
-}
-
-
// XAccessibleContext
-
sal_Int64 AccessibleTabBarPageList::getAccessibleChildCount()
{
OExternalLockGuard aGuard( this );
diff --git a/svtools/source/control/accessibletabbarpagelist.hxx
b/svtools/source/control/accessibletabbarpagelist.hxx
index 00634fa5af41..18c507202fc0 100644
--- a/svtools/source/control/accessibletabbarpagelist.hxx
+++ b/svtools/source/control/accessibletabbarpagelist.hxx
@@ -33,11 +33,9 @@
namespace accessibility
{
-class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper<
- AccessibleTabBarBase,
- css::accessibility::XAccessible,
-
css::accessibility::XAccessibleSelection,
- css::lang::XServiceInfo>
+class AccessibleTabBarPageList final
+ : public cppu::ImplInheritanceHelper<
+ AccessibleTabBarBase, css::accessibility::XAccessibleSelection,
css::lang::XServiceInfo>
{
private:
typedef std::vector< rtl::Reference< AccessibleTabBarPage > >
AccessibleChildren;
@@ -70,9 +68,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
commit 0cf1574679ec3e36e392284656e731166f6a36d2
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue May 13 15:14:22 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 15 06:47:03 2025 +0200
svtools a11y: Drop extra indentation level
Change-Id: Ic5102cf0ebebe81d179a9907a81f052a2ad16acd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185266
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/svtools/source/control/accessibletabbar.cxx
b/svtools/source/control/accessibletabbar.cxx
index 8c9cec78f532..f56a2438dc6d 100644
--- a/svtools/source/control/accessibletabbar.cxx
+++ b/svtools/source/control/accessibletabbar.cxx
@@ -39,412 +39,409 @@
namespace accessibility
{
-
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::accessibility;
- using namespace ::comphelper;
-
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar )
+ :ImplInheritanceHelper( pTabBar )
+{
+ if ( m_pTabBar )
+ m_aAccessibleChildren.assign(
m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() );
+}
- AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar )
- :ImplInheritanceHelper( pTabBar )
- {
- if ( m_pTabBar )
- m_aAccessibleChildren.assign(
m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() );
- }
+void AccessibleTabBar::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
+{
+ Any aOldValue, aNewValue;
- void AccessibleTabBar::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
+ switch ( rVclWindowEvent.GetId() )
{
- Any aOldValue, aNewValue;
-
- switch ( rVclWindowEvent.GetId() )
+ case VclEventId::WindowEnabled:
{
- case VclEventId::WindowEnabled:
- {
- aNewValue <<= AccessibleStateType::SENSITIVE;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- aNewValue <<= AccessibleStateType::ENABLED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
- case VclEventId::WindowDisabled:
- {
- aOldValue <<= AccessibleStateType::ENABLED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- aOldValue <<= AccessibleStateType::SENSITIVE;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
- case VclEventId::WindowGetFocus:
- {
- aNewValue <<= AccessibleStateType::FOCUSED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
- case VclEventId::WindowLoseFocus:
- {
- aOldValue <<= AccessibleStateType::FOCUSED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
- case VclEventId::WindowShow:
- {
- aNewValue <<= AccessibleStateType::SHOWING;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
- case VclEventId::WindowHide:
- {
- aOldValue <<= AccessibleStateType::SHOWING;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
- break;
- default:
- {
- AccessibleTabBarBase::ProcessWindowEvent( rVclWindowEvent );
- }
- break;
+ aNewValue <<= AccessibleStateType::SENSITIVE;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ aNewValue <<= AccessibleStateType::ENABLED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ }
+ break;
+ case VclEventId::WindowDisabled:
+ {
+ aOldValue <<= AccessibleStateType::ENABLED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ aOldValue <<= AccessibleStateType::SENSITIVE;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ }
+ break;
+ case VclEventId::WindowGetFocus:
+ {
+ aNewValue <<= AccessibleStateType::FOCUSED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ }
+ break;
+ case VclEventId::WindowLoseFocus:
+ {
+ aOldValue <<= AccessibleStateType::FOCUSED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
}
+ break;
+ case VclEventId::WindowShow:
+ {
+ aNewValue <<= AccessibleStateType::SHOWING;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ }
+ break;
+ case VclEventId::WindowHide:
+ {
+ aOldValue <<= AccessibleStateType::SHOWING;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ }
+ break;
+ default:
+ {
+ AccessibleTabBarBase::ProcessWindowEvent( rVclWindowEvent );
+ }
+ break;
}
+}
+
+void AccessibleTabBar::FillAccessibleStateSet( sal_Int64& rStateSet )
+{
+ if ( !m_pTabBar )
+ return;
- void AccessibleTabBar::FillAccessibleStateSet( sal_Int64& rStateSet )
+ if ( m_pTabBar->IsEnabled() )
{
- if ( !m_pTabBar )
- return;
+ rStateSet |= AccessibleStateType::ENABLED;
+ rStateSet |= AccessibleStateType::SENSITIVE;
+ }
- if ( m_pTabBar->IsEnabled() )
- {
- rStateSet |= AccessibleStateType::ENABLED;
- rStateSet |= AccessibleStateType::SENSITIVE;
- }
+ rStateSet |= AccessibleStateType::FOCUSABLE;
- rStateSet |= AccessibleStateType::FOCUSABLE;
+ if ( m_pTabBar->HasFocus() )
+ rStateSet |= AccessibleStateType::FOCUSED;
- if ( m_pTabBar->HasFocus() )
- rStateSet |= AccessibleStateType::FOCUSED;
+ rStateSet |= AccessibleStateType::VISIBLE;
- rStateSet |= AccessibleStateType::VISIBLE;
+ if ( m_pTabBar->IsVisible() )
+ rStateSet |= AccessibleStateType::SHOWING;
- if ( m_pTabBar->IsVisible() )
- rStateSet |= AccessibleStateType::SHOWING;
+ if ( m_pTabBar->GetStyle() & WB_SIZEABLE )
+ rStateSet |= AccessibleStateType::RESIZABLE;
+}
- if ( m_pTabBar->GetStyle() & WB_SIZEABLE )
- rStateSet |= AccessibleStateType::RESIZABLE;
- }
+// OAccessibleComponentHelper
- // OAccessibleComponentHelper
+awt::Rectangle AccessibleTabBar::implGetBounds()
+{
+ awt::Rectangle aBounds;
+ if ( m_pTabBar )
+ aBounds = vcl::unohelper::ConvertToAWTRect(
+ tools::Rectangle(m_pTabBar->GetPosPixel(),
m_pTabBar->GetSizePixel()));
- awt::Rectangle AccessibleTabBar::implGetBounds()
- {
- awt::Rectangle aBounds;
- if ( m_pTabBar )
- aBounds = vcl::unohelper::ConvertToAWTRect(
- tools::Rectangle(m_pTabBar->GetPosPixel(),
m_pTabBar->GetSizePixel()));
+ return aBounds;
+}
- return aBounds;
- }
+// XComponent
- // XComponent
+void AccessibleTabBar::disposing()
+{
+ AccessibleTabBarBase::disposing();
- void AccessibleTabBar::disposing()
+ // dispose all children
+ for (const Reference<XAccessible>& i : m_aAccessibleChildren)
{
- AccessibleTabBarBase::disposing();
-
- // dispose all children
- for (const Reference<XAccessible>& i : m_aAccessibleChildren)
- {
- Reference< XComponent > xComponent( i, UNO_QUERY );
- if ( xComponent.is() )
- xComponent->dispose();
- }
- m_aAccessibleChildren.clear();
+ Reference< XComponent > xComponent( i, UNO_QUERY );
+ if ( xComponent.is() )
+ xComponent->dispose();
}
+ m_aAccessibleChildren.clear();
+}
- // XServiceInfo
+// XServiceInfo
- OUString AccessibleTabBar::getImplementationName()
- {
- return u"com.sun.star.comp.svtools.AccessibleTabBar"_ustr;
- }
+OUString AccessibleTabBar::getImplementationName()
+{
+ return u"com.sun.star.comp.svtools.AccessibleTabBar"_ustr;
+}
- sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName )
- {
- return cppu::supportsService(this, rServiceName);
- }
+sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName )
+{
+ return cppu::supportsService(this, rServiceName);
+}
- Sequence< OUString > AccessibleTabBar::getSupportedServiceNames()
- {
- return { u"com.sun.star.awt.AccessibleTabBar"_ustr };
- }
+Sequence< OUString > AccessibleTabBar::getSupportedServiceNames()
+{
+ return { u"com.sun.star.awt.AccessibleTabBar"_ustr };
+}
- // XAccessible
+// XAccessible
- Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( )
- {
- OExternalLockGuard aGuard( this );
+Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( )
+{
+ OExternalLockGuard aGuard( this );
- return this;
- }
+ return this;
+}
- // XAccessibleContext
+// XAccessibleContext
- sal_Int64 AccessibleTabBar::getAccessibleChildCount()
- {
- OExternalLockGuard aGuard( this );
+sal_Int64 AccessibleTabBar::getAccessibleChildCount()
+{
+ OExternalLockGuard aGuard( this );
- return m_aAccessibleChildren.size();
- }
+ return m_aAccessibleChildren.size();
+}
- Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int64 i
)
- {
- OExternalLockGuard aGuard( this );
+Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int64 i )
+{
+ OExternalLockGuard aGuard( this );
- if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
- throw IndexOutOfBoundsException();
+ if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
+ throw IndexOutOfBoundsException();
- Reference< XAccessible > xChild = m_aAccessibleChildren[i];
- if ( !xChild.is() )
+ Reference< XAccessible > xChild = m_aAccessibleChildren[i];
+ if ( !xChild.is() )
+ {
+ if ( m_pTabBar )
{
- if ( m_pTabBar )
- {
- sal_Int32 nCount = m_pTabBar->GetAccessibleChildWindowCount();
+ sal_Int32 nCount = m_pTabBar->GetAccessibleChildWindowCount();
- if ( i < nCount )
- {
- vcl::Window* pChild = m_pTabBar->GetAccessibleChildWindow(
static_cast<sal_uInt16>(i) );
- if ( pChild )
- xChild = pChild->GetAccessible();
- }
- else if ( i == nCount )
- {
- xChild = new AccessibleTabBarPageList( m_pTabBar, i );
- }
-
- // insert into child list
- m_aAccessibleChildren[i] = xChild;
+ if ( i < nCount )
+ {
+ vcl::Window* pChild = m_pTabBar->GetAccessibleChildWindow(
static_cast<sal_uInt16>(i) );
+ if ( pChild )
+ xChild = pChild->GetAccessible();
+ }
+ else if ( i == nCount )
+ {
+ xChild = new AccessibleTabBarPageList( m_pTabBar, i );
}
- }
- return xChild;
+ // insert into child list
+ m_aAccessibleChildren[i] = xChild;
+ }
}
+ return xChild;
+}
- Reference< XAccessible > AccessibleTabBar::getAccessibleParent( )
- {
- OExternalLockGuard aGuard( this );
- Reference< XAccessible > xParent;
- if ( m_pTabBar )
- xParent = m_pTabBar->GetAccessibleParent();
+Reference< XAccessible > AccessibleTabBar::getAccessibleParent( )
+{
+ OExternalLockGuard aGuard( this );
- return xParent;
- }
+ Reference< XAccessible > xParent;
+ if ( m_pTabBar )
+ xParent = m_pTabBar->GetAccessibleParent();
+ return xParent;
+}
- sal_Int64 AccessibleTabBar::getAccessibleIndexInParent( )
- {
- OExternalLockGuard aGuard( this );
- sal_Int64 nIndexInParent = -1;
- if ( m_pTabBar )
+sal_Int64 AccessibleTabBar::getAccessibleIndexInParent( )
+{
+ OExternalLockGuard aGuard( this );
+
+ sal_Int64 nIndexInParent = -1;
+ if ( m_pTabBar )
+ {
+ vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow();
+ if ( pParent )
{
- vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow();
- if ( pParent )
+ for ( sal_uInt16 i = 0, nCount =
pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
{
- for ( sal_uInt16 i = 0, nCount =
pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
+ vcl::Window* pChild = pParent->GetAccessibleChildWindow( i );
+ if ( pChild == static_cast< vcl::Window* >( m_pTabBar ) )
{
- vcl::Window* pChild = pParent->GetAccessibleChildWindow( i
);
- if ( pChild == static_cast< vcl::Window* >( m_pTabBar ) )
- {
- nIndexInParent = i;
- break;
- }
+ nIndexInParent = i;
+ break;
}
}
}
-
- return nIndexInParent;
}
+ return nIndexInParent;
+}
- sal_Int16 AccessibleTabBar::getAccessibleRole( )
- {
- OExternalLockGuard aGuard( this );
- return AccessibleRole::PANEL;
- }
+sal_Int16 AccessibleTabBar::getAccessibleRole( )
+{
+ OExternalLockGuard aGuard( this );
- OUString AccessibleTabBar::getAccessibleDescription( )
- {
- OExternalLockGuard aGuard( this );
+ return AccessibleRole::PANEL;
+}
- if (m_pTabBar)
- return m_pTabBar->GetAccessibleDescription();
+OUString AccessibleTabBar::getAccessibleDescription( )
+{
+ OExternalLockGuard aGuard( this );
- return OUString();
- }
+ if (m_pTabBar)
+ return m_pTabBar->GetAccessibleDescription();
- OUString AccessibleTabBar::getAccessibleName( )
- {
- OExternalLockGuard aGuard( this );
+ return OUString();
+}
- if (m_pTabBar)
- return m_pTabBar->GetAccessibleName();
+OUString AccessibleTabBar::getAccessibleName( )
+{
+ OExternalLockGuard aGuard( this );
- return OUString();
- }
+ if (m_pTabBar)
+ return m_pTabBar->GetAccessibleName();
- Reference< XAccessibleRelationSet >
AccessibleTabBar::getAccessibleRelationSet( )
- {
- OExternalLockGuard aGuard( this );
+ return OUString();
+}
- return new utl::AccessibleRelationSetHelper;
- }
+Reference< XAccessibleRelationSet >
AccessibleTabBar::getAccessibleRelationSet( )
+{
+ OExternalLockGuard aGuard( this );
- sal_Int64 AccessibleTabBar::getAccessibleStateSet( )
- {
- OExternalLockGuard aGuard( this );
+ return new utl::AccessibleRelationSetHelper;
+}
- sal_Int64 nStateSet = 0;
+sal_Int64 AccessibleTabBar::getAccessibleStateSet( )
+{
+ OExternalLockGuard aGuard( this );
- if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
- {
- FillAccessibleStateSet( nStateSet );
- }
- else
- {
- nStateSet |= AccessibleStateType::DEFUNC;
- }
+ sal_Int64 nStateSet = 0;
- return nStateSet;
+ if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+ {
+ FillAccessibleStateSet( nStateSet );
+ }
+ else
+ {
+ nStateSet |= AccessibleStateType::DEFUNC;
}
+ return nStateSet;
+}
- Locale AccessibleTabBar::getLocale( )
- {
- OExternalLockGuard aGuard( this );
- return Application::GetSettings().GetLanguageTag().getLocale();
- }
+Locale AccessibleTabBar::getLocale( )
+{
+ OExternalLockGuard aGuard( this );
- // XAccessibleComponent
- Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const
awt::Point& rPoint )
- {
- OExternalLockGuard aGuard( this );
+ return Application::GetSettings().GetLanguageTag().getLocale();
+}
+
+// XAccessibleComponent
+Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const
awt::Point& rPoint )
+{
+ OExternalLockGuard aGuard( this );
- for( sal_Int64 i = 0; i < getAccessibleChildCount(); ++i )
+ for( sal_Int64 i = 0; i < getAccessibleChildCount(); ++i )
+ {
+ Reference< XAccessible > xAcc = getAccessibleChild( i );
+ if ( xAcc.is() )
{
- Reference< XAccessible > xAcc = getAccessibleChild( i );
- if ( xAcc.is() )
+ Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
+ if ( xComp.is() )
{
- Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
- if ( xComp.is() )
+ tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
+ Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
+ if ( aRect.Contains( aPos ) )
{
- tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
- Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
- if ( aRect.Contains( aPos ) )
- {
- return xAcc;
- }
+ return xAcc;
}
}
}
-
- return nullptr;
}
- void AccessibleTabBar::grabFocus( )
- {
- OExternalLockGuard aGuard( this );
+ return nullptr;
+}
- if ( m_pTabBar )
- m_pTabBar->GrabFocus();
- }
+void AccessibleTabBar::grabFocus( )
+{
+ OExternalLockGuard aGuard( this );
+ if ( m_pTabBar )
+ m_pTabBar->GrabFocus();
+}
- sal_Int32 AccessibleTabBar::getForeground( )
- {
- OExternalLockGuard aGuard( this );
- Color nColor;
- if ( m_pTabBar )
+sal_Int32 AccessibleTabBar::getForeground( )
+{
+ OExternalLockGuard aGuard( this );
+
+ Color nColor;
+ if ( m_pTabBar )
+ {
+ if ( m_pTabBar->IsControlForeground() )
+ nColor = m_pTabBar->GetControlForeground();
+ else
{
- if ( m_pTabBar->IsControlForeground() )
- nColor = m_pTabBar->GetControlForeground();
+ vcl::Font aFont;
+ if ( m_pTabBar->IsControlFont() )
+ aFont = m_pTabBar->GetControlFont();
else
- {
- vcl::Font aFont;
- if ( m_pTabBar->IsControlFont() )
- aFont = m_pTabBar->GetControlFont();
- else
- aFont = m_pTabBar->GetFont();
- nColor = aFont.GetColor();
- }
+ aFont = m_pTabBar->GetFont();
+ nColor = aFont.GetColor();
}
-
- return sal_Int32(nColor);
}
+ return sal_Int32(nColor);
+}
- sal_Int32 AccessibleTabBar::getBackground( )
- {
- OExternalLockGuard aGuard( this );
- Color nColor;
- if ( m_pTabBar )
- {
- if ( m_pTabBar->IsControlBackground() )
- nColor = m_pTabBar->GetControlBackground();
- else
- nColor = m_pTabBar->GetBackground().GetColor();
- }
+sal_Int32 AccessibleTabBar::getBackground( )
+{
+ OExternalLockGuard aGuard( this );
- return sal_Int32(nColor);
+ Color nColor;
+ if ( m_pTabBar )
+ {
+ if ( m_pTabBar->IsControlBackground() )
+ nColor = m_pTabBar->GetControlBackground();
+ else
+ nColor = m_pTabBar->GetBackground().GetColor();
}
+ return sal_Int32(nColor);
+}
- // XAccessibleExtendedComponent
- OUString AccessibleTabBar::getTitledBorderText( )
- {
- OExternalLockGuard aGuard( this );
+// XAccessibleExtendedComponent
- OUString sText;
- if ( m_pTabBar )
- sText = m_pTabBar->GetText();
+OUString AccessibleTabBar::getTitledBorderText( )
+{
+ OExternalLockGuard aGuard( this );
- return sText;
- }
+ OUString sText;
+ if ( m_pTabBar )
+ sText = m_pTabBar->GetText();
+ return sText;
+}
- OUString AccessibleTabBar::getToolTipText( )
- {
- OExternalLockGuard aGuard( this );
- OUString sText;
- if ( m_pTabBar )
- sText = m_pTabBar->GetQuickHelpText();
+OUString AccessibleTabBar::getToolTipText( )
+{
+ OExternalLockGuard aGuard( this );
- return sText;
- }
+ OUString sText;
+ if ( m_pTabBar )
+ sText = m_pTabBar->GetQuickHelpText();
+
+ return sText;
+}
} // namespace accessibility
diff --git a/svtools/source/control/accessibletabbar.hxx
b/svtools/source/control/accessibletabbar.hxx
index 3d6844f9f711..fa723f6fe5e2 100644
--- a/svtools/source/control/accessibletabbar.hxx
+++ b/svtools/source/control/accessibletabbar.hxx
@@ -30,58 +30,55 @@
namespace accessibility
{
-
-
-
- class AccessibleTabBar final : public cppu::ImplInheritanceHelper<
- AccessibleTabBarBase,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo>
- {
- std::vector<css::uno::Reference<css::accessibility::XAccessible>>
m_aAccessibleChildren;
-
- virtual void ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent ) override;
- void FillAccessibleStateSet( sal_Int64& rStateSet );
-
- // OAccessibleComponentHelper
- virtual css::awt::Rectangle implGetBounds( ) override;
-
- // XComponent
- virtual void SAL_CALL disposing() override;
-
- public:
- AccessibleTabBar( TabBar* pTabBar );
-
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const OUString&
rServiceName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
- // XAccessibleContext
- virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleParent( ) override;
- virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) override;
- virtual OUString SAL_CALL getAccessibleName( ) override;
- virtual css::uno::Reference<
css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(
) override;
- virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- virtual css::lang::Locale SAL_CALL getLocale( ) override;
-
- // XAccessibleComponent
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
- virtual void SAL_CALL grabFocus( ) override;
- virtual sal_Int32 SAL_CALL getForeground( ) override;
- virtual sal_Int32 SAL_CALL getBackground( ) override;
-
- // XAccessibleExtendedComponent
- virtual OUString SAL_CALL getTitledBorderText( ) override;
- virtual OUString SAL_CALL getToolTipText( ) override;
- };
+class AccessibleTabBar final : public cppu::ImplInheritanceHelper<
+ AccessibleTabBarBase,
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo>
+{
+ std::vector<css::uno::Reference<css::accessibility::XAccessible>>
m_aAccessibleChildren;
+
+ virtual void ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent ) override;
+ void FillAccessibleStateSet( sal_Int64& rStateSet );
+
+ // OAccessibleComponentHelper
+ virtual css::awt::Rectangle implGetBounds( ) override;
+
+ // XComponent
+ virtual void SAL_CALL disposing() override;
+
+public:
+ AccessibleTabBar( TabBar* pTabBar );
+
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
+
+ // XAccessible
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
+
+ // XAccessibleContext
+ virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleParent( ) override;
+ virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) override;
+ virtual OUString SAL_CALL getAccessibleName( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet( ) override;
+ virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) override;
+
+ // XAccessibleComponent
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+ virtual void SAL_CALL grabFocus( ) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) override;
+
+ // XAccessibleExtendedComponent
+ virtual OUString SAL_CALL getTitledBorderText( ) override;
+ virtual OUString SAL_CALL getToolTipText( ) override;
+};
} // namespace accessibility
diff --git a/svtools/source/control/accessibletabbarpage.cxx
b/svtools/source/control/accessibletabbarpage.cxx
index 36304a0d0292..1d17a86b2b36 100644
--- a/svtools/source/control/accessibletabbarpage.cxx
+++ b/svtools/source/control/accessibletabbarpage.cxx
@@ -36,349 +36,345 @@
namespace accessibility
{
-
- using namespace ::com::sun::star::accessibility;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star;
- using namespace ::comphelper;
-
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16
nPageId, const Reference< XAccessible >& rxParent )
+ :ImplInheritanceHelper( pTabBar )
+ ,m_nPageId( nPageId )
+ ,m_xParent( rxParent )
+{
+ m_bShowing = IsShowing();
+ m_bSelected = IsSelected();
- AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16
nPageId, const Reference< XAccessible >& rxParent )
- :ImplInheritanceHelper( pTabBar )
- ,m_nPageId( nPageId )
- ,m_xParent( rxParent )
- {
- m_bShowing = IsShowing();
- m_bSelected = IsSelected();
+ if ( m_pTabBar )
+ m_sPageText = m_pTabBar->GetPageText( m_nPageId );
+}
- if ( m_pTabBar )
- m_sPageText = m_pTabBar->GetPageText( m_nPageId );
- }
+bool AccessibleTabBarPage::IsEnabled()
+{
+ OExternalLockGuard aGuard( this );
- bool AccessibleTabBarPage::IsEnabled()
- {
- OExternalLockGuard aGuard( this );
+ bool bEnabled = false;
+ if ( m_pTabBar )
+ bEnabled = m_pTabBar->IsPageEnabled( m_nPageId );
- bool bEnabled = false;
- if ( m_pTabBar )
- bEnabled = m_pTabBar->IsPageEnabled( m_nPageId );
+ return bEnabled;
+}
- return bEnabled;
- }
+bool AccessibleTabBarPage::IsShowing() const
+{
+ bool bShowing = false;
- bool AccessibleTabBarPage::IsShowing() const
- {
- bool bShowing = false;
-
- if ( m_pTabBar && m_pTabBar->IsVisible() )
- bShowing = true;
+ if ( m_pTabBar && m_pTabBar->IsVisible() )
+ bShowing = true;
- return bShowing;
- }
+ return bShowing;
+}
- bool AccessibleTabBarPage::IsSelected() const
- {
- bool bSelected = false;
+bool AccessibleTabBarPage::IsSelected() const
+{
+ bool bSelected = false;
- if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_nPageId )
- bSelected = true;
+ if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_nPageId )
+ bSelected = true;
- return bSelected;
- }
+ return bSelected;
+}
- void AccessibleTabBarPage::SetShowing( bool bShowing )
+void AccessibleTabBarPage::SetShowing( bool bShowing )
+{
+ if ( m_bShowing != bShowing )
{
- if ( m_bShowing != bShowing )
- {
- Any aOldValue, aNewValue;
- if ( m_bShowing )
- aOldValue <<= AccessibleStateType::SHOWING;
- else
- aNewValue <<= AccessibleStateType::SHOWING;
- m_bShowing = bShowing;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
+ Any aOldValue, aNewValue;
+ if ( m_bShowing )
+ aOldValue <<= AccessibleStateType::SHOWING;
+ else
+ aNewValue <<= AccessibleStateType::SHOWING;
+ m_bShowing = bShowing;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue );
}
+}
- void AccessibleTabBarPage::SetSelected( bool bSelected )
+void AccessibleTabBarPage::SetSelected( bool bSelected )
+{
+ if ( m_bSelected != bSelected )
{
- if ( m_bSelected != bSelected )
- {
- Any aOldValue, aNewValue;
- if ( m_bSelected )
- aOldValue <<= AccessibleStateType::SELECTED;
- else
- aNewValue <<= AccessibleStateType::SELECTED;
- m_bSelected = bSelected;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- }
+ Any aOldValue, aNewValue;
+ if ( m_bSelected )
+ aOldValue <<= AccessibleStateType::SELECTED;
+ else
+ aNewValue <<= AccessibleStateType::SELECTED;
+ m_bSelected = bSelected;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue );
}
+}
- void AccessibleTabBarPage::SetPageText( const OUString& sPageText )
+void AccessibleTabBarPage::SetPageText( const OUString& sPageText )
+{
+ if ( m_sPageText != sPageText )
{
- if ( m_sPageText != sPageText )
- {
- Any aOldValue, aNewValue;
- aOldValue <<= m_sPageText;
- aNewValue <<= sPageText;
- m_sPageText = sPageText;
- NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue,
aNewValue );
- }
+ Any aOldValue, aNewValue;
+ aOldValue <<= m_sPageText;
+ aNewValue <<= sPageText;
+ m_sPageText = sPageText;
+ NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue,
aNewValue );
}
+}
- void AccessibleTabBarPage::FillAccessibleStateSet( sal_Int64& rStateSet )
+void AccessibleTabBarPage::FillAccessibleStateSet( sal_Int64& rStateSet )
+{
+ if ( IsEnabled() )
{
- if ( IsEnabled() )
- {
- rStateSet |= AccessibleStateType::ENABLED;
- rStateSet |= AccessibleStateType::SENSITIVE;
- }
+ rStateSet |= AccessibleStateType::ENABLED;
+ rStateSet |= AccessibleStateType::SENSITIVE;
+ }
- rStateSet |= AccessibleStateType::VISIBLE;
+ rStateSet |= AccessibleStateType::VISIBLE;
- if ( IsShowing() )
- rStateSet |= AccessibleStateType::SHOWING;
+ if ( IsShowing() )
+ rStateSet |= AccessibleStateType::SHOWING;
- rStateSet |= AccessibleStateType::SELECTABLE;
+ rStateSet |= AccessibleStateType::SELECTABLE;
- if ( IsSelected() )
- rStateSet |= AccessibleStateType::SELECTED;
- }
+ if ( IsSelected() )
+ rStateSet |= AccessibleStateType::SELECTED;
+}
- // OAccessibleComponentHelper
+// OAccessibleComponentHelper
- awt::Rectangle AccessibleTabBarPage::implGetBounds()
+awt::Rectangle AccessibleTabBarPage::implGetBounds()
+{
+ awt::Rectangle aBounds;
+ if ( m_pTabBar )
{
- awt::Rectangle aBounds;
- if ( m_pTabBar )
- {
- // get bounding rectangle relative to the AccessibleTabBar
- aBounds =
vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageRect(m_nPageId));
+ // get bounding rectangle relative to the AccessibleTabBar
+ aBounds =
vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageRect(m_nPageId));
- // get position of the AccessibleTabBarPageList relative to the
AccessibleTabBar
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
+ // get position of the AccessibleTabBarPageList relative to the
AccessibleTabBar
+ Reference< XAccessible > xParent = getAccessibleParent();
+ if ( xParent.is() )
+ {
+ Reference< XAccessibleComponent > xParentComponent(
xParent->getAccessibleContext(), UNO_QUERY );
+ if ( xParentComponent.is() )
{
- Reference< XAccessibleComponent > xParentComponent(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComponent.is() )
- {
- awt::Point aParentLoc = xParentComponent->getLocation();
-
- // calculate bounding rectangle relative to the
AccessibleTabBarPageList
- aBounds.X -= aParentLoc.X;
- aBounds.Y -= aParentLoc.Y;
- }
+ awt::Point aParentLoc = xParentComponent->getLocation();
+
+ // calculate bounding rectangle relative to the
AccessibleTabBarPageList
+ aBounds.X -= aParentLoc.X;
+ aBounds.Y -= aParentLoc.Y;
}
}
-
- return aBounds;
}
+ return aBounds;
+}
- // XComponent
+// XComponent
- void AccessibleTabBarPage::disposing()
- {
- AccessibleTabBarBase::disposing();
- m_sPageText.clear();
- }
+void AccessibleTabBarPage::disposing()
+{
+ AccessibleTabBarBase::disposing();
+ m_sPageText.clear();
+}
- // XServiceInfo
+// XServiceInfo
- OUString AccessibleTabBarPage::getImplementationName()
- {
- return u"com.sun.star.comp.svtools.AccessibleTabBarPage"_ustr;
- }
+OUString AccessibleTabBarPage::getImplementationName()
+{
+ return u"com.sun.star.comp.svtools.AccessibleTabBarPage"_ustr;
+}
- sal_Bool AccessibleTabBarPage::supportsService( const OUString&
rServiceName )
- {
- return cppu::supportsService(this, rServiceName);
- }
+sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName )
+{
+ return cppu::supportsService(this, rServiceName);
+}
- Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames()
- {
- return { u"com.sun.star.awt.AccessibleTabBarPage"_ustr };
- }
+Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames()
+{
+ return { u"com.sun.star.awt.AccessibleTabBarPage"_ustr };
+}
- // XAccessible
+// XAccessible
- Reference< XAccessibleContext >
AccessibleTabBarPage::getAccessibleContext( )
- {
- OExternalLockGuard aGuard( this );
- return this;
- }
+Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext( )
+{
+ OExternalLockGuard aGuard( this );
+ return this;
+}
- // XAccessibleContext
+// XAccessibleContext
- sal_Int64 AccessibleTabBarPage::getAccessibleChildCount()
- {
- return 0;
- }
+sal_Int64 AccessibleTabBarPage::getAccessibleChildCount()
+{
+ return 0;
+}
- Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild(
sal_Int64 )
- {
- OExternalLockGuard aGuard( this );
- throw IndexOutOfBoundsException();
- }
+Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int64 )
+{
+ OExternalLockGuard aGuard( this );
+ throw IndexOutOfBoundsException();
+}
- Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( )
- {
- OExternalLockGuard aGuard( this );
- return m_xParent;
- }
+Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( )
+{
+ OExternalLockGuard aGuard( this );
+ return m_xParent;
+}
- sal_Int64 AccessibleTabBarPage::getAccessibleIndexInParent( )
- {
- OExternalLockGuard aGuard( this );
- sal_Int64 nIndexInParent = -1;
- if ( m_pTabBar )
- nIndexInParent = m_pTabBar->GetPagePos( m_nPageId );
+sal_Int64 AccessibleTabBarPage::getAccessibleIndexInParent( )
+{
+ OExternalLockGuard aGuard( this );
- return nIndexInParent;
- }
+ sal_Int64 nIndexInParent = -1;
+ if ( m_pTabBar )
+ nIndexInParent = m_pTabBar->GetPagePos( m_nPageId );
- sal_Int16 AccessibleTabBarPage::getAccessibleRole( )
- {
- return AccessibleRole::PAGE_TAB;
- }
+ return nIndexInParent;
+}
- OUString AccessibleTabBarPage::getAccessibleDescription( )
- {
- OExternalLockGuard aGuard( this );
+sal_Int16 AccessibleTabBarPage::getAccessibleRole( )
+{
+ return AccessibleRole::PAGE_TAB;
+}
- if (m_pTabBar)
- return m_pTabBar->GetHelpText(m_nPageId);
+OUString AccessibleTabBarPage::getAccessibleDescription( )
+{
+ OExternalLockGuard aGuard( this );
- return OUString();
- }
+ if (m_pTabBar)
+ return m_pTabBar->GetHelpText(m_nPageId);
- OUString AccessibleTabBarPage::getAccessibleName( )
- {
- OExternalLockGuard aGuard( this );
+ return OUString();
+}
- return m_sPageText;
- }
+OUString AccessibleTabBarPage::getAccessibleName( )
+{
+ OExternalLockGuard aGuard( this );
- Reference< XAccessibleRelationSet >
AccessibleTabBarPage::getAccessibleRelationSet( )
- {
- OExternalLockGuard aGuard( this );
+ return m_sPageText;
+}
- return new utl::AccessibleRelationSetHelper;
- }
+Reference< XAccessibleRelationSet >
AccessibleTabBarPage::getAccessibleRelationSet( )
+{
+ OExternalLockGuard aGuard( this );
- sal_Int64 AccessibleTabBarPage::getAccessibleStateSet( )
- {
- OExternalLockGuard aGuard( this );
+ return new utl::AccessibleRelationSetHelper;
+}
- sal_Int64 nStateSet = 0;
+sal_Int64 AccessibleTabBarPage::getAccessibleStateSet( )
+{
+ OExternalLockGuard aGuard( this );
- if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
- {
- FillAccessibleStateSet( nStateSet );
- }
- else
- {
- nStateSet |= AccessibleStateType::DEFUNC;
- }
+ sal_Int64 nStateSet = 0;
- return nStateSet;
+ if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+ {
+ FillAccessibleStateSet( nStateSet );
+ }
+ else
+ {
+ nStateSet |= AccessibleStateType::DEFUNC;
}
+ return nStateSet;
+}
- Locale AccessibleTabBarPage::getLocale( )
- {
- OExternalLockGuard aGuard( this );
- return Application::GetSettings().GetLanguageTag().getLocale();
- }
+Locale AccessibleTabBarPage::getLocale( )
+{
+ OExternalLockGuard aGuard( this );
+ return Application::GetSettings().GetLanguageTag().getLocale();
+}
- // XAccessibleComponent
+// XAccessibleComponent
- Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const
awt::Point& )
- {
- return Reference< XAccessible >();
- }
+Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const
awt::Point& )
+{
+ return Reference< XAccessible >();
+}
- void AccessibleTabBarPage::grabFocus( )
- {
- // no focus
- }
+void AccessibleTabBarPage::grabFocus( )
+{
+ // no focus
+}
- sal_Int32 AccessibleTabBarPage::getForeground( )
- {
- OExternalLockGuard aGuard( this );
- sal_Int32 nColor = 0;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- nColor = xParentComp->getForeground();
- }
+sal_Int32 AccessibleTabBarPage::getForeground( )
+{
+ OExternalLockGuard aGuard( this );
- return nColor;
+ sal_Int32 nColor = 0;
+ Reference< XAccessible > xParent = getAccessibleParent();
+ if ( xParent.is() )
+ {
+ Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
+ if ( xParentComp.is() )
+ nColor = xParentComp->getForeground();
}
+ return nColor;
+}
- sal_Int32 AccessibleTabBarPage::getBackground( )
- {
- OExternalLockGuard aGuard( this );
- sal_Int32 nColor = 0;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- nColor = xParentComp->getBackground();
- }
+sal_Int32 AccessibleTabBarPage::getBackground( )
+{
+ OExternalLockGuard aGuard( this );
- return nColor;
+ sal_Int32 nColor = 0;
+ Reference< XAccessible > xParent = getAccessibleParent();
+ if ( xParent.is() )
+ {
+ Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
+ if ( xParentComp.is() )
+ nColor = xParentComp->getBackground();
}
+ return nColor;
+}
- // XAccessibleExtendedComponent
- OUString AccessibleTabBarPage::getTitledBorderText( )
- {
- OExternalLockGuard aGuard( this );
+// XAccessibleExtendedComponent
- return m_sPageText;
- }
+OUString AccessibleTabBarPage::getTitledBorderText( )
+{
+ OExternalLockGuard aGuard( this );
+ return m_sPageText;
+}
} // namespace accessibility
diff --git a/svtools/source/control/accessibletabbarpage.hxx
b/svtools/source/control/accessibletabbarpage.hxx
index cf0202797c27..f9d9bfa3d7c0 100644
--- a/svtools/source/control/accessibletabbarpage.hxx
+++ b/svtools/source/control/accessibletabbarpage.hxx
@@ -28,74 +28,70 @@
namespace accessibility
{
-
-
-
- class AccessibleTabBarPage final : public cppu::ImplInheritanceHelper<
- AccessibleTabBarBase,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo>
- {
- friend class AccessibleTabBarPageList;
-
- private:
- sal_uInt16 m_nPageId;
- bool m_bShowing;
- bool m_bSelected;
- OUString m_sPageText;
-
- css::uno::Reference< css::accessibility::XAccessible >
m_xParent;
-
- bool IsEnabled();
- bool IsShowing() const;
- bool IsSelected() const;
-
- void SetShowing( bool bShowing );
- void SetSelected( bool bSelected );
- void SetPageText( const OUString& sPageText );
-
- void FillAccessibleStateSet( sal_Int64& rStateSet );
-
- // OAccessibleComponentHelper
- virtual css::awt::Rectangle implGetBounds( ) override;
-
- // XComponent
- virtual void SAL_CALL disposing() override;
-
- public:
- AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
- const css::uno::Reference<
css::accessibility::XAccessible >& rxParent );
-
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const OUString&
rServiceName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
- // XAccessibleContext
- virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleParent( ) override;
- virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) override;
- virtual OUString SAL_CALL getAccessibleName( ) override;
- virtual css::uno::Reference<
css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(
) override;
- virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- virtual css::lang::Locale SAL_CALL getLocale( ) override;
-
- // XAccessibleComponent
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
- virtual void SAL_CALL grabFocus( ) override;
- virtual sal_Int32 SAL_CALL getForeground( ) override;
- virtual sal_Int32 SAL_CALL getBackground( ) override;
-
- // XAccessibleExtendedComponent
- virtual OUString SAL_CALL getTitledBorderText( ) override;
- };
-
+class AccessibleTabBarPage final : public cppu::ImplInheritanceHelper<
+ AccessibleTabBarBase,
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo>
+{
+ friend class AccessibleTabBarPageList;
+
+private:
+ sal_uInt16 m_nPageId;
+ bool m_bShowing;
+ bool m_bSelected;
+ OUString m_sPageText;
+
+ css::uno::Reference< css::accessibility::XAccessible > m_xParent;
+
+ bool IsEnabled();
+ bool IsShowing() const;
+ bool IsSelected() const;
+
+ void SetShowing( bool bShowing );
+ void SetSelected( bool bSelected );
+ void SetPageText( const OUString& sPageText );
+
+ void FillAccessibleStateSet( sal_Int64& rStateSet );
+
+ // OAccessibleComponentHelper
+ virtual css::awt::Rectangle implGetBounds( ) override;
+
+ // XComponent
+ virtual void SAL_CALL disposing() override;
+
+public:
+ AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
+ const css::uno::Reference<
css::accessibility::XAccessible >& rxParent );
+
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
+
+ // XAccessible
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
+
+ // XAccessibleContext
+ virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleParent( ) override;
+ virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) override;
+ virtual OUString SAL_CALL getAccessibleName( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet( ) override;
+ virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) override;
+
+ // XAccessibleComponent
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+ virtual void SAL_CALL grabFocus( ) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) override;
+
+ // XAccessibleExtendedComponent
+ virtual OUString SAL_CALL getTitledBorderText( ) override;
+};
} // namespace accessibility
diff --git a/svtools/source/control/accessibletabbarpagelist.cxx
b/svtools/source/control/accessibletabbarpagelist.cxx
index b70a77dc8a9c..77430b89b16e 100644
--- a/svtools/source/control/accessibletabbarpagelist.cxx
+++ b/svtools/source/control/accessibletabbarpagelist.cxx
@@ -37,595 +37,592 @@
namespace accessibility
{
-
- using namespace ::com::sun::star::accessibility;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star;
- using namespace ::comphelper;
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32
nIndexInParent )
+ :ImplInheritanceHelper( pTabBar )
+ ,m_nIndexInParent( nIndexInParent )
+{
+ if ( m_pTabBar )
+ m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(),
rtl::Reference< AccessibleTabBarPage >() );
+}
- AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar,
sal_Int32 nIndexInParent )
- :ImplInheritanceHelper( pTabBar )
- ,m_nIndexInParent( nIndexInParent )
+void AccessibleTabBarPageList::UpdateShowing( bool bShowing )
+{
+ for (const rtl::Reference<AccessibleTabBarPage>& xChild :
m_aAccessibleChildren)
{
- if ( m_pTabBar )
- m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(),
rtl::Reference< AccessibleTabBarPage >() );
+ if ( xChild.is() )
+ xChild->SetShowing( bShowing );
}
+}
- void AccessibleTabBarPageList::UpdateShowing( bool bShowing )
- {
- for (const rtl::Reference<AccessibleTabBarPage>& xChild :
m_aAccessibleChildren)
- {
- if ( xChild.is() )
- xChild->SetShowing( bShowing );
- }
- }
-
+void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, bool bSelected )
+{
+ NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any()
);
- void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, bool bSelected
)
+ if ( i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() )
{
- NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(),
Any() );
-
- if ( i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() )
- {
- rtl::Reference< AccessibleTabBarPage > xChild(
m_aAccessibleChildren[i] );
- if ( xChild.is() )
- xChild->SetSelected( bSelected );
- }
+ rtl::Reference< AccessibleTabBarPage > xChild(
m_aAccessibleChildren[i] );
+ if ( xChild.is() )
+ xChild->SetSelected( bSelected );
}
+}
- void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i )
- {
- if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
- return;
+void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i )
+{
+ if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
+ return;
- if ( m_pTabBar )
+ if ( m_pTabBar )
+ {
+ rtl::Reference< AccessibleTabBarPage > pAccessibleTabBarPage(
m_aAccessibleChildren[i] );
+ if ( pAccessibleTabBarPage.is() )
{
- rtl::Reference< AccessibleTabBarPage > pAccessibleTabBarPage(
m_aAccessibleChildren[i] );
- if ( pAccessibleTabBarPage.is() )
- {
- OUString sPageText = m_pTabBar->GetPageText(
m_pTabBar->GetPageId( static_cast<sal_uInt16>(i) ) );
- pAccessibleTabBarPage->SetPageText( sPageText );
- }
+ OUString sPageText = m_pTabBar->GetPageText( m_pTabBar->GetPageId(
static_cast<sal_uInt16>(i) ) );
+ pAccessibleTabBarPage->SetPageText( sPageText );
}
}
+}
- void AccessibleTabBarPageList::InsertChild( sal_Int32 i )
- {
- if ( i < 0 || o3tl::make_unsigned(i) > m_aAccessibleChildren.size() )
- return;
+void AccessibleTabBarPageList::InsertChild( sal_Int32 i )
+{
+ if ( i < 0 || o3tl::make_unsigned(i) > m_aAccessibleChildren.size() )
+ return;
- // insert entry in child list
- m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + i,
rtl::Reference< AccessibleTabBarPage >() );
+ // insert entry in child list
+ m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + i,
rtl::Reference< AccessibleTabBarPage >() );
- // send accessible child event
- Reference< XAccessible > xChild( getAccessibleChild( i ) );
- if ( xChild.is() )
- {
- Any aOldValue, aNewValue;
- aNewValue <<= xChild;
- NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue,
aNewValue );
- }
+ // send accessible child event
+ Reference< XAccessible > xChild( getAccessibleChild( i ) );
+ if ( xChild.is() )
+ {
+ Any aOldValue, aNewValue;
+ aNewValue <<= xChild;
+ NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue
);
}
+}
- void AccessibleTabBarPageList::RemoveChild( sal_Int32 i )
- {
- if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
- return;
+void AccessibleTabBarPageList::RemoveChild( sal_Int32 i )
+{
+ if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
+ return;
- // get the accessible of the removed page
- rtl::Reference< AccessibleTabBarPage > xChild(
m_aAccessibleChildren[i] );
+ // get the accessible of the removed page
+ rtl::Reference< AccessibleTabBarPage > xChild( m_aAccessibleChildren[i] );
- // remove entry in child list
- m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
+ // remove entry in child list
+ m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
- // send accessible child event
- if ( xChild.is() )
- {
- Any aOldValue, aNewValue;
- aOldValue <<= uno::Reference<XAccessible>(xChild);
- NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue,
aNewValue );
+ // send accessible child event
+ if ( xChild.is() )
+ {
+ Any aOldValue, aNewValue;
+ aOldValue <<= uno::Reference<XAccessible>(xChild);
+ NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue
);
- xChild->dispose();
- }
+ xChild->dispose();
}
+}
- void AccessibleTabBarPageList::MoveChild( sal_Int32 i, sal_Int32 j )
- {
- if ( !(i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size()
&&
- j >= 0 && o3tl::make_unsigned(j) <= m_aAccessibleChildren.size())
)
- return;
+void AccessibleTabBarPageList::MoveChild( sal_Int32 i, sal_Int32 j )
+{
+ if ( !(i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() &&
+ j >= 0 && o3tl::make_unsigned(j) <= m_aAccessibleChildren.size()) )
+ return;
- if ( i < j )
- --j;
+ if ( i < j )
+ --j;
- // get the accessible of the moved page
- rtl::Reference< AccessibleTabBarPage > xChild(
m_aAccessibleChildren[i] );
+ // get the accessible of the moved page
+ rtl::Reference< AccessibleTabBarPage > xChild( m_aAccessibleChildren[i] );
- // remove entry in child list at old position
- m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
+ // remove entry in child list at old position
+ m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
- // insert entry in child list at new position
- m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + j,
xChild );
- }
+ // insert entry in child list at new position
+ m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + j, xChild );
+}
- void AccessibleTabBarPageList::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
- {
- switch ( rVclWindowEvent.GetId() )
- {
- case VclEventId::WindowEnabled:
- {
- Any aNewValue;
- aNewValue <<= AccessibleStateType::SENSITIVE;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
Any(), aNewValue );
- aNewValue <<= AccessibleStateType::ENABLED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
Any(), aNewValue );
- }
- break;
- case VclEventId::WindowDisabled:
- {
- Any aOldValue;
- aOldValue <<= AccessibleStateType::ENABLED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, Any() );
- aOldValue <<= AccessibleStateType::SENSITIVE;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, Any() );
- }
- break;
- case VclEventId::WindowShow:
- {
- Any aOldValue, aNewValue;
- aNewValue <<= AccessibleStateType::SHOWING;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- UpdateShowing( true );
- }
- break;
- case VclEventId::WindowHide:
- {
- Any aOldValue, aNewValue;
- aOldValue <<= AccessibleStateType::SHOWING;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
- UpdateShowing( false );
- }
- break;
- case VclEventId::TabbarPageSelected:
+void AccessibleTabBarPageList::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
+{
+ switch ( rVclWindowEvent.GetId() )
+ {
+ case VclEventId::WindowEnabled:
+ {
+ Any aNewValue;
+ aNewValue <<= AccessibleStateType::SENSITIVE;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(),
aNewValue );
+ aNewValue <<= AccessibleStateType::ENABLED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(),
aNewValue );
+ }
+ break;
+ case VclEventId::WindowDisabled:
+ {
+ Any aOldValue;
+ aOldValue <<= AccessibleStateType::ENABLED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, Any() );
+ aOldValue <<= AccessibleStateType::SENSITIVE;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, Any() );
+ }
+ break;
+ case VclEventId::WindowShow:
+ {
+ Any aOldValue, aNewValue;
+ aNewValue <<= AccessibleStateType::SHOWING;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ UpdateShowing( true );
+ }
+ break;
+ case VclEventId::WindowHide:
+ {
+ Any aOldValue, aNewValue;
+ aOldValue <<= AccessibleStateType::SHOWING;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue );
+ UpdateShowing( false );
+ }
+ break;
+ case VclEventId::TabbarPageSelected:
+ {
+ // do nothing
+ }
+ break;
+ case VclEventId::TabbarPageActivated:
+ {
+ if ( m_pTabBar )
{
- // do nothing
+ sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
+ sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+ UpdateSelected( nPagePos, true );
}
- break;
- case VclEventId::TabbarPageActivated:
+ }
+ break;
+ case VclEventId::TabbarPageDeactivated:
+ {
+ if ( m_pTabBar )
{
- if ( m_pTabBar )
- {
- sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
- sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
- UpdateSelected( nPagePos, true );
- }
+ sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
+ sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+ UpdateSelected( nPagePos, false );
}
- break;
- case VclEventId::TabbarPageDeactivated:
+ }
+ break;
+ case VclEventId::TabbarPageInserted:
+ {
+ if ( m_pTabBar )
{
- if ( m_pTabBar )
- {
- sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
- sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
- UpdateSelected( nPagePos, false );
- }
+ sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
+ sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+ InsertChild( nPagePos );
}
- break;
- case VclEventId::TabbarPageInserted:
+ }
+ break;
+ case VclEventId::TabbarPageRemoved:
+ {
+ if ( m_pTabBar )
{
- if ( m_pTabBar )
+ sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
+
+ OExternalLockGuard aGuard( this );
+
+ if ( nPageId == TabBar::PAGE_NOT_FOUND )
{
- sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
- sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
- InsertChild( nPagePos );
+ for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >=
0; --i )
+ RemoveChild( i );
}
- }
- break;
- case VclEventId::TabbarPageRemoved:
- {
- if ( m_pTabBar )
+ else
{
- sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
-
- OExternalLockGuard aGuard( this );
-
- if ( nPageId == TabBar::PAGE_NOT_FOUND )
+ for ( sal_Int64 i = 0, nCount =
m_aAccessibleChildren.size(); i < nCount; ++i )
{
- for ( sal_Int32 i = m_aAccessibleChildren.size() - 1;
i >= 0; --i )
- RemoveChild( i );
- }
- else
- {
- for ( sal_Int64 i = 0, nCount =
m_aAccessibleChildren.size(); i < nCount; ++i )
+ sal_uInt16 nChildPageId = m_pTabBar->GetPageId(
static_cast<sal_uInt16>(i) );
+ if (nPageId == nChildPageId)
{
- sal_uInt16 nChildPageId = m_pTabBar->GetPageId(
static_cast<sal_uInt16>(i) );
- if (nPageId == nChildPageId)
- {
- RemoveChild( i );
- break;
- }
+ RemoveChild( i );
+ break;
}
}
}
}
- break;
- case VclEventId::TabbarPageMoved:
- {
- Pair* pPair = static_cast<Pair*>(rVclWindowEvent.GetData());
- if ( pPair )
- MoveChild( pPair->A(), pPair->B() );
- }
- break;
- case VclEventId::TabbarPageTextChanged:
- {
- sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
- sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
- UpdatePageText( nPagePos );
- }
- break;
- default:
- {
- AccessibleTabBarBase::ProcessWindowEvent( rVclWindowEvent );
- }
- break;
}
+ break;
+ case VclEventId::TabbarPageMoved:
+ {
+ Pair* pPair = static_cast<Pair*>(rVclWindowEvent.GetData());
+ if ( pPair )
+ MoveChild( pPair->A(), pPair->B() );
+ }
+ break;
+ case VclEventId::TabbarPageTextChanged:
+ {
+ sal_uInt16 nPageId =
static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()));
+ sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+ UpdatePageText( nPagePos );
+ }
+ break;
+ default:
+ {
+ AccessibleTabBarBase::ProcessWindowEvent( rVclWindowEvent );
+ }
+ break;
}
+}
- void AccessibleTabBarPageList::FillAccessibleStateSet( sal_Int64&
rStateSet )
+void AccessibleTabBarPageList::FillAccessibleStateSet( sal_Int64& rStateSet )
+{
+ if ( !m_pTabBar )
+ return;
+
+ if ( m_pTabBar->IsEnabled() )
{
- if ( !m_pTabBar )
- return;
+ rStateSet |= AccessibleStateType::ENABLED;
+ rStateSet |= AccessibleStateType::SENSITIVE;
+ }
- if ( m_pTabBar->IsEnabled() )
- {
- rStateSet |= AccessibleStateType::ENABLED;
- rStateSet |= AccessibleStateType::SENSITIVE;
- }
+ rStateSet |= AccessibleStateType::VISIBLE;
- rStateSet |= AccessibleStateType::VISIBLE;
+ if ( m_pTabBar->IsVisible() )
+ rStateSet |= AccessibleStateType::SHOWING;
+}
- if ( m_pTabBar->IsVisible() )
- rStateSet |= AccessibleStateType::SHOWING;
- }
+// OAccessibleComponentHelper
- // OAccessibleComponentHelper
+awt::Rectangle AccessibleTabBarPageList::implGetBounds()
+{
+ awt::Rectangle aBounds;
+ if ( m_pTabBar )
+ aBounds = vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageArea());
- awt::Rectangle AccessibleTabBarPageList::implGetBounds()
- {
- awt::Rectangle aBounds;
- if ( m_pTabBar )
- aBounds =
vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageArea());
+ return aBounds;
+}
- return aBounds;
- }
+// XComponent
- // XComponent
+void AccessibleTabBarPageList::disposing()
+{
+ AccessibleTabBarBase::disposing();
- void AccessibleTabBarPageList::disposing()
+ // dispose all children
+ for (const rtl::Reference<AccessibleTabBarPage>& xComponent :
m_aAccessibleChildren)
{
- AccessibleTabBarBase::disposing();
-
- // dispose all children
- for (const rtl::Reference<AccessibleTabBarPage>& xComponent :
m_aAccessibleChildren)
- {
- if ( xComponent.is() )
- xComponent->dispose();
- }
- m_aAccessibleChildren.clear();
+ if ( xComponent.is() )
+ xComponent->dispose();
}
+ m_aAccessibleChildren.clear();
+}
- // XServiceInfo
+// XServiceInfo
- OUString AccessibleTabBarPageList::getImplementationName()
- {
- return u"com.sun.star.comp.svtools.AccessibleTabBarPageList"_ustr;
- }
+OUString AccessibleTabBarPageList::getImplementationName()
+{
+ return u"com.sun.star.comp.svtools.AccessibleTabBarPageList"_ustr;
+}
- sal_Bool AccessibleTabBarPageList::supportsService( const OUString&
rServiceName )
- {
- return cppu::supportsService(this, rServiceName);
- }
+sal_Bool AccessibleTabBarPageList::supportsService( const OUString&
rServiceName )
+{
+ return cppu::supportsService(this, rServiceName);
+}
- Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames()
- {
- return { u"com.sun.star.awt.AccessibleTabBarPageList"_ustr };
- }
+Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames()
+{
+ return { u"com.sun.star.awt.AccessibleTabBarPageList"_ustr };
+}
- // XAccessible
+// XAccessible
- Reference< XAccessibleContext >
AccessibleTabBarPageList::getAccessibleContext( )
- {
- OExternalLockGuard aGuard( this );
+Reference< XAccessibleContext >
AccessibleTabBarPageList::getAccessibleContext( )
+{
+ OExternalLockGuard aGuard( this );
- return this;
- }
+ return this;
+}
- // XAccessibleContext
+// XAccessibleContext
- sal_Int64 AccessibleTabBarPageList::getAccessibleChildCount()
- {
- OExternalLockGuard aGuard( this );
+sal_Int64 AccessibleTabBarPageList::getAccessibleChildCount()
+{
+ OExternalLockGuard aGuard( this );
- return m_aAccessibleChildren.size();
- }
+ return m_aAccessibleChildren.size();
+}
- Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild(
sal_Int64 i )
- {
- OExternalLockGuard aGuard( this );
+Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild(
sal_Int64 i )
+{
+ OExternalLockGuard aGuard( this );
- return getAccessibleChildImpl(i);
- }
+ return getAccessibleChildImpl(i);
+}
- rtl::Reference< AccessibleTabBarPage >
AccessibleTabBarPageList::getAccessibleChildImpl( sal_Int64 i )
- {
- if ( i < 0 || i >= getAccessibleChildCount() )
- throw IndexOutOfBoundsException();
+rtl::Reference< AccessibleTabBarPage >
AccessibleTabBarPageList::getAccessibleChildImpl( sal_Int64 i )
+{
+ if ( i < 0 || i >= getAccessibleChildCount() )
+ throw IndexOutOfBoundsException();
- rtl::Reference< AccessibleTabBarPage > xChild =
m_aAccessibleChildren[i];
- if ( !xChild.is() )
+ rtl::Reference< AccessibleTabBarPage > xChild = m_aAccessibleChildren[i];
+ if ( !xChild.is() )
+ {
+ if ( m_pTabBar )
{
- if ( m_pTabBar )
- {
- sal_uInt16 nPageId = m_pTabBar->GetPageId(
static_cast<sal_uInt16>(i) );
+ sal_uInt16 nPageId = m_pTabBar->GetPageId(
static_cast<sal_uInt16>(i) );
- xChild = new AccessibleTabBarPage( m_pTabBar, nPageId, this );
+ xChild = new AccessibleTabBarPage( m_pTabBar, nPageId, this );
- // insert into child list
- m_aAccessibleChildren[i] = xChild;
- }
+ // insert into child list
+ m_aAccessibleChildren[i] = xChild;
}
-
- return xChild;
}
+ return xChild;
+}
- Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( )
- {
- OExternalLockGuard aGuard( this );
- Reference< XAccessible > xParent;
- if ( m_pTabBar )
- xParent = m_pTabBar->GetAccessible();
+Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( )
+{
+ OExternalLockGuard aGuard( this );
- return xParent;
- }
+ Reference< XAccessible > xParent;
+ if ( m_pTabBar )
+ xParent = m_pTabBar->GetAccessible();
+ return xParent;
+}
- sal_Int64 AccessibleTabBarPageList::getAccessibleIndexInParent( )
- {
- OExternalLockGuard aGuard( this );
- return m_nIndexInParent;
- }
+sal_Int64 AccessibleTabBarPageList::getAccessibleIndexInParent( )
+{
+ OExternalLockGuard aGuard( this );
+ return m_nIndexInParent;
+}
- sal_Int16 AccessibleTabBarPageList::getAccessibleRole( )
- {
- return AccessibleRole::PAGE_TAB_LIST;
- }
+sal_Int16 AccessibleTabBarPageList::getAccessibleRole( )
+{
+ return AccessibleRole::PAGE_TAB_LIST;
+}
- OUString AccessibleTabBarPageList::getAccessibleDescription( )
- {
- return OUString();
- }
+OUString AccessibleTabBarPageList::getAccessibleDescription( )
+{
+ return OUString();
+}
- OUString AccessibleTabBarPageList::getAccessibleName( )
- {
- return OUString();
- }
+OUString AccessibleTabBarPageList::getAccessibleName( )
+{
+ return OUString();
+}
- Reference< XAccessibleRelationSet >
AccessibleTabBarPageList::getAccessibleRelationSet( )
- {
- OExternalLockGuard aGuard( this );
- return new utl::AccessibleRelationSetHelper;
- }
+Reference< XAccessibleRelationSet >
AccessibleTabBarPageList::getAccessibleRelationSet( )
+{
+ OExternalLockGuard aGuard( this );
+ return new utl::AccessibleRelationSetHelper;
+}
- sal_Int64 AccessibleTabBarPageList::getAccessibleStateSet( )
- {
- OExternalLockGuard aGuard( this );
- sal_Int64 nStateSet = 0;
+sal_Int64 AccessibleTabBarPageList::getAccessibleStateSet( )
+{
+ OExternalLockGuard aGuard( this );
- if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
- {
- FillAccessibleStateSet( nStateSet );
- }
- else
- {
- nStateSet |= AccessibleStateType::DEFUNC;
- }
+ sal_Int64 nStateSet = 0;
- return nStateSet;
+ if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+ {
+ FillAccessibleStateSet( nStateSet );
+ }
+ else
+ {
+ nStateSet |= AccessibleStateType::DEFUNC;
}
+ return nStateSet;
+}
- Locale AccessibleTabBarPageList::getLocale( )
- {
- OExternalLockGuard aGuard( this );
- return Application::GetSettings().GetLanguageTag().getLocale();
- }
+Locale AccessibleTabBarPageList::getLocale( )
+{
+ OExternalLockGuard aGuard( this );
+ return Application::GetSettings().GetLanguageTag().getLocale();
+}
- // XAccessibleComponent
+// XAccessibleComponent
- Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint(
const awt::Point& rPoint )
- {
- OExternalLockGuard aGuard( this );
- Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
- for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
+Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const
awt::Point& rPoint )
+{
+ OExternalLockGuard aGuard( this );
+
+ Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
+ for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
+ {
+ rtl::Reference< AccessibleTabBarPage > xAcc = getAccessibleChildImpl(
i );
+ if ( xAcc.is() )
{
- rtl::Reference< AccessibleTabBarPage > xAcc =
getAccessibleChildImpl( i );
- if ( xAcc.is() )
+ Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
+ if ( xComp.is() )
{
- Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
- if ( xComp.is() )
- {
- tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
- if ( aRect.Contains( aPos ) )
- return xAcc;
- }
+ tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
+ if ( aRect.Contains( aPos ) )
+ return xAcc;
}
}
-
- return nullptr;
}
+ return nullptr;
+}
- void AccessibleTabBarPageList::grabFocus( )
- {
- // no focus
- }
+void AccessibleTabBarPageList::grabFocus( )
+{
+ // no focus
+}
- sal_Int32 AccessibleTabBarPageList::getForeground( )
- {
- OExternalLockGuard aGuard( this );
- sal_Int32 nColor = 0;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- nColor = xParentComp->getForeground();
- }
+sal_Int32 AccessibleTabBarPageList::getForeground( )
+{
+ OExternalLockGuard aGuard( this );
- return nColor;
+ sal_Int32 nColor = 0;
+ Reference< XAccessible > xParent = getAccessibleParent();
+ if ( xParent.is() )
+ {
+ Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
+ if ( xParentComp.is() )
+ nColor = xParentComp->getForeground();
}
+ return nColor;
+}
- sal_Int32 AccessibleTabBarPageList::getBackground( )
- {
- OExternalLockGuard aGuard( this );
- sal_Int32 nColor = 0;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- nColor = xParentComp->getBackground();
- }
+sal_Int32 AccessibleTabBarPageList::getBackground( )
+{
+ OExternalLockGuard aGuard( this );
- return nColor;
+ sal_Int32 nColor = 0;
+ Reference< XAccessible > xParent = getAccessibleParent();
+ if ( xParent.is() )
+ {
+ Reference< XAccessibleComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
+ if ( xParentComp.is() )
+ nColor = xParentComp->getBackground();
}
- // XAccessibleSelection
+ return nColor;
+}
+// XAccessibleSelection
- void AccessibleTabBarPageList::selectAccessibleChild( sal_Int64
nChildIndex )
- {
- OExternalLockGuard aGuard( this );
- if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
- throw IndexOutOfBoundsException();
+void AccessibleTabBarPageList::selectAccessibleChild( sal_Int64 nChildIndex )
+{
+ OExternalLockGuard aGuard( this );
- if ( m_pTabBar )
- {
- m_pTabBar->SetCurPageId( m_pTabBar->GetPageId(
static_cast<sal_uInt16>(nChildIndex) ) );
- m_pTabBar->PaintImmediately();
- m_pTabBar->ActivatePage();
- m_pTabBar->Select();
- }
+ if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+ throw IndexOutOfBoundsException();
+
+ if ( m_pTabBar )
+ {
+ m_pTabBar->SetCurPageId( m_pTabBar->GetPageId(
static_cast<sal_uInt16>(nChildIndex) ) );
+ m_pTabBar->PaintImmediately();
+ m_pTabBar->ActivatePage();
+ m_pTabBar->Select();
}
+}
- sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int64
nChildIndex )
- {
- OExternalLockGuard aGuard( this );
+sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int64
nChildIndex )
+{
+ OExternalLockGuard aGuard( this );
- if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
- throw IndexOutOfBoundsException();
+ if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+ throw IndexOutOfBoundsException();
- bool bSelected = false;
- if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId(
static_cast<sal_uInt16>(nChildIndex) ) )
- bSelected = true;
+ bool bSelected = false;
+ if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId(
static_cast<sal_uInt16>(nChildIndex) ) )
+ bSelected = true;
- return bSelected;
- }
+ return bSelected;
+}
- void AccessibleTabBarPageList::clearAccessibleSelection( )
- {
- // This method makes no sense in a TabBar, and so does nothing.
- }
+void AccessibleTabBarPageList::clearAccessibleSelection( )
+{
+ // This method makes no sense in a TabBar, and so does nothing.
+}
- void AccessibleTabBarPageList::selectAllAccessibleChildren( )
- {
- selectAccessibleChild( 0 );
- }
+void AccessibleTabBarPageList::selectAllAccessibleChildren( )
+{
+ selectAccessibleChild( 0 );
+}
- sal_Int64 AccessibleTabBarPageList::getSelectedAccessibleChildCount( )
- {
- return 1;
- }
+sal_Int64 AccessibleTabBarPageList::getSelectedAccessibleChildCount( )
+{
+ return 1;
+}
- Reference< XAccessible >
AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int64
nSelectedChildIndex )
- {
- OExternalLockGuard aGuard( this );
+Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild(
sal_Int64 nSelectedChildIndex )
+{
+ OExternalLockGuard aGuard( this );
- if ( nSelectedChildIndex < 0 || nSelectedChildIndex >=
getSelectedAccessibleChildCount() )
- throw IndexOutOfBoundsException();
+ if ( nSelectedChildIndex < 0 || nSelectedChildIndex >=
getSelectedAccessibleChildCount() )
+ throw IndexOutOfBoundsException();
- Reference< XAccessible > xChild;
+ Reference< XAccessible > xChild;
- for ( sal_Int64 i = 0, j = 0, nCount = getAccessibleChildCount(); i <
nCount; i++ )
+ for ( sal_Int64 i = 0, j = 0, nCount = getAccessibleChildCount(); i <
nCount; i++ )
+ {
+ if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
{
- if ( isAccessibleChildSelected( i ) && ( j++ ==
nSelectedChildIndex ) )
- {
- xChild = getAccessibleChild( i );
- break;
- }
+ xChild = getAccessibleChild( i );
+ break;
}
-
- return xChild;
}
+ return xChild;
+}
- void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int64
nChildIndex )
- {
- OExternalLockGuard aGuard( this );
- if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
- throw IndexOutOfBoundsException();
+void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int64 nChildIndex )
+{
+ OExternalLockGuard aGuard( this );
- // This method makes no sense in a TabBar, and so does nothing.
- }
+ if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+ throw IndexOutOfBoundsException();
+
+ // This method makes no sense in a TabBar, and so does nothing.
+}
} // namespace accessibility
diff --git a/svtools/source/control/accessibletabbarpagelist.hxx
b/svtools/source/control/accessibletabbarpagelist.hxx
index 63f51a0314a9..00634fa5af41 100644
--- a/svtools/source/control/accessibletabbarpagelist.hxx
+++ b/svtools/source/control/accessibletabbarpagelist.hxx
@@ -32,77 +32,77 @@
namespace accessibility
{
- class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper<
- AccessibleTabBarBase,
- css::accessibility::XAccessible,
-
css::accessibility::XAccessibleSelection,
- css::lang::XServiceInfo>
- {
- private:
- typedef std::vector< rtl::Reference< AccessibleTabBarPage > >
AccessibleChildren;
-
- AccessibleChildren m_aAccessibleChildren;
- sal_Int32 m_nIndexInParent;
-
- void UpdateShowing( bool bShowing );
- void UpdateSelected( sal_Int32 i, bool bSelected );
- void UpdatePageText( sal_Int32 i );
-
- void InsertChild( sal_Int32 i );
- void RemoveChild( sal_Int32 i );
- void MoveChild( sal_Int32 i, sal_Int32 j );
-
- virtual void ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent ) override;
- void FillAccessibleStateSet( sal_Int64& rStateSet );
-
- // OAccessibleComponentHelper
- virtual css::awt::Rectangle implGetBounds( ) override;
-
- // XComponent
- virtual void SAL_CALL disposing() override;
-
- public:
- AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
-
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const OUString&
rServiceName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
-
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
- // XAccessibleContext
- virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleParent( ) override;
- virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) override;
- virtual OUString SAL_CALL getAccessibleName( ) override;
- virtual css::uno::Reference<
css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(
) override;
- virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- virtual css::lang::Locale SAL_CALL getLocale( ) override;
-
- // XAccessibleComponent
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
- virtual void SAL_CALL grabFocus( ) override;
- virtual sal_Int32 SAL_CALL getForeground( ) override;
- virtual sal_Int32 SAL_CALL getBackground( ) override;
-
- // XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex )
override;
- virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64
nChildIndex ) override;
- virtual void SAL_CALL clearAccessibleSelection( ) override;
- virtual void SAL_CALL selectAllAccessibleChildren( ) override;
- virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( )
override;
- virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
- virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex )
override;
-
- private:
- rtl::Reference< AccessibleTabBarPage > getAccessibleChildImpl(
sal_Int64 i );
- };
+class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper<
+ AccessibleTabBarBase,
+ css::accessibility::XAccessible,
+
css::accessibility::XAccessibleSelection,
+ css::lang::XServiceInfo>
+{
+private:
+ typedef std::vector< rtl::Reference< AccessibleTabBarPage > >
AccessibleChildren;
+
+ AccessibleChildren m_aAccessibleChildren;
+ sal_Int32 m_nIndexInParent;
+
+ void UpdateShowing( bool bShowing );
+ void UpdateSelected( sal_Int32 i, bool bSelected );
+ void UpdatePageText( sal_Int32 i );
+
+ void InsertChild( sal_Int32 i );
+ void RemoveChild( sal_Int32 i );
+ void MoveChild( sal_Int32 i, sal_Int32 j );
+
+ virtual void ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent ) override;
+ void FillAccessibleStateSet( sal_Int64& rStateSet );
+
+ // OAccessibleComponentHelper
+ virtual css::awt::Rectangle implGetBounds( ) override;
+
+ // XComponent
+ virtual void SAL_CALL disposing() override;
+
+public:
+ AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
+
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
+
+ // XAccessible
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
+
+ // XAccessibleContext
+ virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleParent( ) override;
+ virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) override;
-e
... etc. - the rest is truncated
