diff options
Diffstat (limited to 'accessibility/inc')
10 files changed, 36 insertions, 73 deletions
diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx index d6bfffc12375..a73ee76c09f2 100644 --- a/accessibility/inc/helper/characterattributeshelper.hxx +++ b/accessibility/inc/helper/characterattributeshelper.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index af38cdcbae42..67c2ef93b139 100644 --- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx index 627cc0888d10..76c1c14594e9 100644 --- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx index d61f525e96aa..d971e80ccaa9 100644 --- a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx index b0cc9024fe7b..15f6ee17e4bb 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx index 9a6a2d8e4c1a..0a79530f2f2b 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx index 3f284d7f0cb2..9069f991b2cd 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx index aee3e62d2f48..9405947b2b5b 100644 --- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx index bb14b952e98c..51071c19d130 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx @@ -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: */ diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx index 3374ef450e25..2d4c486e677c 100644 --- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx @@ -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: */ |