diff options
Diffstat (limited to 'accessibility/source/extended')
19 files changed, 111 insertions, 126 deletions
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> |