diff options
18 files changed, 214 insertions, 226 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 89513226d9a5..66b49a84e209 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -169,7 +169,7 @@ public: // XAccessibleComponent --------------------------------------------------- /** @return - <TRUE/>, if the point lies within the bounding box of this object. */ + TRUE, if the point lies within the bounding box of this object. */ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) throw ( css::uno::RuntimeException, std::exception ) override; @@ -255,7 +255,7 @@ public: sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ); - /** @return <TRUE/>, if the object is not disposed or disposing. */ + /** @return TRUE, if the object is not disposed or disposing. */ bool isAlive() const; protected: @@ -265,7 +265,7 @@ protected: its parent accessible window. Derived classes may implement different behaviour. @attention This method requires locked mutex's and a living object. - @return <TRUE/>, if the object is really showing. */ + @return TRUE, if the object is really showing. */ bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx index 544ba078b2ba..3b1260ceeaea 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -54,7 +54,7 @@ protected: virtual ~AccessibleBrowseBoxHeaderBar(); public: - // XAccessibleContext ----------------------------------------------------- + // XAccessibleContext /** @return The XAccessible interface of the specified child. @@ -69,7 +69,7 @@ public: getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) override; - // XAccessibleComponent --------------------------------------------------- + // XAccessibleComponent /** @return The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL @@ -80,7 +80,7 @@ public: virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override; - // XAccessibleTable ------------------------------------------------------- + // XAccessibleTable /** @return The description text of the specified row. */ virtual OUString SAL_CALL @@ -113,12 +113,12 @@ public: getSelectedAccessibleColumns() throw ( css::uno::RuntimeException, std::exception ) override; - /** @return <TRUE/>, if the specified row is completely selected. */ + /** @return TRUE, if the specified row is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - /** @return <TRUE/>, if the specified column is completely selected. */ + /** @return TRUE, if the specified column is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; @@ -130,19 +130,19 @@ public: throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - /** @return <TRUE/>, if the specified cell is selected. */ + /** @return TRUE, if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - // XAccessibleSelection --------------------------------------------------- + // XAccessibleSelection /** Selects the specified child (row or column of the table). */ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - /** @return <TRUE/>, if the specified child (row/column) is selected. */ + /** @return TRUE, if the specified child (row/column) is selected. */ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; @@ -170,7 +170,7 @@ public: throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - // XInterface ------------------------------------------------------------- + // XInterface /** Queries for a new interface. */ css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) @@ -182,7 +182,7 @@ public: /** Releases the object (calls release() on base class). */ virtual void SAL_CALL release() throw () override; - // XServiceInfo ----------------------------------------------------------- + // XServiceInfo /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() @@ -193,7 +193,7 @@ public: throw ( css::uno::RuntimeException, std::exception ) override; protected: - // internal virtual methods ----------------------------------------------- + // internal virtual methods /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ @@ -209,11 +209,11 @@ protected: @return The count of used columns. */ virtual sal_Int32 implGetColumnCount() const override; - // internal helper methods ------------------------------------------------ + // internal helper methods - /** @return <TRUE/>, if the objects is a header bar for rows. */ + /** @return TRUE, if the objects is a header bar for rows. */ inline bool isRowBar() const; - /** @return <TRUE/>, if the objects is a header bar for columns. */ + /** @return TRUE, if the objects is a header bar for columns. */ inline bool isColumnBar() const; /** Returns the specified row or column. Uses one of the parameters, @@ -237,7 +237,7 @@ protected: throw ( css::lang::IndexOutOfBoundsException ); }; -// inlines -------------------------------------------------------------------- +// inlines inline bool AccessibleBrowseBoxHeaderBar::isRowBar() const { diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx index 393cac094421..d079292062a1 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx @@ -37,7 +37,7 @@ typedef ::cppu::ImplHelper3< /** Base class for list- and combo boxes. This class manages the box' children. The classed derived from this one have only to implement the - <member>IsValid</member> method and return the correct implementation name. + IsValid method and return the correct implementation name. */ class VCLXAccessibleBox : public VCLXAccessibleComponent, @@ -47,7 +47,7 @@ public: enum BoxType {COMBOBOX, LISTBOX}; /** The constructor is initialized with the box type which may be - either <const>COMBOBOX</const> or <const>LISTBOX</const> and a flag + either COMBOBOX or LISTBOX and a flag indicating whether the box is a drop down box. */ VCLXAccessibleBox (VCLXWindow* pVCLXindow, BoxType aType, bool bIsDropDownBox); @@ -74,14 +74,13 @@ public: sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; /** For drop down list boxes the text field is a not editable - <type>VCLXAccessibleTextField</type>, for combo boxes it is an - editable <type>VLCAccessibleEdit</type>. + VCLXAccessibleTextField, for combo boxes it is an + editable VLCAccessibleEdit. */ css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - /** The role is always <const - scope="com::sun::star::accessibility">AccessibleRole::COMBO_BOX</const>. + /** The role is always AccessibleRole::COMBO_BOX. */ sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; @@ -102,7 +101,7 @@ public: throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; /** The returned string is associated with resource - <const>RID_STR_ACC_ACTION_TOGGLEPOPUP</const>. + RID_STR_ACC_ACTION_TOGGLEPOPUP. */ virtual OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, @@ -168,7 +167,7 @@ protected: virtual ~VCLXAccessibleBox(); - /** Returns </true> when the object is valid. + /** Returns true when the object is valid. */ virtual bool IsValid() const = 0; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx index 8744a2419f5f..082bd30d0990 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx @@ -26,9 +26,9 @@ /** The accessible combobox has two children. The first is the text field - represented by an object of the <type>VCLXAccessibleEdit</type> class. + represented by an object of the VCLXAccessibleEdit class. The second is the list containing all items and is represented by an - object of the <type>VCLXAccessibleList</type> class which does not + object of the VCLXAccessibleList class which does not support selection at the moment. */ class VCLXAccessibleComboBox diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx index 55c02ab6d56c..ab6d71bed276 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx @@ -26,9 +26,9 @@ /** The accessible drop down combobox has two children. The first is the text field represented by an object of the - <type>VCLXAccessibleEdit</type> class. The second is the list + VCLXAccessibleEdit class. The second is the list containing all items and is represented by an object of the - <type>VCLXAccessibleList</type> class which does not support selection + VCLXAccessibleList class which does not support selection at the moment. */ class VCLXAccessibleDropDownComboBox : public VCLXAccessibleBox diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx index d2d3251908a5..23f1ab4ba9b0 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx @@ -25,9 +25,9 @@ /** The accessible drop down combobox has two children. The first is the text field represented by an object of the - <type>VCLXAccessibleTextField</type> class which can not be edited. The + VCLXAccessibleTextField class which can not be edited. The second is the list containing all items and is represented by an object - of the <type>VCLXAccessibleListBoxList</type> class which does support + of the VCLXAccessibleListBoxList class which does support selection. */ class VCLXAccessibleDropDownListBox : public VCLXAccessibleBox diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index bbd19d49f0ca..86b3a04238f5 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -61,7 +61,7 @@ public: css::accessibility::XAccessible >& _xParent); /** The index that is passed to this method is returned on following - calls to <member>getAccessibleIndexInParent</member>. + calls to getAccessibleIndexInParent. */ void SetIndexInParent (sal_Int32 nIndex); @@ -103,7 +103,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; /** The index returned as index in parent is always the one set with the - <member>SetIndexInParent()</member> method. + SetIndexInParent() method. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; @@ -158,8 +158,8 @@ protected: virtual void SAL_CALL disposing() override; /** This method adds the states - <const>AccessibleStateType::FOCUSABLE</const> and possibly - <const>AccessibleStateType::MULTI_SELECTABLE</const> to the state set + AccessibleStateType::FOCUSABLE and possibly + AccessibleStateType::MULTI_SELECTABLE to the state set of the base classes. */ virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) override; @@ -173,8 +173,7 @@ protected: /** Call this method when the item list has been changed, i.e. items have been deleted or inserted. @param bItemInserted - Indicate whether items have been inserted (<TRUE/>) or removed - (<FALSE/>). + Indicate whether items have been inserted (TRUE) or removed (FALSE). @param nIndex Index of the new or removed item. A value of -1 indicates that the whole list has been cleared. @@ -185,7 +184,7 @@ protected: virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; private: - /** We need to save the accessible parent to return it in <type>getAccessibleParent()</type>, + /** We need to save the accessible parent to return it in getAccessibleParent(), because this method of the base class returns the wrong parent. */ css::uno::Reference< css::accessibility::XAccessible > m_xParent; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx index a9921c78d5df..d015b4b79a4d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx @@ -28,7 +28,7 @@ /** The accessible drop down combobox has one children. It is the list containing all items and is represented by an object of the - <type>VCLXAccessibleListBoxList</type> class which does support + VCLXAccessibleListBoxList class which does support selection. */ class VCLXAccessibleListBox : public VCLXAccessibleBox diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx index a91b92681c78..58ec93b94392 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx @@ -24,13 +24,11 @@ #include <cppuhelper/implbase1.hxx> -typedef ::cppu::ImplHelper1< - css::accessibility::XAccessible - > VCLXAccessible_BASE; +typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BASE; /** This class represents non editable text fields. The object passed to - the constructor is expected to be a list (a <type>ListBox</type> to be + the constructor is expected to be a list (a ListBox to be more specific). From this always the selected item is token to be made accessible by this class. When the selected item changes then also the exported text changes. @@ -78,12 +76,12 @@ protected: virtual ~VCLXAccessibleTextField(); /** With this method the text of the currently selected item is made - available to the <type>VCLXAccessibleTextComponent</type> base class. + available to the VCLXAccessibleTextComponent base class. */ OUString implGetText() override; private: - /** We need to save the accessible parent to return it in <type>getAccessibleParent()</type>, + /** We need to save the accessible parent to return it in getAccessibleParent(), because this method of the base class returns the wrong parent. */ css::uno::Reference< css::accessibility::XAccessible > m_xParent; diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 758b36c1f6ad..c62135998593 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -23,14 +23,12 @@ #include <svtools/accessibletableprovider.hxx> #include <comphelper/types.hxx> #include <toolkit/helper/vclunohelper.hxx> - +#include <sal/types.h> namespace accessibility { - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -41,27 +39,27 @@ using namespace ::svt; class AccessibleBrowseBoxImpl { public: - /// the XAccessible which created the AccessibleBrowseBox - WeakReference< XAccessible > m_aCreator; + /// the css::accessibility::XAccessible which created the AccessibleBrowseBox + css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; /** The data table child. */ - Reference< css::accessibility::XAccessible > mxTable; + css::uno::Reference< css::accessibility::XAccessible > mxTable; AccessibleBrowseBoxTable* m_pTable; /** The header bar for rows ("handle column"). */ - Reference< css::accessibility::XAccessible > mxRowHeaderBar; + css::uno::Reference< css::accessibility::XAccessible > mxRowHeaderBar; AccessibleBrowseBoxHeaderBar* m_pRowHeaderBar; /** The header bar for columns (first row of the table). */ - Reference< css::accessibility::XAccessible > mxColumnHeaderBar; + css::uno::Reference< css::accessibility::XAccessible > mxColumnHeaderBar; AccessibleBrowseBoxHeaderBar* m_pColumnHeaderBar; }; -// Ctor/Dtor/disposing -------------------------------------------------------- +// Ctor/Dtor/disposing AccessibleBrowseBox::AccessibleBrowseBox( - const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxCreator, - IAccessibleTableProvider& _rBrowseBox ) + 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 ) { m_xImpl.reset( new AccessibleBrowseBoxImpl() ); @@ -70,10 +68,10 @@ AccessibleBrowseBox::AccessibleBrowseBox( m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance()); } -void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator ) +void AccessibleBrowseBox::setCreator( const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator ) { #if OSL_DEBUG_LEVEL > 0 - Reference< XAccessible > xCreator(m_xImpl->m_aCreator); + css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator); OSL_ENSURE( !xCreator.is(), "accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!" ); #endif m_xImpl->m_aCreator = _rxCreator; @@ -94,15 +92,14 @@ void SAL_CALL AccessibleBrowseBox::disposing() m_xImpl->m_pRowHeaderBar = nullptr; m_xImpl->m_aCreator.clear(); - Reference< XAccessible > xTable = m_xImpl->mxTable; + css::uno::Reference< css::accessibility::XAccessible > xTable = m_xImpl->mxTable; - Reference< XComponent > xComp( m_xImpl->mxTable, UNO_QUERY ); + css::uno::Reference< XComponent > xComp( m_xImpl->mxTable, UNO_QUERY ); if ( xComp.is() ) { xComp->dispose(); } -//! ::comphelper::disposeComponent(m_xImpl->mxTable); ::comphelper::disposeComponent(m_xImpl->mxRowHeaderBar); ::comphelper::disposeComponent(m_xImpl->mxColumnHeaderBar); @@ -110,7 +107,7 @@ void SAL_CALL AccessibleBrowseBox::disposing() } -// XAccessibleContext --------------------------------------------------------- +// css::accessibility::XAccessibleContext sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() throw ( uno::RuntimeException, std::exception ) @@ -122,7 +119,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() } -Reference< XAccessible > SAL_CALL +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { @@ -130,7 +127,7 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); - Reference< XAccessible > xRet; + css::uno::Reference< css::accessibility::XAccessible > xRet; if( nChildIndex >= 0 ) { if( nChildIndex < BBINDEX_FIRSTCONTROL ) @@ -149,9 +146,9 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) return xRet; } -// XAccessibleComponent ------------------------------------------------------- +// css::accessibility::XAccessibleComponent -Reference< XAccessible > SAL_CALL +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException, std::exception ) { @@ -159,7 +156,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); - Reference< XAccessible > xChild; + css::uno::Reference< css::accessibility::XAccessible > xChild; sal_Int32 nIndex = 0; if( mpBrowseBox->ConvertPointToControlIndex( nIndex, VCLPoint( rPoint ) ) ) xChild = mpBrowseBox->CreateAccessibleControl( nIndex ); @@ -170,8 +167,8 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) Point aPoint( VCLPoint( rPoint ) ); for( nIndex = 0; (nIndex < BBINDEX_FIRSTCONTROL) && !xChild.is(); ++nIndex ) { - Reference< XAccessible > xCurrChild( implGetFixedChild( nIndex ) ); - Reference< XAccessibleComponent > + css::uno::Reference< css::accessibility::XAccessible > xCurrChild( implGetFixedChild( nIndex ) ); + css::uno::Reference< css::accessibility::XAccessibleComponent > xCurrChildComp( xCurrChild, uno::UNO_QUERY ); if( xCurrChildComp.is() && @@ -192,7 +189,7 @@ void SAL_CALL AccessibleBrowseBox::grabFocus() mpBrowseBox->GrabFocus(); } -// XServiceInfo --------------------------------------------------------------- +// XServiceInfo OUString SAL_CALL AccessibleBrowseBox::getImplementationName() throw ( uno::RuntimeException, std::exception ) @@ -201,7 +198,7 @@ OUString SAL_CALL AccessibleBrowseBox::getImplementationName() } -// internal virtual methods --------------------------------------------------- +// internal virtual methods Rectangle AccessibleBrowseBox::implGetBoundingBox() { @@ -217,9 +214,9 @@ Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen() } -// internal helper methods ---------------------------------------------------- +// internal helper methods -Reference< XAccessible > AccessibleBrowseBox::implGetTable() +css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::implGetTable() { if( !m_xImpl->mxTable.is() ) { @@ -231,11 +228,11 @@ Reference< XAccessible > AccessibleBrowseBox::implGetTable() } -Reference< XAccessible > +css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) { - Reference< XAccessible > xRet; - Reference< XAccessible >* pxMember = nullptr; + css::uno::Reference< css::accessibility::XAccessible > xRet; + css::uno::Reference< css::accessibility::XAccessible >* pxMember = nullptr; if( eObjType == BBTYPE_ROWHEADERBAR ) pxMember = &m_xImpl->mxRowHeaderBar; @@ -262,10 +259,10 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) } -Reference< XAccessible > +css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) { - Reference< XAccessible > xRet; + css::uno::Reference< css::accessibility::XAccessible > xRet; switch( nChildIndex ) { case BBINDEX_COLUMNHEADERBAR: @@ -283,7 +280,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable() { - Reference< XAccessible > xCreator(m_xImpl->m_aCreator); + css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator); OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" ); return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox ); } @@ -300,7 +297,7 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue,bool _bColumnHeaderBar) { - Reference< XAccessible > xHeaderBar = _bColumnHeaderBar ? m_xImpl->mxColumnHeaderBar : m_xImpl->mxRowHeaderBar; + css::uno::Reference< css::accessibility::XAccessible > xHeaderBar = _bColumnHeaderBar ? m_xImpl->mxColumnHeaderBar : m_xImpl->mxRowHeaderBar; AccessibleBrowseBoxHeaderBar* pHeaderBar = _bColumnHeaderBar ? m_xImpl->m_pColumnHeaderBar : m_xImpl->m_pRowHeaderBar; if ( xHeaderBar.is() ) pHeaderBar->commitEvent(_nEventId,_rNewValue,_rOldValue); @@ -309,7 +306,7 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId, // = AccessibleBrowseBoxAccess -AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) +AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox ) :m_xParent( _rxParent ) ,m_rBrowseBox( _rBrowseBox ) ,m_pContext( nullptr ) @@ -331,7 +328,7 @@ void AccessibleBrowseBoxAccess::dispose() } -Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) +css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -357,6 +354,6 @@ bool AccessibleBrowseBoxAccess::isContextAlive() const -} // namespace accessibility +} // namespace accessibility /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 1ce402dd3309..99f8d7cd42db 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -45,13 +45,13 @@ namespace accessibility { using namespace com::sun::star::accessibility::AccessibleStateType; -// Ctor/Dtor/disposing -------------------------------------------------------- +// Ctor/Dtor/disposing AccessibleBrowseBoxBase::AccessibleBrowseBoxBase( - const Reference< XAccessible >& rxParent, - IAccessibleTableProvider& rBrowseBox, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, + ::svt::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - AccessibleBrowseBoxObjType eObjType ) : + ::svt::AccessibleBrowseBoxObjType eObjType ) : AccessibleBrowseBoxImplHelper( m_aMutex ), mxParent( rxParent ), mpBrowseBox( &rBrowseBox ), @@ -66,10 +66,10 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase( } AccessibleBrowseBoxBase::AccessibleBrowseBoxBase( - const Reference< XAccessible >& rxParent, - IAccessibleTableProvider& rBrowseBox, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, + ::svt::IAccessibleTableProvider& rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, - AccessibleBrowseBoxObjType eObjType, + ::svt::AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ) : AccessibleBrowseBoxImplHelper( m_aMutex ), @@ -115,9 +115,9 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing() mpBrowseBox = nullptr; } -// XAccessibleContext --------------------------------------------------------- +// css::accessibility::XAccessibleContext -Reference< XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleParent() +Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleParent() throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); @@ -134,16 +134,16 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() // -1 for child not found/no parent (according to specification) sal_Int32 nRet = -1; - Reference< uno::XInterface > xMeMyselfAndI( static_cast< XAccessibleContext* >( this ), uno::UNO_QUERY ); + css::uno::Reference< uno::XInterface > xMeMyselfAndI( static_cast< css::accessibility::XAccessibleContext* >( this ), uno::UNO_QUERY ); // iterate over parent's children and search for this object if( mxParent.is() ) { - Reference< XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > xParentContext( mxParent->getAccessibleContext() ); if( xParentContext.is() ) { - Reference< uno::XInterface > xChild; + css::uno::Reference< uno::XInterface > xChild; sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild ) @@ -177,7 +177,7 @@ OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName() return maName; } -Reference< XAccessibleRelationSet > SAL_CALL +Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleRelationSet() throw ( uno::RuntimeException, std::exception ) { @@ -186,7 +186,7 @@ AccessibleBrowseBoxBase::getAccessibleRelationSet() return new utl::AccessibleRelationSetHelper; } -Reference< XAccessibleStateSet > SAL_CALL +Reference< css::accessibility::XAccessibleStateSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleStateSet() throw ( uno::RuntimeException, std::exception ) { @@ -203,7 +203,7 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale() ensureIsAlive(); if( mxParent.is() ) { - Reference< XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > xParentContext( mxParent->getAccessibleContext() ); if( xParentContext.is() ) return xParentContext->getLocale(); @@ -211,9 +211,9 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale() throw IllegalAccessibleComponentStateException(); } -// XAccessibleComponent ------------------------------------------------------- +// css::accessibility::XAccessibleComponent -sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const awt::Point& rPoint ) +sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const css::awt::Point& rPoint ) throw ( uno::RuntimeException, std::exception ) { return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); @@ -261,10 +261,10 @@ void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& ) commitEvent(AccessibleEventId::STATE_CHANGED,aEmpty,aFocused); } -// XAccessibleEventBroadcaster ------------------------------------------------ +// css::accessibility::XAccessibleEventBroadcaster void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener( - const Reference< XAccessibleEventListener>& _rxListener ) + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException, std::exception ) { if ( _rxListener.is() ) @@ -278,7 +278,7 @@ void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener( } void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener( - const Reference< XAccessibleEventListener>& _rxListener ) + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException, std::exception ) { if( _rxListener.is() && getClientId( ) ) @@ -299,7 +299,7 @@ void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener( } } -// XTypeProvider -------------------------------------------------------------- +// XTypeProvider Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId() throw ( uno::RuntimeException, std::exception ) @@ -307,7 +307,7 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId() return css::uno::Sequence<sal_Int8>(); } -// XServiceInfo --------------------------------------------------------------- +// XServiceInfo sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService( const OUString& rServiceName ) @@ -323,7 +323,7 @@ Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames( return Sequence< OUString >( &aServiceName, 1 ); } -// other public methods ------------------------------------------------------- +// other public methods void AccessibleBrowseBoxBase::setAccessibleName( const OUString& rName ) { @@ -355,14 +355,14 @@ void AccessibleBrowseBoxBase::setAccessibleDescription( const OUString& rDescrip aOld ); } -// internal virtual methods --------------------------------------------------- +// internal virtual methods bool AccessibleBrowseBoxBase::implIsShowing() { bool bShowing = false; if( mxParent.is() ) { - Reference< XAccessibleComponent > + css::uno::Reference< css::accessibility::XAccessibleComponent > xParentComp( mxParent->getAccessibleContext(), uno::UNO_QUERY ); if( xParentComp.is() ) bShowing = implGetBoundingBox().IsOver( @@ -390,7 +390,7 @@ bool AccessibleBrowseBoxBase::implIsShowing() return pStateSetHelper; } -// internal helper methods ---------------------------------------------------- +// internal helper methods bool AccessibleBrowseBoxBase::isAlive() const { @@ -540,30 +540,30 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (css::uno::R } -// XInterface ----------------------------------------------------------------- +// XInterface IMPLEMENT_FORWARD_XINTERFACE2( BrowseBoxAccessibleElement, AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base ) -// XTypeProvider -------------------------------------------------------------- +// XTypeProvider IMPLEMENT_FORWARD_XTYPEPROVIDER2( BrowseBoxAccessibleElement, AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base ) -// XAccessible ---------------------------------------------------------------- +// css::accessibility::XAccessible -Reference< XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) +Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return this; } -BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox, - const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType 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 ) :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType ) { } -BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox, - const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType 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, const OUString& rName, const OUString& rDescription ) :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription ) { diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index c1e81e9fe45f..82fe8f324ec4 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -45,30 +45,30 @@ using namespace ::svt::table; class AccessibleGridControl_Impl { public: - /// the XAccessible which created the AccessibleGridControl - WeakReference< XAccessible > m_aCreator; + /// the css::accessibility::XAccessible which created the AccessibleGridControl + css::uno::WeakReference< css::accessibility::XAccessible > m_aCreator; /** The data table child. */ - Reference< css::accessibility::XAccessible > m_xTable; + css::uno::Reference< css::accessibility::XAccessible > m_xTable; AccessibleGridControlTable* m_pTable; /** The header bar for rows. */ - Reference< css::accessibility::XAccessible > m_xRowHeaderBar; + css::uno::Reference< css::accessibility::XAccessible > m_xRowHeaderBar; AccessibleGridControlHeader* m_pRowHeaderBar; /** The header bar for columns (first row of the table). */ - Reference< css::accessibility::XAccessible > m_xColumnHeaderBar; + css::uno::Reference< css::accessibility::XAccessible > m_xColumnHeaderBar; AccessibleGridControlHeader* m_pColumnHeaderBar; /** The table cell child. */ - Reference< css::accessibility::XAccessible > m_xCell; + css::uno::Reference< css::accessibility::XAccessible > m_xCell; AccessibleGridControlTableCell* m_pCell; }; AccessibleGridControl::AccessibleGridControl( - const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxCreator, - IAccessibleTable& _rTable ) + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, + ::svt::table::IAccessibleTable& _rTable ) : AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL ) { m_xImpl.reset( new AccessibleGridControl_Impl() ); @@ -91,16 +91,16 @@ void SAL_CALL AccessibleGridControl::disposing() m_xImpl->m_pCell = nullptr; m_xImpl->m_aCreator.clear(); - Reference< XAccessible > xTable = m_xImpl->m_xTable; + css::uno::Reference< css::accessibility::XAccessible > xTable = m_xImpl->m_xTable; - Reference< XComponent > xComp( m_xImpl->m_xTable, UNO_QUERY ); + css::uno::Reference< XComponent > xComp( m_xImpl->m_xTable, UNO_QUERY ); if ( xComp.is() ) { xComp->dispose(); } - Reference< XAccessible > xCell = m_xImpl->m_xCell; + css::uno::Reference< css::accessibility::XAccessible > xCell = m_xImpl->m_xCell; - Reference< XComponent > xCellComp( m_xImpl->m_xCell, UNO_QUERY ); + css::uno::Reference< XComponent > xCellComp( m_xImpl->m_xCell, UNO_QUERY ); if ( xCellComp.is() ) { xCellComp->dispose(); @@ -112,7 +112,7 @@ void SAL_CALL AccessibleGridControl::disposing() } -// XAccessibleContext --------------------------------------------------------- +// css::accessibility::XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() throw ( uno::RuntimeException, std::exception ) @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() } -Reference< XAccessible > SAL_CALL +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { @@ -132,7 +132,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) if (nChildIndex<0 || nChildIndex>=getAccessibleChildCount()) throw IndexOutOfBoundsException(); - Reference< XAccessible > xChild; + css::uno::Reference< css::accessibility::XAccessible > xChild; if (isAlive()) { if(nChildIndex == 0 && m_aTable.HasColHeader()) @@ -178,16 +178,16 @@ sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole() } -// XAccessibleComponent ------------------------------------------------------- +// css::accessibility::XAccessibleComponent ------------------------------------------------------- -Reference< XAccessible > SAL_CALL +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); - Reference< XAccessible > xChild; + css::uno::Reference< css::accessibility::XAccessible > xChild; sal_Int32 nIndex = 0; if( m_aTable.ConvertPointToControlIndex( nIndex, VCLPoint( rPoint ) ) ) xChild = m_aTable.CreateAccessibleControl( nIndex ); @@ -198,8 +198,8 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) Point aPoint( VCLPoint( rPoint ) ); for( nIndex = 0; (nIndex < 3) && !xChild.is(); ++nIndex ) { - Reference< XAccessible > xCurrChild( implGetFixedChild( nIndex ) ); - Reference< XAccessibleComponent > + css::uno::Reference< css::accessibility::XAccessible > xCurrChild( implGetFixedChild( nIndex ) ); + css::uno::Reference< css::accessibility::XAccessibleComponent > xCurrChildComp( xCurrChild, uno::UNO_QUERY ); if( xCurrChildComp.is() && @@ -244,7 +244,7 @@ Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen() } // internal helper methods ---------------------------------------------------- -Reference< XAccessible > AccessibleGridControl::implGetTable() +css::uno::Reference< css::accessibility::XAccessible > AccessibleGridControl::implGetTable() { if( !m_xImpl->m_xTable.is() ) { @@ -255,11 +255,11 @@ Reference< XAccessible > AccessibleGridControl::implGetTable() } -Reference< XAccessible > +css::uno::Reference< css::accessibility::XAccessible > AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType ) { - Reference< XAccessible > xRet; - Reference< XAccessible >* pxMember = nullptr; + css::uno::Reference< css::accessibility::XAccessible > xRet; + css::uno::Reference< css::accessibility::XAccessible >* pxMember = nullptr; if( eObjType == TCTYPE_ROWHEADERBAR ) pxMember = &m_xImpl->m_xRowHeaderBar; @@ -285,10 +285,10 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType return xRet; } -Reference< XAccessible > +css::uno::Reference< css::accessibility::XAccessible > AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex ) { - Reference< XAccessible > xRet; + css::uno::Reference< css::accessibility::XAccessible > xRet; switch( nChildIndex ) { case TCINDEX_COLUMNHEADERBAR: @@ -306,7 +306,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex ) AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable() { - Reference< XAccessible > xCreator(m_xImpl->m_aCreator); + css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator); OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" ); return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE ); } @@ -318,7 +318,7 @@ void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNew { for(sal_Int32 i=0;i<nChildCount;i++) { - Reference< XAccessible > xAccessible = getAccessibleChild(i); + css::uno::Reference< css::accessibility::XAccessible > xAccessible = getAccessibleChild(i); css::uno::Reference< css::accessibility::XAccessibleContext > xAccessibleChild = xAccessible->getAccessibleContext(); if(m_xImpl->m_xTable == xAccessible) { @@ -347,7 +347,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe { if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED) { - Reference< XAccessible > xChild = m_xImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn()); + css::uno::Reference< css::accessibility::XAccessible > xChild = m_xImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn()); m_xImpl->m_pTable->commitEvent(_nEventId, makeAny(xChild),_rOldValue); } else if(_nEventId == AccessibleEventId::TABLE_MODEL_CHANGED) @@ -359,7 +359,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe { std::vector< AccessibleGridControlTableCell* >& rCells = m_xImpl->m_pTable->getCellVector(); - std::vector< Reference< XAccessible > >& rAccCells = + std::vector< css::uno::Reference< css::accessibility::XAccessible > >& rAccCells = m_xImpl->m_pTable->getAccessibleCellVector(); int nColCount = m_aTable.GetColumnCount(); // check valid index - entries are inserted lazily @@ -393,7 +393,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe AccessibleGridControlAccess::AccessibleGridControlAccess( - const Reference< XAccessible >& rxParent, IAccessibleTable& rTable ) + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::table::IAccessibleTable& rTable ) : m_xParent( rxParent ) , m_pTable( & rTable ) , m_pContext( nullptr ) @@ -416,7 +416,7 @@ void AccessibleGridControlAccess::DisposeAccessImpl() } -Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) +css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 846ed6626d25..017426ed5700 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -17,18 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleGridControlBase.hxx" +#include <accessibility/extended/AccessibleGridControlBase.hxx> #include <svtools/accessibletable.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <sal/types.h> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <unotools/accessiblerelationsethelper.hxx> - - -using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -39,17 +37,15 @@ using namespace ::svt; using namespace ::svt::table; - - namespace accessibility { using namespace com::sun::star::accessibility::AccessibleStateType; AccessibleGridControlBase::AccessibleGridControlBase( - const Reference< XAccessible >& rxParent, - svt::table::IAccessibleTable& rTable, - AccessibleTableControlObjType eObjType ) : + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, + ::svt::table::IAccessibleTable& rTable, + ::svt::table::AccessibleTableControlObjType eObjType ) : AccessibleGridControlImplHelper( m_aMutex ), m_xParent( rxParent ), m_aTable( rTable), @@ -85,9 +81,9 @@ void SAL_CALL AccessibleGridControlBase::disposing() //m_aTable = NULL; } -// XAccessibleContext --------------------------------------------------------- +// css::accessibility::XAccessibleContext -Reference< XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleParent() +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleParent() throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -106,16 +102,16 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() // -1 for child not found/no parent (according to specification) sal_Int32 nRet = -1; - Reference< uno::XInterface > xMeMyselfAndI( static_cast< XAccessibleContext* >( this ), uno::UNO_QUERY ); + css::uno::Reference< uno::XInterface > xMeMyselfAndI( static_cast< css::accessibility::XAccessibleContext* >( this ), uno::UNO_QUERY ); // iterate over parent's children and search for this object if( m_xParent.is() ) { - Reference< XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > xParentContext( m_xParent->getAccessibleContext() ); if( xParentContext.is() ) { - Reference< uno::XInterface > xChild; + css::uno::Reference< uno::XInterface > xChild; sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild ) @@ -150,7 +146,7 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleName() return m_aName; } -Reference< XAccessibleRelationSet > SAL_CALL +css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL AccessibleGridControlBase::getAccessibleRelationSet() throw ( uno::RuntimeException, std::exception ) { @@ -161,7 +157,7 @@ AccessibleGridControlBase::getAccessibleRelationSet() return new utl::AccessibleRelationSetHelper; } -Reference< XAccessibleStateSet > SAL_CALL +css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL AccessibleGridControlBase::getAccessibleStateSet() throw ( uno::RuntimeException, std::exception ) { @@ -179,7 +175,7 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() ensureIsAlive(); if( m_xParent.is() ) { - Reference< XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > xParentContext( m_xParent->getAccessibleContext() ); if( xParentContext.is() ) return xParentContext->getLocale(); @@ -187,7 +183,7 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() throw IllegalAccessibleComponentStateException(); } -// XAccessibleComponent ------------------------------------------------------- +// css::accessibility::XAccessibleComponent sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException, std::exception ) @@ -219,10 +215,10 @@ awt::Size SAL_CALL AccessibleGridControlBase::getSize() return AWTSize( getBoundingBox().GetSize() ); } -// XAccessibleEventBroadcaster ------------------------------------------------ +// css::accessibility::XAccessibleEventBroadcaster void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener( - const Reference< XAccessibleEventListener>& _rxListener ) + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException, std::exception ) { if ( _rxListener.is() ) @@ -237,7 +233,7 @@ void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener( } void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener( - const Reference< XAccessibleEventListener>& _rxListener ) + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException, std::exception ) { if( _rxListener.is() && getClientId( ) ) @@ -258,7 +254,7 @@ void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener( } } -// XTypeProvider -------------------------------------------------------------- +// XTypeProvider Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId() throw ( uno::RuntimeException, std::exception ) @@ -266,7 +262,7 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId() return css::uno::Sequence<sal_Int8>(); } -// XServiceInfo --------------------------------------------------------------- +// XServiceInfo sal_Bool SAL_CALL AccessibleGridControlBase::supportsService( const OUString& rServiceName ) @@ -281,14 +277,14 @@ Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceName const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &aServiceName, 1 ); } -// internal virtual methods --------------------------------------------------- +// internal virtual methods bool AccessibleGridControlBase::implIsShowing() { bool bShowing = false; if( m_xParent.is() ) { - Reference< XAccessibleComponent > + css::uno::Reference< css::accessibility::XAccessibleComponent > xParentComp( m_xParent->getAccessibleContext(), uno::UNO_QUERY ); if( xParentComp.is() ) bShowing = implGetBoundingBox().IsOver( @@ -315,7 +311,7 @@ bool AccessibleGridControlBase::implIsShowing() return pStateSetHelper; } -// internal helper methods ---------------------------------------------------- +// internal helper methods bool AccessibleGridControlBase::isAlive() const { @@ -406,7 +402,7 @@ sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole() return nRole; } -Reference<XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const css::awt::Point& ) +css::uno::Reference<css::accessibility::XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const css::awt::Point& ) throw ( uno::RuntimeException, std::exception ) { return nullptr; @@ -455,22 +451,22 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (css::uno: } -GridControlAccessibleElement::GridControlAccessibleElement( const Reference< XAccessible >& rxParent, - IAccessibleTable& rTable, - AccessibleTableControlObjType eObjType ) +GridControlAccessibleElement::GridControlAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, + ::svt::table::IAccessibleTable& rTable, + ::svt::table::AccessibleTableControlObjType eObjType ) :AccessibleGridControlBase( rxParent, rTable, eObjType ) { } -// XInterface ----------------------------------------------------------------- +// XInterface IMPLEMENT_FORWARD_XINTERFACE2( GridControlAccessibleElement, AccessibleGridControlBase, GridControlAccessibleElement_Base) -// XTypeProvider -------------------------------------------------------------- +// XTypeProvider IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridControlAccessibleElement, AccessibleGridControlBase, GridControlAccessibleElement_Base ) -// XAccessible ---------------------------------------------------------------- +// css::accessibility::XAccessible -Reference< XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) +css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index bf53d172d1dd..0c77a582e716 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -53,8 +53,8 @@ namespace accessibility AccessibleGridControlCell::AccessibleGridControlCell( - const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable, - sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleTableControlObjType _eType ) + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::table::IAccessibleTable& _rTable, + sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::svt::table::AccessibleTableControlObjType _eType ) :AccessibleGridControlBase( _rxParent, _rTable, _eType ) ,m_nRowPos( _nRowPos ) ,m_nColPos( _nColPos ) @@ -103,16 +103,16 @@ namespace accessibility nEndIndex = 0; } - AccessibleGridControlTableCell::AccessibleGridControlTableCell(const Reference<XAccessible >& _rxParent, - IAccessibleTable& _rTable, + AccessibleGridControlTableCell::AccessibleGridControlTableCell(const css::uno::Reference<XAccessible >& _rxParent, + ::svt::table::IAccessibleTable& _rTable, sal_Int32 _nRowPos, sal_uInt16 _nColPos, - AccessibleTableControlObjType eObjType) + ::svt::table::AccessibleTableControlObjType eObjType) :AccessibleGridControlCell( _rxParent, _rTable, _nRowPos, _nColPos, eObjType ) { } - // XInterface ------------------------------------------------------------- + // XInterface /** Queries for a new interface. */ css::uno::Any SAL_CALL AccessibleGridControlTableCell::queryInterface( @@ -173,10 +173,8 @@ namespace accessibility return 0; } - /** @return The XAccessible interface of the specified child. */ - css::uno::Reference< - css::accessibility::XAccessible > SAL_CALL - AccessibleGridControlTableCell::getAccessibleChild( sal_Int32 ) + /** @return The css::accessibility::XAccessible interface of the specified child. */ + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlTableCell::getAccessibleChild( sal_Int32 ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) { @@ -207,10 +205,10 @@ namespace accessibility } - // XAccessible ------------------------------------------------------------ + // css::accessibility::XAccessible - /** @return The XAccessibleContext interface of this object. */ - Reference< XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() throw ( RuntimeException, std::exception ) + /** @return The css::accessibility::XAccessibleContext interface of this object. */ + css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() throw ( RuntimeException, std::exception ) { SolarMutexGuard g; @@ -218,7 +216,7 @@ namespace accessibility return this; } - // XAccessibleContext ----------------------------------------------------- + // css::accessibility::XAccessibleContext sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index 7b02cb15ec08..e454f5a4372a 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/accessiblebrowseboxcell.hxx" +#include <sal/types.h> #include <svtools/accessibletableprovider.hxx> +#include <accessibility/extended/accessiblebrowseboxcell.hxx> namespace accessibility { @@ -29,9 +30,9 @@ namespace accessibility // AccessibleBrowseBoxCell AccessibleBrowseBoxCell::AccessibleBrowseBoxCell( - const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, - const Reference< XWindow >& _xFocusWindow, - sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleBrowseBoxObjType _eType ) + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, + sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::svt::AccessibleBrowseBoxObjType _eType ) :AccessibleBrowseBoxBase( _rxParent, _rBrowseBox, _xFocusWindow, _eType ) ,m_nRowPos( _nRowPos ) ,m_nColPos( _nColPos ) diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index d4c1aa509660..be7adb43ee73 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -33,11 +33,11 @@ namespace accessibility using namespace ::svt; EditBrowseBoxTableCell::EditBrowseBoxTableCell( - const css::uno::Reference< XAccessible >& _rxParent, - const css::uno::Reference< XAccessible >& _rxOwningAccessible, - const css::uno::Reference< XAccessibleContext >& _xControlChild, - IAccessibleTableProvider& _rBrowseBox, - const Reference< XWindow >& _xFocusWindow, + 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, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos) :AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos ) @@ -69,11 +69,11 @@ namespace accessibility commitEvent( _rEvent.EventId, _rEvent.NewValue, _rEvent.OldValue ); } - // XAccessibleComponent + // css::accessibility::XAccessibleComponent sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground( ) throw (RuntimeException, std::exception) { SolarMethodGuard aGuard( *this ); - Reference< XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY ); + css::uno::Reference< css::accessibility::XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY ); if ( xAccComp.is() ) return xAccComp->getForeground(); return 0; @@ -82,13 +82,13 @@ namespace accessibility sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground( ) throw (RuntimeException, std::exception) { SolarMethodGuard aGuard( *this ); - Reference< XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY ); + css::uno::Reference< css::accessibility::XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY ); if ( xAccComp.is() ) return xAccComp->getBackground(); return 0; } - Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent( ) throw (RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent( ) throw (RuntimeException, std::exception) { return m_xParentAccessible; } @@ -107,13 +107,13 @@ namespace accessibility return "Column " + OUString::number(getColumnPos()-1) + ", Row " + OUString::number(getRowPos()); } - Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException, std::exception ) + css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); return baseGetAccessibleRelationSet( ); } - Reference<XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException, std::exception ) + css::uno::Reference<css::accessibility::XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleStateSet(); @@ -126,7 +126,7 @@ namespace accessibility return baseGetAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMethodGuard aGuard( *this ); return baseGetAccessibleChild( i ); @@ -146,7 +146,7 @@ namespace accessibility AccessibleBrowseBoxCell::dispose(); } - void SAL_CALL EditBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL EditBrowseBoxTableCell::disposing( const css::lang::EventObject& _rSource ) throw (RuntimeException, std::exception) { AccessibleBrowseBoxCell::disposing( _rSource ); OAccessibleContextWrapperHelper::disposing( _rSource ); @@ -162,9 +162,9 @@ namespace accessibility // EditBrowseBoxTableCell EditBrowseBoxTableCellAccess::EditBrowseBoxTableCellAccess( - const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible, - const Reference< XWindow >& _rxFocusWindow, - IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) + 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 ) :WeakComponentImplHelper( m_aMutex ) ,m_xParent( _rxParent ) ,m_xControlAccessible( _rxControlAccessible ) @@ -179,15 +179,15 @@ namespace accessibility { } - Reference< XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext( ) throw (RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext( ) throw (RuntimeException, std::exception) { if ( !m_pBrowseBox || !m_xControlAccessible.is() ) throw DisposedException(); - Reference< XAccessibleContext > xMyContext( m_aContext ); + css::uno::Reference< css::accessibility::XAccessibleContext > xMyContext( m_aContext ); if ( !xMyContext.is() ) { - Reference< XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext(); - Reference< XAccessible > xMe( this ); + css::uno::Reference< css::accessibility::XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext(); + css::uno::Reference< css::accessibility::XAccessible > xMe( this ); xMyContext = new EditBrowseBoxTableCell( m_xParent, xMe, xInnerContext, *m_pBrowseBox, m_xFocusWindow, m_nRowPos, m_nColPos ); m_aContext = xMyContext; @@ -198,7 +198,7 @@ namespace accessibility void SAL_CALL EditBrowseBoxTableCellAccess::disposing() { // dispose our context, if it still alive - Reference< XComponent > xMyContext( m_aContext.get(), UNO_QUERY ); + css::uno::Reference< XComponent > xMyContext( m_aContext.get(), UNO_QUERY ); if ( xMyContext.is() ) { try @@ -215,7 +215,7 @@ namespace accessibility m_pBrowseBox = nullptr; m_xControlAccessible.clear(); m_aContext.clear(); - // NO dispose of the inner object there: it is the XAccessible of an window, and disposing + // NO dispose of the inner object there: it is the css::accessibility::XAccessible of an window, and disposing // it would delete the respective VCL window } } // namespace accessibility diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 07bd58426ab3..11da75d3c357 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -85,7 +85,7 @@ namespace accessibility osl_atomic_decrement( &m_refCount ); } - void AccessibleIconChoiceCtrlEntry::disposing( const EventObject& _rSource ) + void AccessibleIconChoiceCtrlEntry::disposing( const css::lang::EventObject& _rSource ) throw(RuntimeException, std::exception) { if ( _rSource.Source == m_xParent ) diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg index d2927cd81ecc..4468e593ffa1 100644 --- a/solenv/inc/doxygen.cfg +++ b/solenv/inc/doxygen.cfg @@ -2354,7 +2354,7 @@ PLANTUML_INCLUDE_PATH = # Minimum value: 0, maximum value: 10000, default value: 50. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_GRAPH_MAX_NODES = 200 +DOT_GRAPH_MAX_NODES = 500 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs # generated by dot. A depth value of 3 means that only nodes reachable from the |