diff options
author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
---|---|---|
committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
commit | ecf66d8aa3b1792e53d8b691a7b679fd47133ac9 (patch) | |
tree | 3e08d97c782594c74bc2e88c552150f71e016e5e /accessibility/inc/accessibility/extended | |
parent | 16ae4c1524769458f6d205430e7dcb8fc4ae333b (diff) | |
parent | 8373a5b7946d6731609f989f1aa4a762ed70854a (diff) |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'accessibility/inc/accessibility/extended')
11 files changed, 39 insertions, 47 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index dc43e500dadd..b3728189948c 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -190,7 +190,7 @@ public: // XAccessibleComponent --------------------------------------------------- /** @return - <TRUE/>, if the point lies within the bounding box of this object. */ + <sal_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 ); @@ -212,15 +212,15 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the object is showing. */ + /** @return <sal_True/>, if the object is showing. */ virtual sal_Bool SAL_CALL isShowing() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the object is visible. */ + /** @return <sal_True/>, if the object is visible. */ virtual sal_Bool SAL_CALL isVisible() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the object can accept the focus. */ + /** @return <sal_True/>, if the object can accept the focus. */ virtual sal_Bool SAL_CALL isFocusTraversable() throw ( ::com::sun::star::uno::RuntimeException ); @@ -302,7 +302,7 @@ public: const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue ); - /** @return <TRUE/>, if the object is not disposed or disposing. */ + /** @return <sal_True/>, if the object is not disposed or disposing. */ sal_Bool isAlive() const; protected: @@ -312,7 +312,7 @@ protected: its parent accessible window. Derived classes may implement different behaviour. @attention This method requires locked mutex's and a living object. - @return <TRUE/>, if the object is really showing. */ + @return <sal_True/>, if the object is really showing. */ virtual sal_Bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 5ab160535aa0..599a98b54012 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -48,8 +48,8 @@ namespace accessibility { private: TriState m_eState; - BOOL m_bEnabled; - BOOL m_bIsTriState; + sal_Bool m_bEnabled; + sal_Bool m_bIsTriState; protected: virtual ~AccessibleCheckBoxCell() {} diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx index ac0b2761eb1f..28e693e10c79 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -131,12 +131,12 @@ public: getSelectedAccessibleColumns() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified row is completely selected. */ + /** @return <sal_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 ); - /** @return <TRUE/>, if the specified column is completely selected. */ + /** @return <sal_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 ); @@ -149,7 +149,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified cell is selected. */ + /** @return <sal_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 ); @@ -161,7 +161,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified child (row/column) is selected. */ + /** @return <sal_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 ); @@ -232,9 +232,9 @@ protected: // internal helper methods ------------------------------------------------ - /** @return <TRUE/>, if the objects is a header bar for rows. */ + /** @return <sal_True/>, if the objects is a header bar for rows. */ inline sal_Bool isRowBar() const; - /** @return <TRUE/>, if the objects is a header bar for columns. */ + /** @return <sal_True/>, if the objects is a header bar for columns. */ inline sal_Bool isColumnBar() const; /** Returns the specified row or column. Uses one of the parameters, diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx index afb345487239..e9474f703044 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx @@ -116,12 +116,12 @@ public: getSelectedAccessibleColumns() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified row is completely selected. */ + /** @return <sal_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 ); - /** @return <TRUE/>, if the specified column is completely selected. */ + /** @return <sal_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 ); @@ -134,7 +134,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified cell is selected. */ + /** @return <sal_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 ); diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx index fa6ce94cfc7f..f4efb30466ae 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx @@ -191,7 +191,7 @@ protected: // internal helper methods ------------------------------------------------ - /** @return <TRUE/>, if first BrowseBox column is the "handle column". */ + /** @return <sal_True/>, if first BrowseBox column is the "handle column". */ sal_Bool implHasHandleColumn() const; /** @attention This method requires locked mutex's and a living object. @@ -217,19 +217,19 @@ protected: sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const; /** @attention This method requires locked mutex's and a living object. - @return <TRUE/>, if the specified row is selected. */ + @return <sal_True/>, if the specified row is selected. */ sal_Bool implIsRowSelected( sal_Int32 nRow ) const; /** @attention This method requires locked mutex's and a living object. - @return <TRUE/>, if the specified column is selected. */ + @return <sal_True/>, if the specified column is selected. */ sal_Bool implIsColumnSelected( sal_Int32 nColumn ) const; /** Selects/deselects a row (tries to expand selection). @attention This method requires locked mutex's and a living object. - @param bSelect <TRUE/> = select, <FALSE/> = deselect */ + @param bSelect <sal_True/> = select, <sal_False/> = deselect */ void implSelectRow( sal_Int32 nRow, sal_Bool bSelect ); /** Selects/deselects a column (tries to expand selection). @attention This method requires locked mutex's and a living object. - @param bSelect <TRUE/> = select, <FALSE/> = deselect */ + @param bSelect <sal_True/> = select, <sal_False/> = deselect */ void implSelectColumn( sal_Int32 nColumnPos, sal_Bool bSelect ); /** @attention This method requires locked mutex's and a living object. diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index c6a26d8c4548..53e7eec6fde7 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -166,7 +166,7 @@ public: // XAccessibleComponent --------------------------------------------------- /** @return - <TRUE/>, if the point lies within the bounding box of this object. */ + <sal_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 ); @@ -188,15 +188,15 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the object is showing. */ + /** @return <sal_True/>, if the object is showing. */ virtual sal_Bool SAL_CALL isShowing() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the object is visible. */ + /** @return <sal_True/>, if the object is visible. */ virtual sal_Bool SAL_CALL isVisible() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the object can accept the focus. */ + /** @return <sal_True/>, if the object can accept the focus. */ virtual sal_Bool SAL_CALL isFocusTraversable() throw ( ::com::sun::star::uno::RuntimeException ); @@ -269,7 +269,7 @@ public: const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue ); - /** @return <TRUE/>, if the object is not disposed or disposing. */ + /** @return <sal_True/>, if the object is not disposed or disposing. */ sal_Bool isAlive() const; protected: @@ -279,7 +279,7 @@ protected: its parent accessible window. Derived classes may implement different behaviour. @attention This method requires locked mutex's and a living object. - @return <TRUE/>, if the object is really showing. */ + @return <sal_True/>, if the object is really showing. */ virtual sal_Bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index 90306435bd4b..538c1a224acd 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx @@ -125,12 +125,12 @@ public: getSelectedAccessibleColumns() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified row is completely selected. */ + /** @return <sal_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 ); - /** @return <TRUE/>, if the specified column is completely selected. */ + /** @return <sal_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 ); @@ -143,7 +143,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified cell is selected. */ + /** @return <sal_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 ); @@ -190,9 +190,9 @@ protected: // internal helper methods ------------------------------------------------ - /** @return <TRUE/>, if the objects is a header bar for rows. */ + /** @return <sal_True/>, if the objects is a header bar for rows. */ inline sal_Bool isRowBar() const; - /** @return <TRUE/>, if the objects is a header bar for columns. */ + /** @return <sal_True/>, if the objects is a header bar for columns. */ inline sal_Bool isColumnBar() const; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index 8058594d2938..6315b1027695 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx @@ -120,12 +120,12 @@ public: getSelectedAccessibleColumns() throw ( ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified row is completely selected. */ + /** @return <sal_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 ); - /** @return <TRUE/>, if the specified column is completely selected. */ + /** @return <sal_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 ); @@ -138,7 +138,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified cell is selected. */ + /** @return <sal_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 ); @@ -150,7 +150,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); - /** @return <TRUE/>, if the specified child (row/column) is selected. */ + /** @return <sal_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 ); diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index 28d9cfb919f1..bee42d85e2a2 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx @@ -174,14 +174,6 @@ protected: // internal helper methods ------------------------------------------------ /** @attention This method requires locked mutex's and a living object. - @param nColumn - the position of the column in the Accessible world - @return - the position of the column in VCL the Accessible world - */ - sal_uInt16 implToVCLColumnPos( sal_Int32 nColumn ) const; - - /** @attention This method requires locked mutex's and a living object. @return The number of cells of the table. */ sal_Int32 implGetChildCount() const; diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx index 245645dfebf0..06dbd20f665a 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -128,7 +128,7 @@ namespace accessibility is our parent accessible object */ AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl, - ULONG _nPos, + sal_uIntPtr _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent ); // XTypeProvider diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index d4b3be6c5bf3..f8da1321586a 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -624,7 +624,7 @@ private: // Must be called with both the external (Solar) and internal mutex // locked, and after init has been called: - void changeParagraphText(::ULONG nNumber, ::USHORT nBegin, ::USHORT nEnd, + void changeParagraphText(::sal_uIntPtr nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd, bool bCut, bool bPaste, ::rtl::OUString const & rText); |