From 2f3ea8dfbc7dedc785cd07ad0b681a0da3904a80 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 21 Oct 2015 12:42:16 +0200 Subject: refactor out some com::sun::star typedefs which mostly serve to make the code harder to read Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8 --- .../source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'accessibility/source') diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index dbd5cd05ff6d..84b0eb7822bc 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -35,9 +35,6 @@ namespace accessibility { - typedef ::com::sun::star::awt::Rectangle UnoRectangle; - typedef ::com::sun::star::awt::Point UnoPoint; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -318,7 +315,7 @@ namespace accessibility return pStateSet; } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const css::awt::Point& i_rLocation ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_xImpl ); // we do not have children ... @@ -368,15 +365,15 @@ namespace accessibility return m_xImpl->getPanelDisplayName(); } - UnoRectangle AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException) + css::awt::Rectangle AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException) { ItemMethodGuard aGuard( *m_xImpl ); const ::Rectangle aItemScreenRect( m_xImpl->getTabBar()->GetItemScreenRect( m_xImpl->getItemPos() ) ); Reference< XAccessibleComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_SET_THROW ); - const UnoPoint aParentLocation( xParentComponent->getLocationOnScreen() ); - return UnoRectangle( + const css::awt::Point aParentLocation( xParentComponent->getLocationOnScreen() ); + return css::awt::Rectangle( aItemScreenRect.Left() - aParentLocation.X, aItemScreenRect.Top() - aParentLocation.Y, aItemScreenRect.GetWidth(), -- cgit