diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /starmath/source/accessibility.cxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'starmath/source/accessibility.cxx')
| -rw-r--r-- | starmath/source/accessibility.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index f7e3d0d3a1a0..6388cc604dd1 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -62,7 +62,7 @@ using namespace com::sun::star::accessibility; -static awt::Rectangle lcl_GetBounds( Window *pWin ) +static awt::Rectangle lcl_GetBounds( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::implGetBounds() @@ -77,7 +77,7 @@ static awt::Rectangle lcl_GetBounds( Window *pWin ) aBounds.Y = aRect.Top(); aBounds.Width = aRect.GetWidth(); aBounds.Height = aRect.GetHeight(); - Window* pParent = pWin->GetAccessibleParentWindow(); + vcl::Window* pParent = pWin->GetAccessibleParentWindow(); if (pParent) { Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); @@ -89,7 +89,7 @@ static awt::Rectangle lcl_GetBounds( Window *pWin ) return aBounds; } -static awt::Point lcl_GetLocationOnScreen( Window *pWin ) +static awt::Point lcl_GetLocationOnScreen( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::getLocationOnScreen() @@ -314,7 +314,7 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent() if (!pWin) throw RuntimeException(); - Window *pAccParent = pWin->GetAccessibleParentWindow(); + vcl::Window *pAccParent = pWin->GetAccessibleParentWindow(); OSL_ENSURE( pAccParent, "accessible parent missing" ); return pAccParent ? pAccParent->GetAccessible() : Reference< XAccessible >(); } @@ -324,7 +324,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() { SolarMutexGuard aGuard; sal_Int32 nIdx = -1; - Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; + vcl::Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) { sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount(); @@ -1822,7 +1822,7 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent( ) if (!pWin) throw RuntimeException(); - Window *pAccParent = pWin->GetAccessibleParentWindow(); + vcl::Window *pAccParent = pWin->GetAccessibleParentWindow(); OSL_ENSURE( pAccParent, "accessible parent missing" ); return pAccParent ? pAccParent->GetAccessible() : Reference< XAccessible >(); } @@ -1832,7 +1832,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( ) { SolarMutexGuard aGuard; sal_Int32 nIdx = -1; - Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; + vcl::Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) { sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount(); |