tdf#123936 Formatting file in module accessibility with clang

Change-Id: I9ac4df1ecc3ea1d48f3961fa95f34207dab8976e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105411
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Philipp Hofer 2020-11-06 16:22:34 +01:00 committed by Samuel Mehrbrodt
parent ed7f4cc51c
commit b53fa6344d
17 changed files with 68 additions and 157 deletions

View file

@ -26,24 +26,19 @@
#include <map>
#include <vector>
class CharacterAttributesHelper
{
private:
typedef std::map<OUString, css::uno::Any> AttributeMap;
typedef std::map< OUString, css::uno::Any > AttributeMap;
AttributeMap m_aAttributeMap;
AttributeMap m_aAttributeMap;
public:
CharacterAttributesHelper(const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor);
CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor );
std::vector< css::beans::PropertyValue > GetCharacterAttributes();
css::uno::Sequence< css::beans::PropertyValue > GetCharacterAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes );
std::vector<css::beans::PropertyValue> GetCharacterAttributes();
css::uno::Sequence<css::beans::PropertyValue>
GetCharacterAttributes(const css::uno::Sequence<OUString>& aRequestedAttributes);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -21,24 +21,21 @@
#include <standard/vclxaccessiblebox.hxx>
/** The accessible combobox has two children. The first is the text field
represented by an object of the VCLXAccessibleEdit class.
The second is the list containing all items and is represented by an
object of the VCLXAccessibleList class which does not
support selection at the moment.
*/
class VCLXAccessibleComboBox final
: public VCLXAccessibleBox
class VCLXAccessibleComboBox final : public VCLXAccessibleBox
{
public:
VCLXAccessibleComboBox (VCLXWindow* pVCLXindow);
VCLXAccessibleComboBox(VCLXWindow* pVCLXindow);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
// Return combo box specific services.
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
virtual ~VCLXAccessibleComboBox() override = default;
@ -46,5 +43,4 @@ private:
virtual bool IsValid() const override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -31,20 +31,18 @@
class VCLXAccessibleDropDownComboBox final : public VCLXAccessibleBox
{
public:
VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow);
VCLXAccessibleDropDownComboBox(VCLXWindow* pVCLXindow);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
// Return drop down combo box specific services.
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
virtual ~VCLXAccessibleDropDownComboBox() override = default;
virtual bool IsValid() const override;
virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override;
virtual void ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -31,20 +31,17 @@
class VCLXAccessibleDropDownListBox final : public VCLXAccessibleBox
{
public:
VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow);
VCLXAccessibleDropDownListBox(VCLXWindow* pVCLXindow);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
// Return drop down list box specific services.
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
virtual ~VCLXAccessibleDropDownListBox() override = default;
virtual bool IsValid() const override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -21,9 +21,6 @@
#include <standard/vclxaccessibletextcomponent.hxx>
class VCLXAccessibleFixedHyperlink final : public VCLXAccessibleTextComponent
{
virtual ~VCLXAccessibleFixedHyperlink() override = default;
@ -33,8 +30,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -21,22 +21,18 @@
#include <standard/vclxaccessibletextcomponent.hxx>
class VCLXAccessibleFixedText final : public VCLXAccessibleTextComponent
{
virtual ~VCLXAccessibleFixedText() override = default;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
virtual void FillAccessibleStateSet(utl::AccessibleStateSetHelper& rStateSet) override;
public:
using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -22,36 +22,33 @@
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <toolkit/awt/vclxwindow.hxx>
typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > >
ListItems;
typedef std::vector<css::uno::WeakReference<css::accessibility::XAccessible>> ListItems;
class VCLXAccessibleHeaderBar final : public VCLXAccessibleComponent
{
VclPtr<HeaderBar> m_pHeadBar;
VclPtr<HeaderBar> m_pHeadBar;
public:
virtual ~VCLXAccessibleHeaderBar() override;
VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow );
VCLXAccessibleHeaderBar(VCLXWindow* pVCLXindow);
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference<css::accessibility::XAccessible>
SAL_CALL getAccessibleChild(sal_Int32 i) override;
virtual sal_Int16 SAL_CALL getAccessibleRole() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
public:
virtual void SAL_CALL disposing() override;
css::uno::Reference< css::accessibility::XAccessible > CreateChild(sal_Int32 i);
css::uno::Reference<css::accessibility::XAccessible> CreateChild(sal_Int32 i);
private:
ListItems m_aAccessibleChildren;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -21,7 +21,6 @@
#include <standard/vclxaccessiblebox.hxx>
/** The accessible drop down combobox has one children. It is the list
containing all items and is represented by an object of the
VCLXAccessibleListBoxList class which does support
@ -30,13 +29,12 @@
class VCLXAccessibleListBox final : public VCLXAccessibleBox
{
public:
VCLXAccessibleListBox (VCLXWindow* pVCLXindow);
VCLXAccessibleListBox(VCLXWindow* pVCLXindow);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
// Return list box specific services.
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
virtual ~VCLXAccessibleListBox() override = default;
@ -44,5 +42,4 @@ private:
virtual bool IsValid() const override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -21,22 +21,17 @@
#include <standard/accessiblemenuitemcomponent.hxx>
class VCLXAccessibleMenuSeparator final : public OAccessibleMenuItemComponent
{
public:
VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos );
VCLXAccessibleMenuSeparator(Menu* pParent, sal_uInt16 nItemPos);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
// XAccessibleContext
virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
virtual sal_Int16 SAL_CALL getAccessibleRole() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -21,27 +21,23 @@
#include <standard/accessiblemenucomponent.hxx>
class VCLXAccessiblePopupMenu final : public OAccessibleMenuComponent
{
virtual bool IsFocused() override;
virtual bool IsFocused() override;
public:
using OAccessibleMenuComponent::OAccessibleMenuComponent;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override;
virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
virtual sal_Int16 SAL_CALL getAccessibleRole() override;
// XAccessibleExtendedComponent
virtual sal_Int32 SAL_CALL getBackground( ) override;
virtual sal_Int32 SAL_CALL getBackground() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -11,11 +11,7 @@
namespace accessibility
{
IComboListBoxHelper::~IComboListBoxHelper()
{
}
IComboListBoxHelper::~IComboListBoxHelper() {}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -20,9 +20,6 @@
#include <helper/accresmgr.hxx>
#include <unotools/resmgr.hxx>
OUString AccResId(const char* pId)
{
return Translate::get(pId, Translate::Create("acc"));
}
OUString AccResId(const char* pId) { return Translate::get(pId, Translate::Create("acc")); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -21,23 +21,18 @@
using namespace ::com::sun::star;
// VCLXAccessibleFixedHyperlink
// XServiceInfo
OUString VCLXAccessibleFixedHyperlink::getImplementationName()
{
return "com.sun.star.comp.toolkit.AccessibleFixedHyperlink";
}
uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames()
uno::Sequence<OUString> VCLXAccessibleFixedHyperlink::getSupportedServiceNames()
{
return { "com.sun.star.awt.AccessibleFixedHyperlink" };
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -29,32 +29,26 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::accessibility;
// VCLXAccessibleFixedText
void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
void VCLXAccessibleFixedText::FillAccessibleStateSet(utl::AccessibleStateSetHelper& rStateSet)
{
VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
VCLXAccessibleTextComponent::FillAccessibleStateSet(rStateSet);
if ( GetWindow() && GetWindow()->GetStyle() & WB_WORDBREAK )
rStateSet.AddState( AccessibleStateType::MULTI_LINE );
if (GetWindow() && GetWindow()->GetStyle() & WB_WORDBREAK)
rStateSet.AddState(AccessibleStateType::MULTI_LINE);
}
// XServiceInfo
OUString VCLXAccessibleFixedText::getImplementationName()
{
return "com.sun.star.comp.toolkit.AccessibleFixedText";
}
Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames()
Sequence<OUString> VCLXAccessibleFixedText::getSupportedServiceNames()
{
return { "com.sun.star.awt.AccessibleFixedText" };
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -34,66 +34,60 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::accessibility;
using namespace ::comphelper;
VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar( VCLXWindow* pVCLWindow )
:VCLXAccessibleComponent( pVCLWindow )
{
m_pHeadBar = GetAs< HeaderBar >();
}
VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar()
VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar(VCLXWindow* pVCLWindow)
: VCLXAccessibleComponent(pVCLWindow)
{
m_pHeadBar = GetAs<HeaderBar>();
}
VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar() {}
// XServiceInfo
OUString VCLXAccessibleHeaderBar::getImplementationName()
{
return "com.sun.star.comp.toolkit.AccessibleHeaderBar";
}
Sequence< OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames()
Sequence<OUString> VCLXAccessibleHeaderBar::getSupportedServiceNames()
{
return { "com.sun.star.awt.AccessibleHeaderBar" };
}
// =======XAccessibleContext=======
sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount( )
sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount()
{
SolarMutexGuard g;
sal_Int32 nCount = 0;
if ( m_pHeadBar )
if (m_pHeadBar)
nCount = m_pHeadBar->GetItemCount();
return nCount;
}
css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i )
css::uno::Reference<css::accessibility::XAccessible>
SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChild(sal_Int32 i)
{
SolarMutexGuard g;
if ( i < 0 || i >= getAccessibleChildCount() )
if (i < 0 || i >= getAccessibleChildCount())
throw IndexOutOfBoundsException();
Reference< XAccessible > xChild;
Reference<XAccessible> xChild;
// search for the child
if ( o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
xChild = CreateChild (i);
if (o3tl::make_unsigned(i) >= m_aAccessibleChildren.size())
xChild = CreateChild(i);
else
{
xChild = m_aAccessibleChildren[i];
if ( !xChild.is() )
xChild = CreateChild (i);
if (!xChild.is())
xChild = CreateChild(i);
}
return xChild;
}
sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole( )
sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole()
{
return css::accessibility::AccessibleRole::LIST;
}
@ -106,12 +100,13 @@ void SAL_CALL VCLXAccessibleHeaderBar::disposing()
VCLXAccessibleComponent::disposing();
}
css::uno::Reference< css::accessibility::XAccessible > VCLXAccessibleHeaderBar::CreateChild (sal_Int32 i)
css::uno::Reference<css::accessibility::XAccessible>
VCLXAccessibleHeaderBar::CreateChild(sal_Int32 i)
{
Reference<XAccessible> xChild;
sal_uInt16 nPos = static_cast<sal_uInt16>(i);
if ( nPos >= m_aAccessibleChildren.size() )
if (nPos >= m_aAccessibleChildren.size())
{
m_aAccessibleChildren.resize(nPos + 1);
@ -123,7 +118,7 @@ css::uno::Reference< css::accessibility::XAccessible > VCLXAccessibleHeaderBar::
{
xChild = m_aAccessibleChildren[nPos];
// check if position is empty and can be used else we have to adjust all entries behind this
if ( !xChild.is() )
if (!xChild.is())
{
xChild = new VCLXAccessibleHeaderBarItem(m_pHeadBar, i);
m_aAccessibleChildren[nPos] = xChild;

View file

@ -21,43 +21,30 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::comphelper;
VCLXAccessibleMenuSeparator::VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos )
:OAccessibleMenuItemComponent( pParent, nItemPos, nullptr )
VCLXAccessibleMenuSeparator::VCLXAccessibleMenuSeparator(Menu* pParent, sal_uInt16 nItemPos)
: OAccessibleMenuItemComponent(pParent, nItemPos, nullptr)
{
}
// XServiceInfo
OUString VCLXAccessibleMenuSeparator::getImplementationName()
{
return "com.sun.star.comp.toolkit.AccessibleMenuSeparator";
}
Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames()
Sequence<OUString> VCLXAccessibleMenuSeparator::getSupportedServiceNames()
{
return { "com.sun.star.awt.AccessibleMenuSeparator" };
}
// XAccessibleContext
sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( )
{
return AccessibleRole::SEPARATOR;
}
sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole() { return AccessibleRole::SEPARATOR; }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -45,7 +45,6 @@ accessibility/inc/extended/accessibletablistbox.hxx
accessibility/inc/extended/accessibletablistboxtable.hxx
accessibility/inc/extended/textwindowaccessibility.hxx
accessibility/inc/helper/IComboListBoxHelper.hxx
accessibility/inc/helper/characterattributeshelper.hxx
accessibility/inc/helper/listboxhelper.hxx
accessibility/inc/standard/accessiblemenubasecomponent.hxx
accessibility/inc/standard/accessiblemenucomponent.hxx
@ -53,22 +52,13 @@ accessibility/inc/standard/accessiblemenuitemcomponent.hxx
accessibility/inc/standard/vclxaccessiblebox.hxx
accessibility/inc/standard/vclxaccessiblebutton.hxx
accessibility/inc/standard/vclxaccessiblecheckbox.hxx
accessibility/inc/standard/vclxaccessiblecombobox.hxx
accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
accessibility/inc/standard/vclxaccessibleedit.hxx
accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
accessibility/inc/standard/vclxaccessiblefixedtext.hxx
accessibility/inc/standard/vclxaccessibleheaderbar.hxx
accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
accessibility/inc/standard/vclxaccessiblelist.hxx
accessibility/inc/standard/vclxaccessiblelistbox.hxx
accessibility/inc/standard/vclxaccessiblelistitem.hxx
accessibility/inc/standard/vclxaccessiblemenu.hxx
accessibility/inc/standard/vclxaccessiblemenubar.hxx
accessibility/inc/standard/vclxaccessiblemenuitem.hxx
accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
accessibility/inc/standard/vclxaccessibleradiobutton.hxx
accessibility/inc/standard/vclxaccessiblescrollbar.hxx
accessibility/inc/standard/vclxaccessiblestatusbar.hxx
@ -109,9 +99,7 @@ accessibility/source/extended/accessibletabbarpagelist.cxx
accessibility/source/extended/accessibletablistbox.cxx
accessibility/source/extended/accessibletablistboxtable.cxx
accessibility/source/extended/textwindowaccessibility.cxx
accessibility/source/helper/IComboListBoxHelper.cxx
accessibility/source/helper/acc_factory.cxx
accessibility/source/helper/accresmgr.cxx
accessibility/source/helper/characterattributeshelper.cxx
accessibility/source/standard/accessiblemenubasecomponent.cxx
accessibility/source/standard/accessiblemenucomponent.cxx
@ -124,9 +112,6 @@ accessibility/source/standard/vclxaccessiblecombobox.cxx
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
accessibility/source/standard/vclxaccessibleedit.cxx
accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
accessibility/source/standard/vclxaccessiblefixedtext.cxx
accessibility/source/standard/vclxaccessibleheaderbar.cxx
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
accessibility/source/standard/vclxaccessiblelist.cxx
accessibility/source/standard/vclxaccessiblelistbox.cxx
@ -134,7 +119,6 @@ accessibility/source/standard/vclxaccessiblelistitem.cxx
accessibility/source/standard/vclxaccessiblemenu.cxx
accessibility/source/standard/vclxaccessiblemenubar.cxx
accessibility/source/standard/vclxaccessiblemenuitem.cxx
accessibility/source/standard/vclxaccessiblemenuseparator.cxx
accessibility/source/standard/vclxaccessiblepopupmenu.cxx
accessibility/source/standard/vclxaccessibleradiobutton.cxx
accessibility/source/standard/vclxaccessiblescrollbar.cxx