diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /accessibility/source/extended/accessibleiconchoicectrlentry.cxx | |
parent | 17d821af6bb9df93569836a92f6bed975587fc6c (diff) |
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using
make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle"
Except some modules have their own foo::tools namespace, so there have
to use ::tools::Rectangle. This commit just moves the class from the
global namespace, it does not update pre/postwin.h yet.
Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2
Reviewed-on: https://gerrit.libreoffice.org/35923
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'accessibility/source/extended/accessibleiconchoicectrlentry.cxx')
-rw-r--r-- | accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 86750fa019eb..6be99bec6c93 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -106,9 +106,9 @@ namespace accessibility } } - Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const + tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const { - Rectangle aRect; + tools::Rectangle aRect; SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex ); if ( pEntry ) aRect = m_pIconCtrl->GetBoundingBox( pEntry ); @@ -116,16 +116,16 @@ namespace accessibility return aRect; } - Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const + tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const { - Rectangle aRect; + tools::Rectangle aRect; SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex ); if ( pEntry ) { aRect = m_pIconCtrl->GetBoundingBox( pEntry ); Point aTopLeft = aRect.TopLeft(); aTopLeft += m_pIconCtrl->GetWindowExtentsRelative( nullptr ).TopLeft(); - aRect = Rectangle( aTopLeft, aRect.GetSize() ); + aRect = tools::Rectangle( aTopLeft, aRect.GetSize() ); } return aRect; @@ -151,7 +151,7 @@ namespace accessibility return bShowing; } - Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() + tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -160,7 +160,7 @@ namespace accessibility return GetBoundingBox_Impl(); } - Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() + tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -347,7 +347,7 @@ namespace accessibility sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) { - return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); + return tools::Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) @@ -428,8 +428,8 @@ namespace accessibility awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( m_pIconCtrl ) { - Rectangle aItemRect = GetBoundingBox_Impl(); - Rectangle aCharRect = m_pIconCtrl->GetEntryCharacterBounds( m_nIndex, _nIndex ); + tools::Rectangle aItemRect = GetBoundingBox_Impl(); + tools::Rectangle aCharRect = m_pIconCtrl->GetEntryCharacterBounds( m_nIndex, _nIndex ); aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() ); aBounds = AWTRectangle( aCharRect ); } @@ -446,7 +446,7 @@ namespace accessibility if ( m_pIconCtrl ) { vcl::ControlLayoutData aLayoutData; - Rectangle aItemRect = GetBoundingBox_Impl(); + tools::Rectangle aItemRect = GetBoundingBox_Impl(); m_pIconCtrl->RecordLayoutData( &aLayoutData, aItemRect ); Point aPnt( VCLPoint( aPoint ) ); aPnt += aItemRect.TopLeft(); @@ -455,7 +455,7 @@ namespace accessibility long nLen = aLayoutData.m_aUnicodeBoundRects.size(); for ( long i = 0; i < nLen; ++i ) { - Rectangle aRect = aLayoutData.GetCharacterBounds(i); + tools::Rectangle aRect = aLayoutData.GetCharacterBounds(i); bool bInside = aRect.IsInside( aPnt ); if ( bInside ) |