diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-17 21:37:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-22 09:55:16 +0100 |
| commit | 4b7cbb569e52e483a5edda8afe27d423e428edbb (patch) | |
| tree | b767f526b821002d1b71d49e0e205d9e3dcab8fa /accessibility | |
| parent | b9b62d96f6de8908ddf69f5b56eb58fe82013a24 (diff) | |
weld SwCondCollPage
and put back original SvTreeListBox a11y factory use
Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79
Reviewed-on: https://gerrit.libreoffice.org/63501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 47897fdd936d9b6e9ac8cb6110c79352ab080df7)
Reviewed-on: https://gerrit.libreoffice.org/63770
Diffstat (limited to 'accessibility')
44 files changed, 815 insertions, 247 deletions
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index bbec944079df..71acc97315aa 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -84,6 +84,8 @@ $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/standard/vclxaccessibleedit \ accessibility/source/standard/vclxaccessiblefixedhyperlink \ accessibility/source/standard/vclxaccessiblefixedtext \ + accessibility/source/standard/vclxaccessibleheaderbar \ + accessibility/source/standard/vclxaccessibleheaderbaritem \ accessibility/source/standard/vclxaccessiblelist \ accessibility/source/standard/vclxaccessiblelistbox \ accessibility/source/standard/vclxaccessiblelistitem \ diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 2f6c60f64f57..c0abfc8989c2 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -24,7 +24,7 @@ #include <extended/AccessibleBrowseBoxBase.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> #include <memory> namespace accessibility { @@ -42,7 +42,7 @@ protected: AccessibleBrowseBox( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, - ::svt::IAccessibleTableProvider& _rBrowseBox + ::vcl::IAccessibleTableProvider& _rBrowseBox ); virtual ~AccessibleBrowseBox() override; @@ -122,7 +122,7 @@ public: */ css::uno::Reference< css::accessibility::XAccessible > - getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) + getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType ) { return implGetHeaderBar(_eObjType); } @@ -159,7 +159,7 @@ protected: @return The XAccessible interface of the header bar. */ css::uno::Reference< css::accessibility::XAccessible > - implGetHeaderBar( ::svt::AccessibleBrowseBoxObjType eObjType ); + implGetHeaderBar( ::vcl::AccessibleBrowseBoxObjType eObjType ); /** This method returns one of the children that are always present: Data table, row and column header bar or corner control. @@ -195,20 +195,20 @@ private: */ class AccessibleBrowseBoxAccess: public cppu::WeakImplHelper<css::accessibility::XAccessible>, - public ::svt::IAccessibleBrowseBox + public ::vcl::IAccessibleBrowseBox { private: ::osl::Mutex m_aMutex; css::uno::Reference< css::accessibility::XAccessible > m_xParent; - ::svt::IAccessibleTableProvider& m_rBrowseBox; + ::vcl::IAccessibleTableProvider& m_rBrowseBox; rtl::Reference<AccessibleBrowseBox> m_xContext; public: AccessibleBrowseBoxAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - ::svt::IAccessibleTableProvider& _rBrowseBox + ::vcl::IAccessibleTableProvider& _rBrowseBox ); /// returns the AccessibleContext belonging to this Accessible @@ -233,7 +233,7 @@ protected: return m_xContext.is() && m_xContext->isAlive(); } virtual css::uno::Reference< css::accessibility::XAccessible > - getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) override + getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType ) override { css::uno::Reference< css::accessibility::XAccessible > xAccessible; AccessibleBrowseBox* pContext( getContext() ); diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index 64c9636e9be5..99fb010e5f82 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -23,7 +23,7 @@ #include <sal/config.h> -#include <svtools/AccessibleBrowseBoxObjType.hxx> +#include <vcl/AccessibleBrowseBoxObjType.hxx> #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <vcl/svapp.hxx> @@ -52,7 +52,7 @@ namespace utl { class AccessibleStateSetHelper; } -namespace svt { +namespace vcl { class IAccessibleTableProvider; } @@ -86,9 +86,9 @@ public: @param eObjType Object type */ AccessibleBrowseBoxBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, + ::vcl::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - ::svt::AccessibleBrowseBoxObjType eObjType ); + ::vcl::AccessibleBrowseBoxObjType eObjType ); /** Constructor sets specified name and description. @param rxParent XAccessible interface of the parent object. @@ -99,9 +99,9 @@ public: @param rDescription The description text of this object. */ AccessibleBrowseBoxBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, + ::vcl::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - ::svt::AccessibleBrowseBoxObjType eObjType, + ::vcl::AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ); @@ -219,7 +219,7 @@ public: // helper methods /** @return The BrowseBox object type. */ - inline ::svt::AccessibleBrowseBoxObjType getType() const; + inline ::vcl::AccessibleBrowseBoxObjType getType() const; /** Changes the name of the object and notifies listeners. */ void setAccessibleName( const OUString& rName ); @@ -297,7 +297,7 @@ protected: /** The parent accessible object. */ css::uno::Reference< css::accessibility::XAccessible > mxParent; /** The VCL BrowseBox control. */ - ::svt::IAccessibleTableProvider* mpBrowseBox; + ::vcl::IAccessibleTableProvider* mpBrowseBox; /** This is the window which get all the nice focus events */ @@ -310,7 +310,7 @@ private: OUString maDescription; /** The type of this object (for names, descriptions, state sets, ...). */ - ::svt::AccessibleBrowseBoxObjType meObjType; + ::vcl::AccessibleBrowseBoxObjType meObjType; ::comphelper::AccessibleEventNotifier::TClientId m_aClientId; }; @@ -340,9 +340,9 @@ protected: */ BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, + ::vcl::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - ::svt::AccessibleBrowseBoxObjType eObjType ); + ::vcl::AccessibleBrowseBoxObjType eObjType ); /** Constructor sets specified name and description. @@ -355,9 +355,9 @@ protected: */ BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, + ::vcl::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - ::svt::AccessibleBrowseBoxObjType eObjType, + ::vcl::AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ); @@ -395,7 +395,7 @@ public: // inlines -inline ::svt::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const +inline ::vcl::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const { return meObjType; } diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 0a579376649b..d0edc3af1057 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -47,7 +47,7 @@ namespace accessibility public: AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - ::svt::IAccessibleTableProvider& _rBrowseBox, + ::vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx index 72358475d880..eef541c0caaf 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -47,8 +47,8 @@ public: BBTYPE_COLUMNHEADERBAR. */ AccessibleBrowseBoxHeaderBar( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, - ::svt::AccessibleBrowseBoxObjType eObjType ); + ::vcl::IAccessibleTableProvider& rBrowseBox, + ::vcl::AccessibleBrowseBoxObjType eObjType ); private: virtual ~AccessibleBrowseBoxHeaderBar() override; @@ -204,12 +204,12 @@ private: inline bool AccessibleBrowseBoxHeaderBar::isRowBar() const { - return getType() == ::svt::BBTYPE_ROWHEADERBAR; + return getType() == ::vcl::BBTYPE_ROWHEADERBAR; } inline bool AccessibleBrowseBoxHeaderBar::isColumnBar() const { - return getType() == ::svt::BBTYPE_COLUMNHEADERBAR; + return getType() == ::vcl::BBTYPE_COLUMNHEADERBAR; } diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index e1aae2311957..a0f2c140d16d 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -29,9 +29,9 @@ namespace accessibility public: AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId, const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& _rBrowseBox, + ::vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - ::svt::AccessibleBrowseBoxObjType _eObjType); + ::vcl::AccessibleBrowseBoxObjType _eObjType); /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; @@ -47,7 +47,7 @@ namespace accessibility bool isRowBarCell() const { - return getType() == ::svt::BBTYPE_ROWHEADERCELL; + return getType() == ::vcl::BBTYPE_ROWHEADERCELL; } /** @return diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx index adc877bc27e8..04e26a28618b 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx @@ -35,7 +35,7 @@ class AccessibleBrowseBoxTable : public AccessibleBrowseBoxTableBase public: AccessibleBrowseBoxTable( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox ); + ::vcl::IAccessibleTableProvider& rBrowseBox ); protected: virtual ~AccessibleBrowseBoxTable() override; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx index ac98a503b9c0..b74e95969f49 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx @@ -50,8 +50,8 @@ public: @param eObjType Type of BrowseBox object. */ AccessibleBrowseBoxTableBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, - ::svt::AccessibleBrowseBoxObjType eObjType ); + ::vcl::IAccessibleTableProvider& rBrowseBox, + ::vcl::AccessibleBrowseBoxObjType eObjType ); protected: virtual ~AccessibleBrowseBoxTableBase() override = default; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index 63229c19b3ce..40acc768917c 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -45,7 +45,7 @@ namespace accessibility public: AccessibleBrowseBoxTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - ::svt::IAccessibleTableProvider& _rBrowseBox, + ::vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 3968c3e07e33..4d09a3b9d2af 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -24,7 +24,7 @@ #include <extended/AccessibleGridControlTable.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <memory> namespace accessibility { @@ -40,7 +40,7 @@ class AccessibleGridControl final : public AccessibleGridControlBase AccessibleGridControl( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, - ::svt::table::IAccessibleTable& _rTable + ::vcl::table::IAccessibleTable& _rTable ); virtual ~AccessibleGridControl() override = default; @@ -125,7 +125,7 @@ private: @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the header bar. */ css::uno::Reference< css::accessibility::XAccessible > - implGetHeaderBar( ::svt::table::AccessibleTableControlObjType eObjType ); + implGetHeaderBar( ::vcl::table::AccessibleTableControlObjType eObjType ); /** This method returns one of the children that are always present: Data table, row and column header bar or corner control. @@ -163,17 +163,17 @@ private: class AccessibleGridControlAccess : public ::cppu::WeakImplHelper< css::accessibility::XAccessible > - ,public ::svt::table::IAccessibleTableControl + ,public ::vcl::table::IAccessibleTableControl { private: css::uno::Reference< css::accessibility::XAccessible > m_xParent; - ::svt::table::IAccessibleTable * m_pTable; + ::vcl::table::IAccessibleTable * m_pTable; rtl::Reference<AccessibleGridControl> m_xContext; public: AccessibleGridControlAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - ::svt::table::IAccessibleTable& _rTable + ::vcl::table::IAccessibleTable& _rTable ); /// returns the AccessibleContext belonging to this Accessible diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index 2c9cbd42fae1..4e4f86ebba1f 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -21,7 +21,7 @@ #ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX #define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <vcl/svapp.hxx> @@ -73,8 +73,8 @@ public: @param eObjType Type of accessible table control. */ AccessibleGridControlBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable, - ::svt::table::AccessibleTableControlObjType eObjType ); + ::vcl::table::IAccessibleTable& rTable, + ::vcl::table::AccessibleTableControlObjType eObjType ); protected: virtual ~AccessibleGridControlBase() override; @@ -191,7 +191,7 @@ public: // helper methods /** @return The GridControl object type. */ - inline ::svt::table::AccessibleTableControlObjType getType() const; + inline ::vcl::table::AccessibleTableControlObjType getType() const; /** Commits an event to all listeners. */ void commitEvent( @@ -258,9 +258,9 @@ protected: /** The parent accessible object. */ css::uno::Reference< css::accessibility::XAccessible > m_xParent; /** The SVT Table control. */ - ::svt::table::IAccessibleTable& m_aTable; + ::vcl::table::IAccessibleTable& m_aTable; /** The type of this object (for names, descriptions, state sets, ...). */ - ::svt::table::AccessibleTableControlObjType m_eObjType; + ::vcl::table::AccessibleTableControlObjType m_eObjType; private: /** Localized name. */ @@ -290,8 +290,8 @@ protected: */ GridControlAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable, - ::svt::table::AccessibleTableControlObjType eObjType ); + ::vcl::table::IAccessibleTable& rTable, + ::vcl::table::AccessibleTableControlObjType eObjType ); public: // XInterface @@ -316,7 +316,7 @@ private: // inlines -inline ::svt::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const +inline ::vcl::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const { return m_eObjType; } diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index b0046627b528..b487b00820c6 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -40,8 +40,8 @@ public: AccessibleGridControlHeader( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable, - ::svt::table::AccessibleTableControlObjType eObjType ); + ::vcl::table::IAccessibleTable& rTable, + ::vcl::table::AccessibleTableControlObjType eObjType ); private: virtual ~AccessibleGridControlHeader() override = default; @@ -141,12 +141,12 @@ private: inline bool AccessibleGridControlHeader::isRowBar() const { - return getType() == ::svt::table::TCTYPE_ROWHEADERBAR; + return getType() == ::vcl::table::TCTYPE_ROWHEADERBAR; } inline bool AccessibleGridControlHeader::isColumnBar() const { - return getType() == ::svt::table::TCTYPE_COLUMNHEADERBAR; + return getType() == ::vcl::table::TCTYPE_COLUMNHEADERBAR; } diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index 00076df2a484..a47c04770055 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -29,8 +29,8 @@ namespace accessibility public: AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId, const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& _rTable, - ::svt::table::AccessibleTableControlObjType _eObjType); + ::vcl::table::IAccessibleTable& _rTable, + ::vcl::table::AccessibleTableControlObjType _eObjType); /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index 18627c22e021..0a20021bc1ac 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -40,7 +40,7 @@ class AccessibleGridControlTable final : public AccessibleGridControlTableBase, public: AccessibleGridControlTable( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable); + ::vcl::table::IAccessibleTable& rTable); private: virtual ~AccessibleGridControlTable() override = default; diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index 8df02ca1c88e..4928573ef894 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx @@ -46,8 +46,8 @@ public: @param eObjType Type of table control object */ AccessibleGridControlTableBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable, - ::svt::table::AccessibleTableControlObjType eObjType ); + ::vcl::table::IAccessibleTable& rTable, + ::vcl::table::AccessibleTableControlObjType eObjType ); protected: virtual ~AccessibleGridControlTableBase() override = default; diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index 6af2e021e5c0..dfbd4a49228b 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -22,7 +22,7 @@ #include <comphelper/accessibletexthelper.hxx> #include <cppuhelper/implbase2.hxx> #include <extended/AccessibleGridControlBase.hxx> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> namespace accessibility { @@ -43,10 +43,10 @@ namespace accessibility protected: AccessibleGridControlCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - ::svt::table::IAccessibleTable& _rTable, + ::vcl::table::IAccessibleTable& _rTable, sal_Int32 _nRowPos, sal_uInt16 _nColPos, - ::svt::table::AccessibleTableControlObjType _eType + ::vcl::table::AccessibleTableControlObjType _eType ); virtual ~AccessibleGridControlCell() override = default; @@ -74,7 +74,7 @@ namespace accessibility public: AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - ::svt::table::IAccessibleTable& _rTable, + ::vcl::table::IAccessibleTable& _rTable, sal_Int32 _nRowId, sal_uInt16 _nColId); diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx index be139a494b16..0f4e291c7657 100644 --- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx @@ -21,8 +21,7 @@ #define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX #include <extended/AccessibleBrowseBoxBase.hxx> -#include <svtools/AccessibleBrowseBoxObjType.hxx> - +#include <vcl/AccessibleBrowseBoxObjType.hxx> namespace accessibility { @@ -54,11 +53,11 @@ namespace accessibility protected: AccessibleBrowseBoxCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - ::svt::IAccessibleTableProvider& _rBrowseBox, + ::vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, - ::svt::AccessibleBrowseBoxObjType _eType = ::svt::BBTYPE_TABLECELL + ::vcl::AccessibleBrowseBoxObjType _eType = ::vcl::BBTYPE_TABLECELL ); virtual ~AccessibleBrowseBoxCell() override; diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index 3713c6d162a7..5c4025de4e87 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -41,7 +41,7 @@ namespace accessibility const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible, const css::uno::Reference< css::accessibility::XAccessibleContext >& _xControlChild, - ::svt::IAccessibleTableProvider& _rBrowseBox, + ::vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos @@ -107,7 +107,7 @@ namespace accessibility m_xControlAccessible; css::uno::Reference< css::awt::XWindow > m_xFocusWindow; - ::svt::IAccessibleTableProvider* m_pBrowseBox; + ::vcl::IAccessibleTableProvider* m_pBrowseBox; sal_Int32 m_nRowPos; sal_uInt16 m_nColPos; @@ -116,7 +116,7 @@ namespace accessibility const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible, const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow, - ::svt::IAccessibleTableProvider& _rBrowseBox, + ::vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ); diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx index 1c56d867bd33..10777aad97a8 100644 --- a/accessibility/inc/extended/accessibletablistbox.hxx +++ b/accessibility/inc/extended/accessibletablistbox.hxx @@ -23,7 +23,7 @@ #include <extended/AccessibleBrowseBox.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> class SvHeaderTabListBox; @@ -39,7 +39,7 @@ typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible class AccessibleTabListBox final :public AccessibleBrowseBox ,public AccessibleTabListBox_Base - ,public ::svt::IAccessibleTabListBox + ,public ::vcl::IAccessibleTabListBox { private: VclPtr<SvHeaderTabListBox> m_pTabListBox; @@ -79,7 +79,7 @@ public: css::uno::Reference< css::accessibility::XAccessible > getHeaderBar() override { - return AccessibleBrowseBox::getHeaderBar( svt::BBTYPE_COLUMNHEADERBAR ); + return AccessibleBrowseBox::getHeaderBar( vcl::BBTYPE_COLUMNHEADERBAR ); } private: diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 064002780e2a..bfcd9876a129 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -337,10 +337,6 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> #include <svl/svldllapi.h> -#include <svtools/AccessibleBrowseBoxObjType.hxx> -#include <svtools/accessibletable.hxx> -#include <svtools/accessibletableprovider.hxx> -#include <svtools/headbar.hxx> #include <svtools/svtdllapi.h> #include <svtools/tabbar.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> @@ -380,6 +376,10 @@ #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> +#include <vcl/AccessibleBrowseBoxObjType.hxx> +#include <vcl/accessibletable.hxx> +#include <vcl/accessibletableprovider.hxx> +#include <vcl/headbar.hxx> #include <vcl/transfer.hxx> #include <vcl/treelist.hxx> #include <vcl/treelistbox.hxx> diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx new file mode 100644 index 000000000000..9a6c74a6177c --- /dev/null +++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx @@ -0,0 +1,60 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX + +#include <vcl/headbar.hxx> +#include <toolkit/awt/vclxaccessiblecomponent.hxx> +#include <toolkit/awt/vclxwindow.hxx> + +// class VCLXAccessibleHeaderBar + +typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > > + ListItems; + +class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent +{ + +public: + VclPtr<HeaderBar> m_pHeadBar; + virtual ~VCLXAccessibleHeaderBar() override; + + 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; + + + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() 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); + +private: + ListItems m_aAccessibleChildren; +}; + +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx new file mode 100644 index 000000000000..aa22e6259628 --- /dev/null +++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx @@ -0,0 +1,106 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX + +#include <com/sun/star/accessibility/XAccessible.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <comphelper/accessiblecomponenthelper.hxx> +#include <cppuhelper/implbase2.hxx> + +#include <tools/link.hxx> + +#include <vcl/vclptr.hxx> + +#include <vector> + +class HeaderBar; +class VclSimpleEvent; +class VclWindowEvent; + +namespace utl { +class AccessibleStateSetHelper; +} + + +// ---------------------------------------------------- +// class VCLXAccessibleHeaderBarItem +// ---------------------------------------------------- + +typedef ::cppu::ImplHelper2< + css::accessibility::XAccessible, + css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE; + +class VCLXAccessibleHeaderBarItem final : public comphelper::OAccessibleExtendedComponentHelper, + public VCLXAccessibleHeaderBarItem_BASE +{ +private: + VclPtr<HeaderBar> m_pHeadBar; + sal_Int32 const m_nIndexInParent; + + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + + // OCommonAccessibleComponent + virtual css::awt::Rectangle implGetBounds( ) override; + +public: + VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); + virtual ~VCLXAccessibleHeaderBarItem() override; + + // XInterface + DECLARE_XINTERFACE() + + // XTypeProvider + DECLARE_XTYPEPROVIDER() + + // 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_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 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 css::uno::Reference< css::accessibility::XAccessibleStateSet > 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 css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; +}; + +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 74f9f5903112..f6ffe537e981 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -20,7 +20,7 @@ #include <extended/AccessibleBrowseBox.hxx> #include <extended/AccessibleBrowseBoxTable.hxx> #include <extended/AccessibleBrowseBoxHeaderBar.hxx> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <sal/types.h> @@ -38,8 +38,8 @@ using namespace ::svt; AccessibleBrowseBox::AccessibleBrowseBox( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, - ::svt::IAccessibleTableProvider& _rBrowseBox ) - : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, BBTYPE_BROWSEBOX ), + ::vcl::IAccessibleTableProvider& _rBrowseBox ) + : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, vcl::BBTYPE_BROWSEBOX ), m_aCreator(_rxCreator) { m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance()); @@ -93,7 +93,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); - return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount(); + return vcl::BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount(); } @@ -106,12 +106,12 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) css::uno::Reference< css::accessibility::XAccessible > xRet; if( nChildIndex >= 0 ) { - if( nChildIndex < BBINDEX_FIRSTCONTROL ) + if( nChildIndex < vcl::BBINDEX_FIRSTCONTROL ) xRet = implGetFixedChild( nChildIndex ); else { // additional controls - nChildIndex -= BBINDEX_FIRSTCONTROL; + nChildIndex -= vcl::BBINDEX_FIRSTCONTROL; if( nChildIndex < mpBrowseBox->GetAccessibleControlCount() ) xRet = mpBrowseBox->CreateAccessibleControl( nChildIndex ); } @@ -139,7 +139,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) // try whether point is in one of the fixed children // (table, header bars, corner control) Point aPoint( VCLPoint( rPoint ) ); - for( nIndex = 0; (nIndex < BBINDEX_FIRSTCONTROL) && !xChild.is(); ++nIndex ) + for( nIndex = 0; (nIndex < vcl::BBINDEX_FIRSTCONTROL) && !xChild.is(); ++nIndex ) { css::uno::Reference< css::accessibility::XAccessible > xCurrChild( implGetFixedChild( nIndex ) ); css::uno::Reference< css::accessibility::XAccessibleComponent > @@ -185,9 +185,7 @@ tools::Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen() return mpBrowseBox->GetWindowExtentsRelative( nullptr ); } - // internal helper methods - css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::implGetTable() { if( !mxTable.is() ) @@ -198,16 +196,15 @@ css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::impl return mxTable.get(); } - css::uno::Reference< css::accessibility::XAccessible > -AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) +AccessibleBrowseBox::implGetHeaderBar(vcl::AccessibleBrowseBoxObjType eObjType) { css::uno::Reference< css::accessibility::XAccessible > xRet; rtl::Reference< AccessibleBrowseBoxHeaderBar >* pxMember = nullptr; - if( eObjType == BBTYPE_ROWHEADERBAR ) + if( eObjType == vcl::BBTYPE_ROWHEADERBAR ) pxMember = &mxRowHeaderBar; - else if( eObjType == BBTYPE_COLUMNHEADERBAR ) + else if( eObjType == vcl::BBTYPE_COLUMNHEADERBAR ) pxMember = &mxColumnHeaderBar; if( pxMember ) @@ -223,20 +220,19 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) return xRet; } - css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) { css::uno::Reference< css::accessibility::XAccessible > xRet; switch( nChildIndex ) { - case BBINDEX_COLUMNHEADERBAR: - xRet = implGetHeaderBar( BBTYPE_COLUMNHEADERBAR ); + case vcl::BBINDEX_COLUMNHEADERBAR: + xRet = implGetHeaderBar( vcl::BBTYPE_COLUMNHEADERBAR ); break; - case BBINDEX_ROWHEADERBAR: - xRet = implGetHeaderBar( BBTYPE_ROWHEADERBAR ); + case vcl::BBINDEX_ROWHEADERBAR: + xRet = implGetHeaderBar( vcl::BBTYPE_ROWHEADERBAR ); break; - case BBINDEX_TABLE: + case vcl::BBINDEX_TABLE: xRet = implGetTable(); break; } @@ -270,7 +266,7 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId, // = AccessibleBrowseBoxAccess -AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox ) +AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::IAccessibleTableProvider& _rBrowseBox ) :m_xParent( _rxParent ) ,m_rBrowseBox( _rBrowseBox ) { diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 8004451c1e2c..9759737c0759 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -18,7 +18,7 @@ */ #include <extended/AccessibleBrowseBoxBase.hxx> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> @@ -48,9 +48,9 @@ using namespace com::sun::star::accessibility::AccessibleStateType; AccessibleBrowseBoxBase::AccessibleBrowseBoxBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, + ::vcl::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - ::svt::AccessibleBrowseBoxObjType eObjType ) : + ::vcl::AccessibleBrowseBoxObjType eObjType ) : AccessibleBrowseBoxImplHelper( m_aMutex ), mxParent( rxParent ), mpBrowseBox( &rBrowseBox ), @@ -66,9 +66,9 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase( AccessibleBrowseBoxBase::AccessibleBrowseBoxBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::IAccessibleTableProvider& rBrowseBox, + ::vcl::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - ::svt::AccessibleBrowseBoxObjType eObjType, + ::vcl::AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ) : AccessibleBrowseBoxImplHelper( m_aMutex ), @@ -439,24 +439,24 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole() sal_Int16 nRole = AccessibleRole::UNKNOWN; switch ( meObjType ) { - case BBTYPE_ROWHEADERCELL: + case vcl::BBTYPE_ROWHEADERCELL: nRole = AccessibleRole::ROW_HEADER; break; - case BBTYPE_COLUMNHEADERCELL: + case vcl::BBTYPE_COLUMNHEADERCELL: nRole = AccessibleRole::COLUMN_HEADER; break; - case BBTYPE_COLUMNHEADERBAR: - case BBTYPE_ROWHEADERBAR: - case BBTYPE_TABLE: + case vcl::BBTYPE_COLUMNHEADERBAR: + case vcl::BBTYPE_ROWHEADERBAR: + case vcl::BBTYPE_TABLE: nRole = AccessibleRole::TABLE; break; - case BBTYPE_TABLECELL: + case vcl::BBTYPE_TABLECELL: nRole = AccessibleRole::TABLE_CELL; break; - case BBTYPE_BROWSEBOX: + case vcl::BBTYPE_BROWSEBOX: nRole = AccessibleRole::PANEL; break; - case BBTYPE_CHECKBOXCELL: + case vcl::BBTYPE_CHECKBOXCELL: nRole = AccessibleRole::CHECK_BOX; break; } @@ -533,15 +533,15 @@ Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessible } -BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType ) +BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType eObjType ) :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType ) { } -BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType, +BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ) :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription ) { diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 9deadb49f409..3ce5479b207e 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -19,7 +19,7 @@ #include <extended/AccessibleBrowseBoxCheckBoxCell.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> namespace accessibility { @@ -29,13 +29,13 @@ namespace accessibility using namespace ::svt; AccessibleCheckBoxCell::AccessibleCheckBoxCell(const Reference<XAccessible >& _rxParent, - IAccessibleTableProvider& _rBrowseBox, + vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos ,const TriState& _eState, bool _bIsTriState) - :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, BBTYPE_CHECKBOXCELL) + :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, vcl::BBTYPE_CHECKBOXCELL) ,m_eState(_eState) ,m_bIsTriState(_bIsTriState) { diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 0a8ac6fa3d70..15ba28a03a52 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -18,8 +18,7 @@ */ #include <extended/AccessibleBrowseBoxHeaderBar.hxx> -#include <svtools/accessibletableprovider.hxx> - +#include <vcl/accessibletableprovider.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -37,8 +36,8 @@ namespace accessibility { AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar( const Reference< XAccessible >& rxParent, - IAccessibleTableProvider& rBrowseBox, - AccessibleBrowseBoxObjType eObjType ) : + vcl::IAccessibleTableProvider& rBrowseBox, + vcl::AccessibleBrowseBoxObjType eObjType ) : AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType ) { OSL_ENSURE( isRowBar() || isColumnBar(), @@ -63,7 +62,7 @@ AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent() { - return isRowBar() ? BBINDEX_ROWHEADERBAR : BBINDEX_COLUMNHEADERBAR; + return isRowBar() ? vcl::BBINDEX_ROWHEADERBAR : vcl::BBINDEX_COLUMNHEADERBAR; } // XAccessibleComponent ------------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 15318b079f4a..8037c3386e21 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -19,7 +19,7 @@ #include <extended/AccessibleBrowseBoxHeaderCell.hxx> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> #include <extended/AccessibleBrowseBox.hxx> namespace accessibility @@ -31,9 +31,9 @@ namespace accessibility AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, - IAccessibleTableProvider& rBrowseBox, + vcl::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - AccessibleBrowseBoxObjType eObjType) + vcl::AccessibleBrowseBoxObjType eObjType) : BrowseBoxAccessibleElement(rxParent, rBrowseBox, _xFocusWindow, @@ -117,7 +117,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName() namespace { - tools::Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, bool _bOnScreen,bool _bRowBar) + tools::Rectangle getRectangle(vcl::IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, bool _bOnScreen,bool _bRowBar) { sal_Int32 nRow = 0; sal_uInt16 nCol = static_cast<sal_uInt16>(_nRowColIndex); diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index 7235d52c7405..c9d296bc1b49 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -18,7 +18,7 @@ */ #include <extended/AccessibleBrowseBoxTable.hxx> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> using ::com::sun::star::uno::Reference; @@ -36,8 +36,8 @@ namespace accessibility { AccessibleBrowseBoxTable::AccessibleBrowseBoxTable( const Reference< XAccessible >& rxParent, - IAccessibleTableProvider& rBrowseBox ) : - AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, BBTYPE_TABLE ) + vcl::IAccessibleTableProvider& rBrowseBox ) : + AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, vcl::BBTYPE_TABLE ) { } @@ -62,7 +62,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent() { osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); - return BBINDEX_TABLE; + return vcl::BBINDEX_TABLE; } // XAccessibleComponent ------------------------------------------------------- @@ -112,14 +112,14 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRo { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); - return implGetHeaderBar( BBINDEX_ROWHEADERBAR ); + return implGetHeaderBar( vcl::BBINDEX_ROWHEADERBAR ); } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnHeaders() { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); - return implGetHeaderBar( BBINDEX_COLUMNHEADERBAR ); + return implGetHeaderBar( vcl::BBINDEX_COLUMNHEADERBAR ); } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRows() diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index b881cc468105..9387b39b5ddb 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -18,7 +18,7 @@ */ #include <extended/AccessibleBrowseBoxTableBase.hxx> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> #include <tools/multisel.hxx> #include <comphelper/sequence.hxx> @@ -39,8 +39,8 @@ namespace accessibility { AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase( const Reference< XAccessible >& rxParent, - IAccessibleTableProvider& rBrowseBox, - AccessibleBrowseBoxObjType eObjType ) : + vcl::IAccessibleTableProvider& rBrowseBox, + vcl::AccessibleBrowseBoxObjType eObjType ) : BrowseBoxAccessibleElement( rxParent, rBrowseBox,nullptr, eObjType ) { } diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 305a0607a657..53c1a7aa2faa 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -19,7 +19,7 @@ #include <extended/AccessibleBrowseBoxTableCell.hxx> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> namespace accessibility @@ -65,17 +65,17 @@ namespace accessibility } AccessibleBrowseBoxTableCell::AccessibleBrowseBoxTableCell(const Reference<XAccessible >& _rxParent, - IAccessibleTableProvider& _rBrowseBox, + vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, sal_Int32 _nOffset ) :AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos ) { - m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ? sal_Int32(BBINDEX_FIRSTCONTROL) : _nOffset; + m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ? sal_Int32(vcl::BBINDEX_FIRSTCONTROL) : _nOffset; sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos, _rBrowseBox.GetColumnCount() ); - setAccessibleName( _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nIndex ) ); - setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( BBTYPE_TABLECELL, nIndex ) ); + setAccessibleName( _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nIndex ) ); + setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( vcl::BBTYPE_TABLECELL, nIndex ) ); // Need to register as event listener Reference< XComponent > xComponent(_rxParent, UNO_QUERY); if( xComponent.is() ) @@ -206,7 +206,7 @@ namespace accessibility SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); - return /*BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); + return /*vcl::BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); } sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition( ) diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index c6554d2f00cf..fe050cef4c20 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -23,24 +23,22 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp> #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <comphelper/types.hxx> - namespace accessibility { - using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using namespace ::svt; -using namespace ::svt::table; +using namespace ::vcl; +using namespace ::vcl::table; AccessibleGridControl::AccessibleGridControl( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, - ::svt::table::IAccessibleTable& _rTable ) + ::vcl::table::IAccessibleTable& _rTable ) : AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL ), m_aCreator(_rxCreator) { @@ -102,7 +100,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) { if(!m_xColumnHeaderBar.is()) { - m_xColumnHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, svt::table::TCTYPE_COLUMNHEADERBAR); + m_xColumnHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, vcl::table::TCTYPE_COLUMNHEADERBAR); } xChild = m_xColumnHeaderBar.get(); } @@ -110,7 +108,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) { if(!m_xRowHeaderBar.is()) { - m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, svt::table::TCTYPE_ROWHEADERBAR); + m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, vcl::table::TCTYPE_ROWHEADERBAR); } xChild = m_xRowHeaderBar.get(); } @@ -348,7 +346,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe AccessibleGridControlAccess::AccessibleGridControlAccess( - const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::table::IAccessibleTable& rTable ) + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::table::IAccessibleTable& rTable ) : m_xParent( rxParent ) , m_pTable( & rTable ) { diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index dbf25022ca35..5a870ff41814 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -18,7 +18,7 @@ */ #include <extended/AccessibleGridControlBase.hxx> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <cppuhelper/supportsservice.hxx> #include <sal/types.h> @@ -34,8 +34,8 @@ using ::com::sun::star::uno::Any; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -using namespace ::svt; -using namespace ::svt::table; +using namespace ::vcl; +using namespace ::vcl::table; namespace accessibility { @@ -45,8 +45,8 @@ using namespace com::sun::star::accessibility::AccessibleStateType; AccessibleGridControlBase::AccessibleGridControlBase( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable, - ::svt::table::AccessibleTableControlObjType eObjType ) : + ::vcl::table::IAccessibleTable& rTable, + ::vcl::table::AccessibleTableControlObjType eObjType ) : AccessibleGridControlImplHelper( m_aMutex ), m_xParent( rxParent ), m_aTable( rTable), @@ -430,8 +430,8 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) GridControlAccessibleElement::GridControlAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable, - ::svt::table::AccessibleTableControlObjType eObjType ) + ::vcl::table::IAccessibleTable& rTable, + ::vcl::table::AccessibleTableControlObjType eObjType ) :AccessibleGridControlBase( rxParent, rTable, eObjType ) { } diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 296e236e2a5a..b28cbdeba4c1 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -20,8 +20,7 @@ #include <extended/AccessibleGridControlHeader.hxx> #include <extended/AccessibleGridControlHeaderCell.hxx> #include <extended/AccessibleGridControlTableCell.hxx> -#include <svtools/accessibletable.hxx> - +#include <vcl/accessibletable.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -30,8 +29,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using namespace ::svt; -using namespace ::svt::table; +using namespace ::vcl; +using namespace ::vcl::table; namespace accessibility { @@ -39,8 +38,8 @@ namespace accessibility { AccessibleGridControlHeader::AccessibleGridControlHeader( const Reference< XAccessible >& rxParent, - ::svt::table::IAccessibleTable& rTable, - ::svt::table::AccessibleTableControlObjType eObjType): + ::vcl::table::IAccessibleTable& rTable, + ::vcl::table::AccessibleTableControlObjType eObjType): AccessibleGridControlTableBase( rxParent, rTable, eObjType ) { OSL_ENSURE( isRowBar() || isColumnBar(), @@ -58,14 +57,14 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) throw IndexOutOfBoundsException(); ensureIsAlive(); Reference< XAccessible > xChild; - if(m_eObjType == svt::table::TCTYPE_COLUMNHEADERBAR) + if(m_eObjType == vcl::table::TCTYPE_COLUMNHEADERBAR) { - AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, svt::table::TCTYPE_COLUMNHEADERCELL); + AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, vcl::table::TCTYPE_COLUMNHEADERCELL); xChild = pColHeaderCell; } - else if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR) + else if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR) { - AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, svt::table::TCTYPE_ROWHEADERCELL); + AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, vcl::table::TCTYPE_ROWHEADERCELL); xChild = pRowHeaderCell; } return xChild; @@ -74,7 +73,7 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent() { ensureIsAlive(); - if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader()) + if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader()) return 1; else return 0; @@ -212,14 +211,14 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild( sal_Int32 nRow, sal_uInt32 nColumnPos ) { Reference< XAccessible > xChild; - if(m_eObjType == svt::table::TCTYPE_COLUMNHEADERBAR) + if(m_eObjType == vcl::table::TCTYPE_COLUMNHEADERBAR) { - AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable, svt::table::TCTYPE_COLUMNHEADERCELL); + AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable, vcl::table::TCTYPE_COLUMNHEADERCELL); xChild = pColHeaderCell; } - else if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR) + else if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR) { - AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nRow, this, m_aTable, svt::table::TCTYPE_ROWHEADERCELL); + AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nRow, this, m_aTable, vcl::table::TCTYPE_ROWHEADERCELL); xChild = pRowHeaderCell; } return xChild; diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 34a1294811ba..d2d47cbcce27 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -17,9 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <extended/AccessibleGridControlHeaderCell.hxx> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <extended/AccessibleGridControl.hxx> namespace accessibility @@ -27,8 +26,8 @@ namespace accessibility using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - using namespace ::svt; - using namespace ::svt::table; + using namespace ::vcl; + using namespace ::vcl::table; AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 505c2cb77e52..6e5e9d6def79 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -19,8 +19,7 @@ #include <extended/AccessibleGridControlTable.hxx> #include <extended/AccessibleGridControlTableCell.hxx> -#include <svtools/accessibletable.hxx> - +#include <vcl/accessibletable.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -28,8 +27,8 @@ using ::com::sun::star::uno::Any; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using namespace ::svt; -using namespace ::svt::table; +using namespace ::vcl; +using namespace ::vcl::table; namespace accessibility { diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 68bee622413d..b34a207d1bdf 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -18,19 +18,18 @@ */ #include <extended/AccessibleGridControlTableBase.hxx> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <tools/multisel.hxx> #include <comphelper/sequence.hxx> - using css::uno::Reference; using css::uno::Sequence; using css::uno::Any; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using namespace ::svt; -using namespace ::svt::table; +using namespace ::vcl; +using namespace ::vcl::table; namespace accessibility { diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index db605e334e62..3eed001d8df0 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -17,9 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <extended/AccessibleGridControlTableCell.hxx> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <tools/gen.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> @@ -42,16 +41,16 @@ namespace accessibility using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; using namespace ::com::sun::star::accessibility; - using namespace ::svt; - using namespace ::svt::table; + using namespace ::vcl; + using namespace ::vcl::table; // = AccessibleGridControlCell AccessibleGridControlCell::AccessibleGridControlCell( - const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::table::IAccessibleTable& _rTable, - sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::svt::table::AccessibleTableControlObjType _eType ) + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::table::IAccessibleTable& _rTable, + sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::vcl::table::AccessibleTableControlObjType _eType ) :AccessibleGridControlBase( _rxParent, _rTable, _eType ) ,m_nRowPos( _nRowPos ) ,m_nColPos( _nColPos ) @@ -95,7 +94,7 @@ namespace accessibility } AccessibleGridControlTableCell::AccessibleGridControlTableCell(const css::uno::Reference<XAccessible >& _rxParent, - ::svt::table::IAccessibleTable& _rTable, + ::vcl::table::IAccessibleTable& _rTable, sal_Int32 _nRowPos, sal_uInt16 _nColPos) :AccessibleGridControlCell( _rxParent, _rTable, _nRowPos, _nColPos, TCTYPE_TABLECELL ) diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index abf3a4cf382a..6240238379bf 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -18,7 +18,7 @@ */ #include <sal/types.h> -#include <svtools/accessibletableprovider.hxx> +#include <vcl/accessibletableprovider.hxx> #include <extended/accessiblebrowseboxcell.hxx> namespace accessibility @@ -30,9 +30,9 @@ namespace accessibility // AccessibleBrowseBoxCell AccessibleBrowseBoxCell::AccessibleBrowseBoxCell( - const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::svt::AccessibleBrowseBoxObjType _eType ) + sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::vcl::AccessibleBrowseBoxObjType _eType ) :AccessibleBrowseBoxBase( _rxParent, _rBrowseBox, _xFocusWindow, _eType ) ,m_nRowPos( _nRowPos ) ,m_nColPos( _nColPos ) @@ -40,7 +40,7 @@ namespace accessibility // set accessible name here, because for that we need the position of the cell // and so the base class isn't capable of doing this sal_Int32 nPos = _nRowPos * _rBrowseBox.GetColumnCount() + _nColPos; - OUString aAccName = _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nPos ); + OUString aAccName = _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nPos ); implSetName( aAccName ); } diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index ff5ddbde89eb..67e9ea8ce464 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -39,7 +39,7 @@ namespace accessibility const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible, const css::uno::Reference< css::accessibility::XAccessibleContext >& _xControlChild, - ::svt::IAccessibleTableProvider& _rBrowseBox, + ::vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos) @@ -185,7 +185,7 @@ namespace accessibility EditBrowseBoxTableCellAccess::EditBrowseBoxTableCellAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible, const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow, - ::svt::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) + ::vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) :WeakComponentImplHelper( m_aMutex ) ,m_xParent( _rxParent ) ,m_xControlAccessible( _rxControlAccessible ) diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index ddbc03825c92..4ed0b54b90bd 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -20,7 +20,7 @@ #include <extended/accessibletablistbox.hxx> #include <extended/accessibletablistboxtable.hxx> -#include <svtools/svtabbx.hxx> +#include <vcl/svtabbx.hxx> namespace accessibility @@ -40,7 +40,6 @@ namespace accessibility AccessibleTabListBox::AccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) :AccessibleBrowseBox( rxParent, nullptr, rBox ) ,m_pTabListBox( &rBox ) - { osl_atomic_increment( &m_refCount ); { @@ -78,13 +77,11 @@ namespace accessibility return 2; // header and table } - Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() { return this; } - Reference< XAccessible > SAL_CALL AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex ) { @@ -98,7 +95,7 @@ namespace accessibility if (nChildIndex == 0) { //! so far the actual implementation object only supports column headers - xRet = implGetHeaderBar( ::svt::BBTYPE_COLUMNHEADERBAR ); + xRet = implGetHeaderBar( ::vcl::BBTYPE_COLUMNHEADERBAR ); } else if (nChildIndex == 1) xRet = implGetTable(); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index d062145a698c..8c8dd1156b2f 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -21,7 +21,7 @@ #include <extended/accessibletablistboxtable.hxx> #include <extended/AccessibleBrowseBoxTableCell.hxx> #include <extended/AccessibleBrowseBoxCheckBoxCell.hxx> -#include <svtools/svtabbx.hxx> +#include <vcl/svtabbx.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 9ce18c4924f3..aeca8b5d40ad 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -21,7 +21,7 @@ #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/helper/accessiblefactory.hxx> -#include <svtools/accessiblefactory.hxx> +#include <vcl/accessiblefactory.hxx> #include <standard/vclxaccessiblebutton.hxx> #include <standard/vclxaccessiblecheckbox.hxx> #include <standard/vclxaccessibledropdowncombobox.hxx> @@ -30,6 +30,7 @@ #include <standard/vclxaccessibleedit.hxx> #include <standard/vclxaccessiblefixedhyperlink.hxx> #include <standard/vclxaccessiblefixedtext.hxx> +#include <standard/vclxaccessibleheaderbar.hxx> #include <standard/vclxaccessiblelistbox.hxx> #include <standard/vclxaccessiblemenu.hxx> #include <standard/vclxaccessibleradiobutton.hxx> @@ -55,9 +56,8 @@ #include <extended/accessibleeditbrowseboxcell.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> -#include <vcl/treelistbox.hxx> #include <extended/AccessibleGridControl.hxx> -#include <svtools/accessibletable.hxx> +#include <vcl/accessibletable.hxx> #include <vcl/popupmenuwindow.hxx> #include <floatingwindowaccessible.hxx> @@ -66,8 +66,8 @@ using namespace ::accessibility; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::accessibility; -using namespace ::svt; -using namespace ::svt::table; +using namespace ::vcl; +using namespace ::vcl::table; namespace { @@ -79,7 +79,7 @@ bool hasFloatingChild(vcl::Window *pWindow) // IAccessibleFactory class AccessibleFactory :public ::toolkit::IAccessibleFactory - ,public ::svt::IAccessibleFactory + ,public ::vcl::IAccessibleFactory { public: AccessibleFactory(); @@ -106,21 +106,23 @@ public: virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXToolBox* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > + createAccessibleContext( VCLXHeaderBar* _pXWindow ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXWindow* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessible( Menu* _pMenu, bool _bIsMenuBar ) override; - // ::svt::IAccessibleFactory - virtual IAccessibleTabListBox* + // ::vcl::IAccessibleFactory + virtual vcl::IAccessibleTabListBox* createAccessibleTabListBox( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const override; - virtual IAccessibleBrowseBox* + virtual vcl::IAccessibleBrowseBox* createAccessibleBrowseBox( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - IAccessibleTableProvider& _rBrowseBox + vcl::IAccessibleTableProvider& _rBrowseBox ) const override; virtual IAccessibleTableControl* @@ -146,16 +148,22 @@ public: ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > + createAccessibleTreeListBox( + SvTreeListBox& _rListBox, + const css::uno::Reference< css::accessibility::XAccessible >& _xParent + ) const override; + + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxHeaderBar( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - IAccessibleTableProvider& _rOwningTable, - AccessibleBrowseBoxObjType _eObjType + vcl::IAccessibleTableProvider& _rOwningTable, + vcl::AccessibleBrowseBoxObjType _eObjType ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - IAccessibleTableProvider& _rBrowseBox, + vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, @@ -166,15 +174,15 @@ public: createAccessibleBrowseBoxHeaderCell( sal_Int32 _nColumnRowId, const css::uno::Reference< css::accessibility::XAccessible >& rxParent, - IAccessibleTableProvider& _rBrowseBox, + vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - AccessibleBrowseBoxObjType _eObjType + vcl::AccessibleBrowseBoxObjType _eObjType ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleCheckBoxCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, - IAccessibleTableProvider& _rBrowseBox, + vcl::IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, @@ -187,7 +195,7 @@ public: const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible, const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow, - IAccessibleTableProvider& _rBrowseBox, + vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) const override; @@ -309,23 +317,6 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleTabControl( _pXWindow )); } - else if ( nType == WindowType::TREELISTBOX ) - { - vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); - DBG_ASSERT(pParent, "SvTreeListBox::CreateAccessible - accessible parent not found"); - if (pParent) - { - css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible(); - DBG_ASSERT(xAccParent.is(), "SvTreeListBox::CreateAccessible - accessible parent not found"); - if (xAccParent.is()) - { - xContext = static_cast<XAccessibleContext*>(new AccessibleListBox(*static_cast<SvTreeListBox*>(pWindow.get()), xAccParent)); - return xContext; - } - } - xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleComponent( _pXWindow )); - } - else if ( nType == WindowType::TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL ) { xContext = new VCLXAccessibleTabPageWindow( _pXWindow ); @@ -370,14 +361,19 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX return new VCLXAccessibleToolBox( _pXWindow ); } -IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox( +Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXHeaderBar* _pXWindow ) +{ + return new VCLXAccessibleHeaderBar(_pXWindow); +} + +vcl::IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const { return new AccessibleTabListBox( rxParent, rBox ); } -IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox( - const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const +vcl::IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox( + const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox ) const { return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox ); } @@ -405,15 +401,21 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowCon return new Document( pVclXWindow, rEngine, rView ); } +Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox( + SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const +{ + return new AccessibleListBox( _rListBox, _xParent ); +} + Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar( - const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable, - AccessibleBrowseBoxObjType _eObjType ) const + const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rOwningTable, + vcl::AccessibleBrowseBoxObjType _eObjType ) const { return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType ); } Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell( - const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, + const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const { return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _xFocusWindow, @@ -421,15 +423,15 @@ Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell( } Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell( - sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox, - const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const + sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, + const Reference< XWindow >& _xFocusWindow, vcl::AccessibleBrowseBoxObjType _eObjType ) const { return new AccessibleBrowseBoxHeaderCell( _nColumnRowId, rxParent, _rBrowseBox, _xFocusWindow, _eObjType ); } Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell( - const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, + const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, bool _bIsTriState ) const { @@ -439,7 +441,7 @@ Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell( Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess( const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible, - const Reference< XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox, + const Reference< XWindow >& _rxFocusWindow, vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) const { return new EditBrowseBoxTableCellAccess( _rxParent, _rxControlAccessible, @@ -475,7 +477,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* getSvtAccessibilityComponentFactory() { - ::svt::IAccessibleFactory* pFactory = new AccessibleFactory; + ::vcl::IAccessibleFactory* pFactory = new AccessibleFactory; pFactory->acquire(); return pFactory; } diff --git a/accessibility/source/standard/vclxaccessibleheaderbar.cxx b/accessibility/source/standard/vclxaccessibleheaderbar.cxx new file mode 100644 index 000000000000..07ddf5e8e80b --- /dev/null +++ b/accessibility/source/standard/vclxaccessibleheaderbar.cxx @@ -0,0 +1,141 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <standard/vclxaccessibleheaderbar.hxx> +#include <standard/vclxaccessibleheaderbaritem.hxx> + +#include <toolkit/awt/vclxwindows.hxx> +#include <vcl/headbar.hxx> +#include <unotools/accessiblestatesethelper.hxx> +#include <com/sun/star/accessibility/AccessibleStateType.hpp> +#include <com/sun/star/accessibility/AccessibleEventId.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <cppuhelper/typeprovider.hxx> +#include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <vcl/svapp.hxx> + +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::accessibility; +using namespace ::comphelper; + +VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar( VCLXWindow* pVCLWindow ) + :VCLXAccessibleComponent( pVCLWindow ) + ,m_pHeadBar(nullptr) +{ + m_pHeadBar = GetAs< HeaderBar >(); +} + + +VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar() +{ +} + + +// XServiceInfo + + +OUString VCLXAccessibleHeaderBar::getImplementationName() +{ + return OUString( "com.sun.star.comp.toolkit.AccessibleHeaderBar" ); +} + + +Sequence< OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() +{ + Sequence<OUString> aNames { "com.sun.star.awt.AccessibleHeaderBar" }; + return aNames; +} + +// =======XAccessibleContext======= + +sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount( ) +{ + SolarMutexGuard g; + + sal_Int32 nCount = 0; + if ( m_pHeadBar ) + nCount = m_pHeadBar->GetItemCount(); + + return nCount; +} +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i ) +{ + SolarMutexGuard g; + + if ( i < 0 || i >= getAccessibleChildCount() ) + throw IndexOutOfBoundsException(); + + Reference< XAccessible > xChild; + // search for the child + if ( static_cast<sal_uInt16>(i) >= m_aAccessibleChildren.size() ) + xChild = CreateChild (i); + else + { + xChild = m_aAccessibleChildren[i]; + if ( !xChild.is() ) + xChild = CreateChild (i); + } + return xChild; +} + +sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole( ) +{ + return css::accessibility::AccessibleRole::LIST; +} + +void SAL_CALL VCLXAccessibleHeaderBar::disposing() +{ + SolarMutexGuard g; + + ListItems().swap(m_aAccessibleChildren); + VCLXAccessibleComponent::disposing(); +} + +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() ) + { + m_aAccessibleChildren.resize(nPos + 1); + + // insert into the container + xChild = new VCLXAccessibleHeaderBarItem(m_pHeadBar, i); + m_aAccessibleChildren[nPos] = xChild; + } + else + { + 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() ) + { + xChild = new VCLXAccessibleHeaderBarItem(m_pHeadBar, i); + m_aAccessibleChildren[nPos] = xChild; + } + } + return xChild; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx new file mode 100644 index 000000000000..250ea22f43dc --- /dev/null +++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx @@ -0,0 +1,273 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#include <standard/vclxaccessibleheaderbaritem.hxx> + +#include <vcl/headbar.hxx> + +#include <com/sun/star/accessibility/AccessibleEventId.hpp> +#include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <com/sun/star/accessibility/AccessibleStateType.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <cppuhelper/supportsservice.hxx> + +#include <unotools/accessiblestatesethelper.hxx> +#include <unotools/accessiblerelationsethelper.hxx> +#include <vcl/svapp.hxx> +#include <vcl/settings.hxx> +#include <toolkit/awt/vclxfont.hxx> +#include <toolkit/helper/convert.hxx> + +#include <vector> + +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; + + +// class AccessibleTabBar + + +VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ) + :m_pHeadBar( pHeadBar ) + ,m_nIndexInParent(_nIndexInParent + 1) + +{ +} + +VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem() +{ +} + +void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) +{ + if ( m_pHeadBar ) + { + if ( m_pHeadBar->IsEnabled() ) + rStateSet.AddState( AccessibleStateType::ENABLED ); + + if ( m_pHeadBar->IsVisible() ) + { + rStateSet.AddState( AccessibleStateType::VISIBLE ); + } + rStateSet.AddState( AccessibleStateType::SELECTABLE ); + rStateSet.AddState( AccessibleStateType::RESIZABLE ); + } +} + +// OCommonAccessibleComponent +awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() +{ + awt::Rectangle aBounds; + OExternalLockGuard aGuard( this ); + + if ( m_pHeadBar ) + aBounds = AWTRectangle( m_pHeadBar->GetItemRect( sal_uInt16( m_nIndexInParent ) ) ); + + return aBounds; +} + + +// XInterface + + +IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE ) + + +// XTypeProvider + + +IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE ) + + +// XServiceInfo +OUString VCLXAccessibleHeaderBarItem::getImplementationName() +{ + return OUString("com.sun.star.comp.svtools.AccessibleHeaderBarItem"); +} + +sal_Bool VCLXAccessibleHeaderBarItem::supportsService( const OUString& rServiceName ) +{ + return cppu::supportsService( this, rServiceName ); +} + +Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames() +{ + Sequence< OUString > aNames { "com.sun.star.awt.AccessibleHeaderBarItem" }; + return aNames; +} + +// XAccessible +Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContext() +{ + return this; +} + + +// XAccessibleContext + + +sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() +{ + return 0; +} + + +Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) +{ + OExternalLockGuard aGuard( this ); + + if ( i < 0 || i >= getAccessibleChildCount() ) + throw IndexOutOfBoundsException(); + + return Reference< XAccessible >(); +} + + +Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() +{ + OExternalLockGuard aGuard( this ); + + Reference< XAccessible > xParent; + if ( m_pHeadBar ) + { + xParent = m_pHeadBar->GetAccessible(); + } + + return xParent; +} + + +sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() +{ + OExternalLockGuard aGuard( this ); + return m_nIndexInParent - 1; +} + + +sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() +{ + return AccessibleRole::COLUMN_HEADER; +} + + +OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() +{ + return OUString(); +} + + +OUString VCLXAccessibleHeaderBarItem::getAccessibleName() +{ + OExternalLockGuard aGuard( this ); + + OUString sName; + if(m_pHeadBar) + sName = m_pHeadBar->GetItemText( sal_uInt16( m_nIndexInParent ) ); + return sName; +} + + +Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet( ) +{ + OExternalLockGuard aGuard( this ); + + utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; + Reference< XAccessibleRelationSet > xSet = pRelationSetHelper; + return xSet; +} + + +Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet( ) +{ + OExternalLockGuard aGuard( this ); + + utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; + Reference< XAccessibleStateSet > xSet = pStateSetHelper; + + if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) + { + FillAccessibleStateSet( *pStateSetHelper ); + } + else + { + pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + } + + return xSet; +} + + +css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() +{ + OExternalLockGuard aGuard( this ); + + return Application::GetSettings().GetLanguageTag().getLocale(); +} + + +// XAccessibleComponent + + +Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( const awt::Point& ) +{ + return Reference< XAccessible >(); +} + + +sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() +{ + return 0; +} + + +sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() +{ + return 0; +} + + +// XAccessibleExtendedComponent + + +Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() +{ + return Reference< awt::XFont >(); +} + + +OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() +{ + return OUString(); +} + + +OUString VCLXAccessibleHeaderBarItem::getToolTipText() +{ + OExternalLockGuard aGuard( this ); + + OUString sText; + if ( m_pHeadBar ) + sText = m_pHeadBar->GetQuickHelpText(); + + return sText; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |