diff options
Diffstat (limited to 'accessibility/inc')
16 files changed, 51 insertions, 51 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 781a9afeb0d8..ea96ca44be00 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -141,10 +141,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; // internal helper methods diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index 0448ddfa930b..64c9636e9be5 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -247,11 +247,11 @@ protected: /** Derived classes return the bounding box relative to the parent window. @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() = 0; + virtual tools::Rectangle implGetBoundingBox() = 0; /** Derived classes return the bounding box in screen coordinates. @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() = 0; + virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. This method calls FillStateSet at the BrowseBox which @@ -272,13 +272,13 @@ protected: @return The bounding box (VCL rect.) relative to the parent object. @throws css::lang::DisposedException */ - Rectangle getBoundingBox(); + tools::Rectangle getBoundingBox(); /** Locks all mutex's and calculates the bounding box in screen coordinates. @return The bounding box (VCL rect.) in screen coordinates. @throws css::lang::DisposedException */ - Rectangle getBoundingBoxOnScreen(); + tools::Rectangle getBoundingBoxOnScreen(); ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx index c81c836a4de8..7ad695f235f0 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -162,10 +162,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; /** @attention This method requires locked mutex's and a living object. @return The count of used rows. */ diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index c9659708f9aa..fe7e5e88c399 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -63,9 +63,9 @@ namespace accessibility ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; protected: - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; }; } diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx index a6735dcdffcc..25ff5b478f97 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx @@ -107,10 +107,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; // internal helper methods diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 362dee2ea120..3bcaaac1d288 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -111,10 +111,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; // internal helper methods ------------------------------------------------ diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index 3c8dd7cbb11e..2c9cbd42fae1 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -214,11 +214,11 @@ protected: /** Derived classes return the bounding box relative to the parent window. @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() = 0; + virtual tools::Rectangle implGetBoundingBox() = 0; ///** Derived classes return the bounding box in screen coordinates. // @attention This method requires locked mutex's and a living object. // @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() = 0; + virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. This method calls FillStateSet at the GridControl which @@ -242,12 +242,12 @@ protected: @return The bounding box (VCL rect.) relative to the parent object. @throws css::lang::DisposedException */ - Rectangle getBoundingBox(); + tools::Rectangle getBoundingBox(); ///** Locks all mutex's and calculates the bounding box in screen // coordinates. // @return The bounding box (VCL rect.) in screen coordinates. */ /// @throws css::lang::DisposedException - Rectangle getBoundingBoxOnScreen(); + tools::Rectangle getBoundingBoxOnScreen(); ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index 439941a67a55..8024b504dfe4 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -124,10 +124,10 @@ protected: implGetChild( sal_Int32 nRow, sal_uInt32 nColumnPos ); /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; // internal helper methods diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index bece5123ad85..b36089a05332 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -73,9 +73,9 @@ namespace accessibility ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; protected: - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; }; } diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index df91b96c664e..b00fdaf062c3 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -152,10 +152,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ - virtual Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBox() override; ///** @attention This method requires locked mutex's and a living object. // @return The bounding box (VCL rect.) in screen coordinates. */ - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; //// internal helper methods diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index eeef6d32a82e..d66b399504c4 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -69,8 +69,8 @@ namespace accessibility virtual OUString implGetText() override; virtual css::lang::Locale implGetLocale() override; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; - virtual Rectangle implGetBoundingBox() override; - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; public: AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx index eb82e4862726..e24c8e999f08 100644 --- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx @@ -45,8 +45,8 @@ namespace accessibility protected: // AccessibleBrowseBoxBase overridables - virtual Rectangle implGetBoundingBox() override; - virtual Rectangle implGetBoundingBoxOnScreen() override; + virtual tools::Rectangle implGetBoundingBox() override; + virtual tools::Rectangle implGetBoundingBoxOnScreen() override; // XAccessibleComponent virtual void SAL_CALL grabFocus() override; diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index fb020db028b5..1b1f6a832414 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -73,17 +73,17 @@ namespace accessibility css::uno::Reference< css::accessibility::XAccessible > m_xParent; private: - Rectangle GetBoundingBox_Impl() const; - Rectangle GetBoundingBoxOnScreen_Impl() const; + tools::Rectangle GetBoundingBox_Impl() const; + tools::Rectangle GetBoundingBoxOnScreen_Impl() const; bool IsAlive_Impl() const; bool IsShowing_Impl() const; /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBox(); + tools::Rectangle GetBoundingBox(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen(); + tools::Rectangle GetBoundingBoxOnScreen(); /// @throws css::lang::DisposedException void EnsureIsAlive() const; diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 90d4b0a3811e..7690d440806c 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -89,17 +89,17 @@ namespace accessibility m_aParent; private: - Rectangle GetBoundingBox_Impl() const; - Rectangle GetBoundingBoxOnScreen_Impl() const; + tools::Rectangle GetBoundingBox_Impl() const; + tools::Rectangle GetBoundingBoxOnScreen_Impl() const; bool IsAlive_Impl() const; bool IsShowing_Impl() const; /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBox(); + tools::Rectangle GetBoundingBox(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen(); + tools::Rectangle GetBoundingBoxOnScreen(); /// @throws css::lang::DisposedException void EnsureIsAlive() const; diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index bcb195b4c8a5..8c60bc5b8070 100644 --- a/accessibility/inc/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp } } } } } class Point; -class Rectangle; +namespace tools { class Rectangle; } namespace vcl { class Window; } namespace accessibility { @@ -39,9 +39,9 @@ namespace accessibility virtual ~IComboListBoxHelper() = 0; virtual OUString GetEntry( sal_Int32 nPos ) const = 0; - virtual Rectangle GetDropDownPosSizePixel( ) const = 0; - virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0; - virtual Rectangle GetWindowExtentsRelative() = 0; + virtual tools::Rectangle GetDropDownPosSizePixel( ) const = 0; + virtual tools::Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0; + virtual tools::Rectangle GetWindowExtentsRelative() = 0; virtual bool IsEnabled() const = 0; virtual bool IsEntryVisible( sal_Int32 nPos ) const = 0; virtual sal_uInt16 GetDisplayLineCount() const = 0; @@ -57,7 +57,7 @@ namespace accessibility virtual void SetNoSelection() = 0; virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex ) const = 0; virtual bool IsInDropDown() const = 0; - virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0; + virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0; virtual long GetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0; virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetClipboard() = 0; diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx index 570e46ffce03..8bc7e2dae2ef 100644 --- a/accessibility/inc/helper/listboxhelper.hxx +++ b/accessibility/inc/helper/listboxhelper.hxx @@ -50,32 +50,32 @@ public: return m_aComboListBox.GetEntry( nPos ); } - virtual Rectangle GetDropDownPosSizePixel() const override + virtual tools::Rectangle GetDropDownPosSizePixel() const override { - Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr); - Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel(); + tools::Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr); + tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel(); aRet.Move(aTemp.TopLeft().X(),aTemp.TopLeft().Y()); return aRet; } - virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const override + virtual tools::Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const override { - Rectangle aRect; + tools::Rectangle aRect; if ( m_aComboListBox.IsInDropDown() && IsEntryVisible( nItem ) ) { - Rectangle aTemp = m_aComboListBox.GetDropDownPosSizePixel(); + tools::Rectangle aTemp = m_aComboListBox.GetDropDownPosSizePixel(); Size aSize = aTemp.GetSize(); aSize.Height() /= m_aComboListBox.GetDisplayLineCount(); Point aTopLeft = aTemp.TopLeft(); aTopLeft.Y() += aSize.Height() * ( nItem - m_aComboListBox.GetTopEntry() ); - aRect = Rectangle( aTopLeft, aSize ); + aRect = tools::Rectangle( aTopLeft, aSize ); } else aRect = m_aComboListBox.GetBoundingRectangle( nItem ); return aRect; } - virtual Rectangle GetWindowExtentsRelative() override + virtual tools::Rectangle GetWindowExtentsRelative() override { return m_aComboListBox.GetWindowExtentsRelative( nullptr ); } @@ -157,9 +157,9 @@ public: return m_aComboListBox.IsInDropDown(); } - virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const override + virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const override { - Rectangle aRect; + tools::Rectangle aRect; Pair aEntryCharacterRange = m_aComboListBox.GetLineStartEnd( _nEntryPos ); if ( aEntryCharacterRange.A() + _nCharacterIndex <= aEntryCharacterRange.B() ) |