From b22d4785310eac35696df771803dfba0871a50ac Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 17 Sep 2021 21:49:21 +0200 Subject: clean up ambiguous confusing rectangle APIs like IsInside() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reading 'rectA.IsInside( rectB )' kind of suggests that the code checks whether 'rectA is inside rectB', but it's actually the other way around. Rename IsInside() -> Contains(), IsOver() -> Overlaps(), which should make it clear which way the logic goes. Change-Id: I9347450fe7dc34c96df6d636a4e3e660de1801ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122271 Reviewed-by: Noel Grandin Reviewed-by: Luboš Luňák Tested-by: Jenkins --- accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'accessibility/source/extended/AccessibleBrowseBoxBase.cxx') diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 40ffe655ba76..ee64200065d1 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -209,7 +209,7 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale() sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const css::awt::Point& rPoint ) { - return tools::Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); + return tools::Rectangle( Point(), getBoundingBox().GetSize() ).Contains( VCLPoint( rPoint ) ); } awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds() @@ -348,7 +348,7 @@ bool AccessibleBrowseBoxBase::implIsShowing() css::uno::Reference< css::accessibility::XAccessibleComponent > xParentComp( mxParent->getAccessibleContext(), uno::UNO_QUERY ); if( xParentComp.is() ) - bShowing = implGetBoundingBox().IsOver( + bShowing = implGetBoundingBox().Overlaps( VCLRectangle( xParentComp->getBounds() ) ); } return bShowing; -- cgit v1.2.3