accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 90 ++--- accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 147 ++++---- accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx | 26 - accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx | 118 +++---- accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx | 16 accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx | 73 ++-- accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx | 71 ++-- accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx | 71 ++-- accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 71 +--- accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 117 +++---- accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx | 84 ++--- accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx | 26 - accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx | 110 +++--- accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx | 83 ++--- accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx | 69 ++-- accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx | 16 accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx | 14 accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx | 34 +- accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx | 6 accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx | 54 +-- accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx | 48 +- accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx | 126 +++---- accessibility/inc/accessibility/extended/accessiblelistbox.hxx | 52 +-- accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx | 165 ++++------ accessibility/inc/accessibility/extended/accessibletabbar.hxx | 50 +-- accessibility/inc/accessibility/extended/accessibletabbarpage.hxx | 52 +-- accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx | 66 ++-- accessibility/inc/accessibility/extended/accessibletablistbox.hxx | 19 - accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx | 22 - accessibility/inc/accessibility/extended/listboxaccessible.hxx | 2 accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 25 - accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx | 2 accessibility/inc/accessibility/helper/characterattributeshelper.hxx | 6 accessibility/inc/accessibility/helper/listboxhelper.hxx | 2 accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx | 20 - accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx | 50 +-- accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx | 34 +- accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx | 58 +-- accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx | 26 - accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx | 24 - accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx | 70 ++-- accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx | 67 ++-- accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx | 125 +++---- accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx | 30 - accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx | 10 accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx | 66 ++-- accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx | 10 accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx | 24 - accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx | 26 - accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx | 12 accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx | 64 +-- accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx | 30 - accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx | 64 +-- accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx | 6 accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx | 38 +- accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx | 30 - accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx | 32 - accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx | 90 ++--- accessibility/source/extended/AccessibleBrowseBox.cxx | 9 accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 16 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx | 12 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 6 accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 6 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 66 +--- accessibility/source/extended/AccessibleGridControl.cxx | 24 - accessibility/source/extended/AccessibleGridControlBase.cxx | 6 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx | 11 accessibility/source/extended/AccessibleGridControlTableBase.cxx | 6 accessibility/source/extended/AccessibleGridControlTableCell.cxx | 64 +-- accessibility/source/extended/AccessibleToolPanelDeck.cxx | 2 accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 2 accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 10 accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 34 +- accessibility/source/extended/accessiblelistboxentry.cxx | 38 +- accessibility/source/extended/textwindowaccessibility.cxx | 8 accessibility/source/helper/acc_factory.cxx | 80 ++-- accessibility/source/standard/vclxaccessiblebox.cxx | 8 accessibility/source/standard/vclxaccessibleedit.cxx | 6 accessibility/source/standard/vclxaccessiblelist.cxx | 8 accessibility/source/standard/vclxaccessiblelistitem.cxx | 18 - accessibility/source/standard/vclxaccessiblemenuitem.cxx | 6 accessibility/source/standard/vclxaccessibletextcomponent.cxx | 6 accessibility/source/standard/vclxaccessibletoolbox.cxx | 20 - accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 4 91 files changed, 1655 insertions(+), 1802 deletions(-)
New commits: commit be62355f5258df4cd6a58c2e300886d5c714cced Author: Noel Grandin <[email protected]> Date: Fri Jul 17 14:34:04 2015 +0200 com::sun::star->css in accessibility Change-Id: Iadc69c0c7e770a8c7a94942a24b9455233102211 Reviewed-on: https://gerrit.libreoffice.org/17161 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index 63c7f43..d008c46 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -41,8 +41,8 @@ class AccessibleBrowseBox : public AccessibleBrowseBoxBase protected: AccessibleBrowseBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, ::svt::IAccessibleTableProvider& _rBrowseBox ); @@ -53,7 +53,7 @@ protected: <p>To be called only once, and only if in the ctor NULL was passed.</p> */ void setCreator( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator + const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator ); /** Cleans up members. */ @@ -65,32 +65,28 @@ protected: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessible interface of the specified child. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - /** @return The role of this object (a table). */ -// virtual sal_Int16 SAL_CALL getAccessibleRole() -// throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent --------------------------------------------------- /** @return The accessible child rendered under the given point. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Grabs the focus to the BrowseBox. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo ----------------------------------------------------------- @@ -98,7 +94,7 @@ protected: The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: // helper functions @@ -111,8 +107,8 @@ public: the old value */ void commitHeaderBarEvent(sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue,bool _bColumnHeaderBar = true); + const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue,bool _bColumnHeaderBar = true); // helper functions /** commitTableEvent commit the event at all listeners of the table @@ -124,13 +120,13 @@ public: the old value */ void commitTableEvent(sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue); + const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue); /** returns the accessible object for the row or the column header bar */ - inline ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + inline css::uno::Reference< + css::accessibility::XAccessible > getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) { return implGetHeaderBar(_eObjType); @@ -138,8 +134,8 @@ public: /** returns the accessible object for the table representation */ - inline ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + inline css::uno::Reference< + css::accessibility::XAccessible > getTable( ) { return implGetTable(); @@ -160,22 +156,22 @@ protected: /** This method creates (once) and returns the accessible data table child. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the data table. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > implGetTable(); + css::uno::Reference< + css::accessibility::XAccessible > implGetTable(); /** This method creates (once) and returns the specified header bar. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the header bar. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< + css::accessibility::XAccessible > implGetHeaderBar( ::svt::AccessibleBrowseBoxObjType eObjType ); /** This method returns one of the children that are always present: Data table, row and column header bar or corner control. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the specified child. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< + css::accessibility::XAccessible > implGetFixedChild( sal_Int32 nChildIndex ); /** This method creates and returns an accessible table. @@ -193,7 +189,7 @@ private: <p>The instance holds its XAccessibleContext with a hard reference, while the context holds this instance weak.</p> */ -typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible +typedef ::cppu::WeakImplHelper< css::accessibility::XAccessible > AccessibleBrowseBoxAccess_Base; class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base @@ -201,18 +197,18 @@ class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base { private: ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > m_xParent; ::svt::IAccessibleTableProvider& m_rBrowseBox; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > m_xContext; AccessibleBrowseBox* m_pContext; // note that this pointer is valid as long as m_xContext is valid! public: AccessibleBrowseBoxAccess( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox ); @@ -227,11 +223,11 @@ protected: virtual ~AccessibleBrowseBoxAccess(); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > + SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // IAccessibleBrowseBox - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > getMyself() SAL_OVERRIDE { return this; @@ -241,40 +237,40 @@ protected: { return isContextAlive(); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) SAL_OVERRIDE { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible; + css::uno::Reference< css::accessibility::XAccessible > xAccessible; AccessibleBrowseBox* pContext( getContext() ); if ( pContext ) xAccessible = pContext->getHeaderBar( _eObjType ); return xAccessible; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > getTable() SAL_OVERRIDE { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible; + css::uno::Reference< css::accessibility::XAccessible > xAccessible; AccessibleBrowseBox* pContext( getContext() ); if ( pContext ) xAccessible = pContext->getTable(); return xAccessible; } - virtual void commitHeaderBarEvent( sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue, bool _bColumnHeaderBar ) SAL_OVERRIDE + virtual void commitHeaderBarEvent( sal_Int16 nEventId, const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue, bool _bColumnHeaderBar ) SAL_OVERRIDE { AccessibleBrowseBox* pContext( getContext() ); if ( pContext ) pContext->commitHeaderBarEvent( nEventId, rNewValue, rOldValue, _bColumnHeaderBar ); } virtual void commitTableEvent( sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue ) SAL_OVERRIDE + const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) SAL_OVERRIDE { AccessibleBrowseBox* pContext( getContext() ); if ( pContext ) pContext->commitTableEvent( nEventId, rNewValue, rOldValue ); } virtual void commitEvent( sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue ) SAL_OVERRIDE + const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) SAL_OVERRIDE { AccessibleBrowseBox* pContext( getContext() ); if ( pContext ) diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index f01ffbf..51266dd 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -64,11 +64,11 @@ namespace accessibility { typedef ::cppu::WeakAggComponentImplHelper5< - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::awt::XFocusListener, - ::com::sun::star::lang::XServiceInfo > + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleEventBroadcaster, + css::awt::XFocusListener, + css::lang::XServiceInfo > AccessibleBrowseBoxImplHelper; /** The BrowseBox accessible objects inherit from this base class. It @@ -89,10 +89,10 @@ public: @param eNameText The constant for the name text. @param eDescrText The constant for the description text. */ AccessibleBrowseBoxBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< + css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType ); /** Constructor sets specified name and description. @@ -101,10 +101,10 @@ public: @param rName The name of this object. @param rDescription The description text of this object. */ AccessibleBrowseBoxBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< + css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ); @@ -119,51 +119,45 @@ public: // XAccessibleContext ----------------------------------------------------- /** @return A reference to the parent accessible object. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleParent() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL getAccessibleParent() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The description of this object. */ virtual OUString SAL_CALL getAccessibleDescription() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The name of this object. */ virtual OUString SAL_CALL getAccessibleName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The relation set (the BrowseBox does not have one). */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The set of current states. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The parent's locale. */ - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw ( ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLocale() + throw ( css::accessibility::IllegalAccessibleComponentStateException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported. */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /* Derived classes have to implement: - getAccessibleChildCount, @@ -176,34 +170,34 @@ public: /** @return <TRUE/>, if the point lies within the bounding box of this object. */ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The bounding box of this object. */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The upper left corner of the bounding box relative to the parent. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getLocation() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The upper left corner of the bounding box in screen coordinates. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The size of the bounding box. */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Size SAL_CALL getSize() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFocusListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* Derived classes have to implement: - getAccessibleAt, @@ -212,41 +206,36 @@ public: /** @return The accessible child rendered under the given point. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleEventBroadcaster -------------------------------------------- /** Adds a new event listener */ virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Removes an event listener. */ virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider ---------------------------------------------------------- /** @return An unique implementation ID. */ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo ----------------------------------------------------------- /** @return Whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return A list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /* Derived classes have to implement: - getImplementationName. */ @@ -264,9 +253,8 @@ public: /** Commits an event to all listeners. */ void commitEvent( sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, - - const ::com::sun::star::uno::Any& rOldValue ); + const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue ); /** @return <TRUE/>, if the object is not disposed or disposing. */ bool isAlive() const; @@ -301,7 +289,7 @@ protected: /** @throws <type>DisposedException</type> If the object is not alive. */ void ensureIsAlive() const - throw ( ::com::sun::star::lang::DisposedException ); + throw ( css::lang::DisposedException ); /** @return The ::osl::Mutex member provided by the class OBaseMutex. */ inline ::osl::Mutex& getOslMutex(); @@ -314,12 +302,12 @@ protected: parent window. @return The bounding box (VCL rect.) relative to the parent object. */ Rectangle getBoundingBox() - throw ( ::com::sun::star::lang::DisposedException ); + throw ( css::lang::DisposedException ); /** Locks all mutex's and calculates the bounding box in screen coordinates. @return The bounding box (VCL rect.) in screen coordinates. */ Rectangle getBoundingBoxOnScreen() - throw ( ::com::sun::star::lang::DisposedException ); + throw ( css::lang::DisposedException ); ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } @@ -335,14 +323,13 @@ protected: // members ---------------------------------------------------------------- /** The parent accessible object. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > mxParent; + css::uno::Reference< css::accessibility::XAccessible > mxParent; /** The VCL BrowseBox control. */ ::svt::IAccessibleTableProvider* mpBrowseBox; /** This is the window which get all the nice focus events */ - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xFocusWindow; + css::uno::Reference< css::awt::XWindow > m_xFocusWindow; private: /** Localized name. */ @@ -360,7 +347,7 @@ private: // a version of AccessibleBrowseBoxBase which implements not only the XAccessibleContext, // but also the XAccessible -typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessible +typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible > BrowseBoxAccessibleElement_Base; class BrowseBoxAccessibleElement @@ -381,10 +368,10 @@ protected: @param eDescrText The constant for the description text. */ BrowseBoxAccessibleElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< + css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType ); /** Constructor sets specified name and description. @@ -395,10 +382,10 @@ protected: @param rDescription The description text of this object. */ BrowseBoxAccessibleElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< + css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ); @@ -416,10 +403,8 @@ protected: // XAccessible ------------------------------------------------------------ /** @return The XAccessibleContext interface of this object. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 9c54270..debf037 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -29,8 +29,8 @@ namespace accessibility { - typedef ::cppu::ImplHelper2 < ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleValue + typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible, + css::accessibility::XAccessibleValue > AccessibleCheckBoxCell_BASE; class AccessibleCheckBoxCell : public AccessibleBrowseBoxCell @@ -46,9 +46,9 @@ namespace accessibility virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() SAL_OVERRIDE; public: - AccessibleCheckBoxCell(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, @@ -60,20 +60,20 @@ namespace accessibility DECLARE_XTYPEPROVIDER( ) // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // internal void SetChecked( bool _bChecked ); diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx index 5215e49..604e464 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -31,8 +31,7 @@ namespace accessibility { -typedef ::cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleSelection > +typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > AccessibleBrowseBoxHeaderBarImplHelper; /** This class represents the accessible object of a header bar of a BrowseBox @@ -47,8 +46,7 @@ public: /** @param eObjType One of the two allowed types BBTYPE_ROWHEADERBAR or BBTYPE_COLUMNHEADERBAR. */ AccessibleBrowseBoxHeaderBar( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, ::svt::AccessibleBrowseBoxObjType eObjType ); @@ -61,129 +59,122 @@ public: /** @return The XAccessible interface of the specified child. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL + getAccessibleIndexInParent() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent --------------------------------------------------- /** @return The accessible child rendered under the given point. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Grabs the focus to (the current cell of) the data table. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleTable ------------------------------------------------------- /** @return The description text of the specified row. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The description text of the specified column. */ - virtual OUString SAL_CALL - getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessibleTable interface of the row header bar. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessibleTable interface of the column header bar. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return An index list of completely selected rows. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return An index list of completely selected columns. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return <TRUE/>, if the specified row is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return <TRUE/>, if the specified column is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessible interface of the cell object at the specified cell position. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return <TRUE/>, if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (row or column of the table). */ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return <TRUE/>, if the specified child (row/column) is selected. */ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Clears the complete selection. */ virtual void SAL_CALL clearAccessibleSelection() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Selects all children or first, if multiselection is not supported. */ virtual void SAL_CALL selectAllAccessibleChildren() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The number of selected rows/columns. */ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The specified selected row/column. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Removes the specified row/column from the selection. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInterface ------------------------------------------------------------- /** Queries for a new interface. */ - ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; @@ -195,11 +186,11 @@ public: /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return An unique implementation ID. */ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: // internal virtual methods ----------------------------------------------- @@ -229,8 +220,7 @@ protected: depending on object type. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the specified column/row. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > implGetChild( sal_Int32 nRow, sal_uInt16 nColumnPos ); /** @attention This method requires locked mutex's and a living object. @@ -238,13 +228,13 @@ protected: @throws <type>IndexOutOfBoundsException</type> If the specified index is invalid. */ sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw ( css::lang::IndexOutOfBoundsException ); /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> If the specified row/column index (depending on type) is invalid. */ void ensureIsValidHeaderIndex( sal_Int32 nIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw ( css::lang::IndexOutOfBoundsException ); }; // inlines -------------------------------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx index 8408d74..603b0d1 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -28,22 +28,22 @@ namespace accessibility sal_Int32 m_nColumnRowId; public: AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType _eObjType); /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessible interface of the specified child. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Grabs the focus to the BrowseBox. */ - virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; inline bool isRowBarCell() const { @@ -53,7 +53,7 @@ namespace accessibility /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx index b4c0377..3b29c6b 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx @@ -37,8 +37,7 @@ class AccessibleBrowseBoxTable : public AccessibleBrowseBoxTableBase public: AccessibleBrowseBoxTable( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox ); protected: @@ -48,90 +47,85 @@ public: // XAccessibleContext ----------------------------------------------------- /** @return The XAccessible interface of the specified child. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent --------------------------------------------------- /** @return The accessible child rendered under the given point. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Grabs the focus to (the current cell of) the data table. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleTable ------------------------------------------------------- /** @return The description text of the specified row. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The description text of the specified column. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessibleTable interface of the row header bar. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessibleTable interface of the column header bar. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return An index list of completely selected rows. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return An index list of completely selected columns. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return <TRUE/>, if the specified row is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return <TRUE/>, if the specified column is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessible interface of the cell object at the specified cell position. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return <TRUE/>, if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo ----------------------------------------------------------- /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: // internal virtual methods ----------------------------------------------- @@ -147,10 +141,9 @@ protected: /** @attention This method requires a locked mutex. @return The XAccessibleTable interface of the specified header bar. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > + css::uno::Reference< css::accessibility::XAccessibleTable > implGetHeaderBar( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); }; diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx index 4fa9771..257e192 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx @@ -29,8 +29,7 @@ namespace accessibility { -typedef ::cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleTable > +typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable > AccessibleBrowseBoxTableImplHelper; /** The BrowseBox accessible table objects inherit from this base class. It @@ -52,8 +51,7 @@ public: @param eNameText The constant for the name text. @param eDescrText The constant for the description text. */ AccessibleBrowseBoxTableBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox, ::svt::AccessibleBrowseBoxObjType eObjType ); @@ -65,11 +63,11 @@ public: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /* Derived classes have to implement: - getAccessibleChild, @@ -85,50 +83,50 @@ public: /** @return The number of used rows in the table (0 = empty table). */ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The number of used columns in the table (0 = empty table). */ virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The row extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The column extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The caption cell of the table (not supported). */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getAccessibleCaption() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The summary object of the table (not supported). */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The child index of the specified cell. */ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The row index of the specified child cell. */ virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The column index of the specified child cell. */ virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /* Derived classes have to implement: - getAccessibleRowDescription, @@ -145,9 +143,8 @@ public: // XInterface ------------------------------------------------------------- /** Queries for a new interface. */ - ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; @@ -158,12 +155,12 @@ public: // XTypeProvider ---------------------------------------------------------- /** @return A sequence of possible types (received from base classes). */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return An unique implementation ID. */ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo ----------------------------------------------------------- @@ -233,32 +230,32 @@ protected: /** Fills a sequence with sorted indexes of completely selected rows. @attention This method requires locked mutex's and a living object. @param rSeq Out-parameter that takes the sorted row index list. */ - void implGetSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& rSeq ); + void implGetSelectedRows( css::uno::Sequence< sal_Int32 >& rSeq ); /** Fills a sequence with sorted indexes of completely selected columns. @attention This method requires locked mutex's and a living object. @param rSeq Out-parameter that takes the sorted column index list. */ - void implGetSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& rSeq ); + void implGetSelectedColumns( css::uno::Sequence< sal_Int32 >& rSeq ); /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> If the specified row index is invalid. */ void ensureIsValidRow( sal_Int32 nRow ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw ( css::lang::IndexOutOfBoundsException ); /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> If the specified column index is invalid. */ void ensureIsValidColumn( sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw ( css::lang::IndexOutOfBoundsException ); /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> If the specified cell address is invalid. */ void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw ( css::lang::IndexOutOfBoundsException ); /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> If the specified child index is invalid. */ void ensureIsValidIndex( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw ( css::lang::IndexOutOfBoundsException ); }; diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx index 31b4fa8..bc12acb 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx @@ -25,8 +25,8 @@ namespace accessibility { - typedef ::cppu::ImplHelper2 < ::com::sun::star::accessibility::XAccessibleText - , ::com::sun::star::accessibility::XAccessible + typedef ::cppu::ImplHelper2 < css::accessibility::XAccessibleText + , css::accessibility::XAccessible > AccessibleTextHelper_BASE; // implementation of a table cell of BrowseBox @@ -40,13 +40,13 @@ namespace accessibility protected: // OCommonAccessibleText virtual OUString implGetText() SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale implGetLocale() SAL_OVERRIDE; + virtual css::lang::Locale implGetLocale() SAL_OVERRIDE; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) SAL_OVERRIDE; public: - AccessibleBrowseBoxTableCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + AccessibleBrowseBoxTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ); @@ -56,9 +56,8 @@ namespace accessibility // XInterface ------------------------------------------------------------- /** Queries for a new interface. */ - ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; @@ -68,33 +67,32 @@ namespace accessibility // XEventListener using AccessibleBrowseBoxBase::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessible interface of the specified child. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. @@ -106,29 +104,28 @@ namespace accessibility // XAccessible ------------------------------------------------------------ /** @return The XAccessibleContext interface of this object. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } #endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 352afd4..a9e09dd 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -40,8 +40,8 @@ class AccessibleGridControl : public AccessibleGridControlBase protected: AccessibleGridControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator, ::svt::table::IAccessibleTable& _rTable ); @@ -56,32 +56,30 @@ protected: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The XAccessible interface of the specified child. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent --------------------------------------------------- /** @return The accessible child rendered under the given point. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Grabs the focus to the Grid Control. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo ----------------------------------------------------------- @@ -89,7 +87,7 @@ protected: The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: // helper functions @@ -102,8 +100,8 @@ public: @param rOldValue the old value */ - void commitCellEvent(sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue); + void commitCellEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue); /** commitTableEvent commit the event at all listeners of the table @param nEventId @@ -113,12 +111,11 @@ public: @param rOldValue the old value */ - void commitTableEvent(sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue); + void commitTableEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, + const css::uno::Any& rOldValue); /** returns the accessible object for the row or the column header bar */ - inline ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + inline css::uno::Reference< css::accessibility::XAccessible > getHeaderBar( ::svt::table::AccessibleTableControlObjType _eObjType ) { return implGetHeaderBar(_eObjType); @@ -126,8 +123,7 @@ public: /** returns the accessible object for the table representation */ - inline ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + inline css::uno::Reference< css::accessibility::XAccessible > getTable( ) { return implGetTable(); @@ -148,23 +144,20 @@ protected: /** This method creates (once) and returns the accessible data table child. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the data table. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > implGetTable(); + css::uno::Reference< css::accessibility::XAccessible > implGetTable(); /** This method creates (once) and returns the specified header bar. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the header bar. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > implGetHeaderBar( ::svt::table::AccessibleTableControlObjType eObjType ); /** This method returns one of the children that are always present: Data table, row and column header bar or corner control. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the specified child. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > - implGetFixedChild( sal_Int32 nChildIndex ); + css::uno::Reference< css::accessibility::XAccessible > + implGetFixedChild( sal_Int32 nChildIndex ); /** This method creates and returns an accessible table. @return An AccessibleGridControlTable. */ @@ -181,24 +174,24 @@ private: <p>The instance holds its XAccessibleContext with a hard reference, while the context holds this instance weak.</p> */ -typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible > AccessibleGridControlAccess_Base; +typedef ::cppu::WeakImplHelper< css::accessibility::XAccessible > AccessibleGridControlAccess_Base; class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base ,public ::svt::table::IAccessibleTableControl { private: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > m_xParent; ::svt::table::IAccessibleTable * m_pTable; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > m_xContext; AccessibleGridControl* m_pContext; // note that this pointer is valid as long as m_xContext is valid! public: AccessibleGridControlAccess( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::table::IAccessibleTable& _rTable ); @@ -213,11 +206,11 @@ protected: virtual ~AccessibleGridControlAccess(); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > + SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // IAccessibleTable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > getMyself() SAL_OVERRIDE { return this; @@ -228,21 +221,21 @@ protected: return isContextAlive(); } virtual void commitCellEvent( sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue ) SAL_OVERRIDE + const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) SAL_OVERRIDE { AccessibleGridControl* pContext( getContext() ); if ( pContext ) pContext->commitCellEvent( nEventId, rNewValue, rOldValue ); } virtual void commitTableEvent( sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue ) SAL_OVERRIDE + const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) SAL_OVERRIDE { AccessibleGridControl* pContext( getContext() ); if ( pContext ) pContext->commitTableEvent( nEventId, rNewValue, rOldValue ); } virtual void commitEvent( sal_Int16 nEventId, - const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue ) SAL_OVERRIDE + const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) SAL_OVERRIDE { AccessibleGridControl* pContext( getContext() ); if ( pContext ) diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index dacd8fa..5ab0de3 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -58,10 +58,10 @@ namespace accessibility { typedef ::cppu::WeakAggComponentImplHelper4< - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo > + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo > AccessibleGridControlImplHelper; /** The GridControl accessible objects inherit from this base class. It @@ -78,8 +78,7 @@ public: @param eNameText The constant for the name text. @param eDescrText The constant for the description text. */ AccessibleGridControlBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::table::IAccessibleTable& rTable, ::svt::table::AccessibleTableControlObjType eObjType ); @@ -93,51 +92,48 @@ public: // XAccessibleContext ----------------------------------------------------- /** @return A reference to the parent accessible object. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The description of this object. */ virtual OUString SAL_CALL getAccessibleDescription() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The name of this object. */ virtual OUString SAL_CALL getAccessibleName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The relation set (the GridControl does not have one). */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The set of current states. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The parent's locale. */ - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw ( ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLocale() + throw ( css::accessibility::IllegalAccessibleComponentStateException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported. */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /* Derived classes have to implement: - getAccessibleChildCount, @@ -150,29 +146,29 @@ public: /** @return <TRUE/>, if the point lies within the bounding box of this object. */ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The bounding box of this object. */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The upper left corner of the bounding box relative to the parent. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getLocation() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The upper left corner of the bounding box in screen coordinates. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @return The size of the bounding box. */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Size SAL_CALL getSize() + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* Derived classes have to implement: @@ -182,41 +178,38 @@ public: /** @return The accessible child rendered under the given point. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleEventBroadcaster -------------------------------------------- /** Adds a new event listener */ virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Removes an event listener. */ virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
