[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source framework/source include/sfx2 include/tools include/vcl oox/source reportdesign/source sc/qa sc/source sd/qa sd/source sfx2/source starmath/source svtools/source svx/source sw/inc sw/qa sw/source toolkit/source tools/qa tools/source vcl/inc vcl/osx vcl/source vcl/unx vcl/win vcl/workben
Luboš Luňák (via logerrit)
logerrit at kemper.freedesktop.org
Mon Sep 20 10:12:03 UTC 2021
accessibility/source/extended/AccessibleBrowseBox.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 4
accessibility/source/extended/AccessibleGridControl.cxx | 2
accessibility/source/extended/AccessibleGridControlBase.cxx | 4
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 6 -
accessibility/source/extended/accessiblelistboxentry.cxx | 6 -
accessibility/source/extended/accessibletabbar.cxx | 2
accessibility/source/extended/accessibletabbarpagelist.cxx | 2
accessibility/source/standard/accessiblemenubasecomponent.cxx | 2
accessibility/source/standard/vclxaccessiblelistitem.cxx | 2
accessibility/source/standard/vclxaccessibletabpage.cxx | 2
basctl/source/accessibility/accessibledialogwindow.cxx | 4
basctl/source/basicide/bastypes.cxx | 2
basctl/source/dlged/dlgedfunc.cxx | 4
basctl/source/dlged/dlgedview.cxx | 2
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 4
dbaccess/source/ui/querydesign/JoinTableView.cxx | 4
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 4
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6 -
desktop/source/lib/init.cxx | 10 -
drawinglayer/source/processor2d/vclprocessor2d.cxx | 4
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 6 -
editeng/source/accessibility/AccessibleImageBullet.cxx | 2
editeng/source/accessibility/AccessibleStringWrap.cxx | 2
editeng/source/editeng/impedit.cxx | 12 +-
editeng/source/outliner/outlin2.cxx | 2
editeng/source/outliner/outlvw.cxx | 8 -
editeng/source/uno/unoedprx.cxx | 2
extensions/source/scanner/grid.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 24 ++--
include/sfx2/LokControlHandler.hxx | 4
include/tools/gen.hxx | 14 +-
include/tools/poly.hxx | 2
include/vcl/region.hxx | 4
oox/source/vml/vmldrawing.cxx | 2
reportdesign/source/ui/report/SectionView.cxx | 2
reportdesign/source/ui/report/StartMarker.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 4
reportdesign/source/ui/report/dlgedfunc.cxx | 2
sc/qa/unit/tiledrendering/tiledrendering.cxx | 2
sc/source/core/data/documen5.cxx | 2
sc/source/core/data/documen9.cxx | 8 -
sc/source/core/data/drwlayer.cxx | 12 +-
sc/source/core/tool/detfunc.cxx | 6 -
sc/source/filter/html/htmlexp2.cxx | 2
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 4
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 14 +-
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/drawfunc/fudraw.cxx | 2
sc/source/ui/drawfunc/fusel2.cxx | 2
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/view/gridwin.cxx | 16 +-
sc/source/ui/view/gridwin2.cxx | 4
sc/source/ui/view/prevloc.cxx | 8 -
sc/source/ui/view/printfun.cxx | 4
sc/source/ui/view/tabview3.cxx | 2
sd/qa/unit/tiledrendering/tiledrendering.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/docshell/sdclient.cxx | 2
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/func/fupoor.cxx | 4
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 6 -
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 6 -
sd/source/ui/view/drviews4.cxx | 8 -
sd/source/ui/view/drviewsh.cxx | 2
sd/source/ui/view/sdview2.cxx | 4
sd/source/ui/view/sdview3.cxx | 6 -
sd/source/ui/view/sdview4.cxx | 4
sfx2/source/appl/workwin.cxx | 2
sfx2/source/control/recentdocsviewitem.cxx | 4
sfx2/source/control/thumbnailview.cxx | 4
sfx2/source/control/thumbnailviewacc.cxx | 4
sfx2/source/control/thumbnailviewitem.cxx | 2
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/splitwin.cxx | 2
sfx2/source/sidebar/SidebarDockingWindow.cxx | 4
sfx2/source/view/lokcharthelper.cxx | 8 -
sfx2/source/view/viewsh.cxx | 2
starmath/source/ElementsDockingWindow.cxx | 20 +--
starmath/source/accessibility.cxx | 2
starmath/source/dialog.cxx | 2
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 4
svtools/source/brwbox/ebbcontrols.cxx | 2
svtools/source/control/accessibleruler.cxx | 2
svtools/source/control/ruler.cxx | 8 -
svtools/source/control/tabbar.cxx | 2
svtools/source/control/valueacc.cxx | 4
svtools/source/control/valueset.cxx | 4
svx/source/accessibility/AccessibleTextHelper.cxx | 2
svx/source/accessibility/ChildrenManagerImpl.cxx | 4
svx/source/dialog/charmap.cxx | 2
svx/source/dialog/contwnd.cxx | 4
svx/source/dialog/frmsel.cxx | 2
svx/source/dialog/graphctl.cxx | 6 -
svx/source/dialog/imapwnd.cxx | 2
svx/source/dialog/swframeexample.cxx | 6 -
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/svdraw/svdedtv.cxx | 4
svx/source/svdraw/svdedtv2.cxx | 4
svx/source/svdraw/svdedxv.cxx | 6 -
svx/source/svdraw/svdetc.cxx | 2
svx/source/svdraw/svdglue.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 6 -
svx/source/svdraw/svdmrkv1.cxx | 4
svx/source/svdraw/svdoedge.cxx | 4
svx/source/svdraw/svdpntv.cxx | 2
svx/source/svdraw/svdsnpv.cxx | 4
svx/source/unodraw/UnoGraphicExporter.cxx | 2
sw/inc/crsrsh.hxx | 2
sw/inc/swrect.hxx | 6 -
sw/inc/viscrs.hxx | 2
sw/qa/core/layout/layout.cxx | 2
sw/qa/extras/layout/layout.cxx | 8 -
sw/qa/extras/layout/layout2.cxx | 2
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 4
sw/qa/extras/tiledrendering/tiledrendering.cxx | 8 -
sw/source/core/access/acccontext.cxx | 10 -
sw/source/core/access/accdoc.cxx | 4
sw/source/core/access/accframe.cxx | 4
sw/source/core/access/accframe.hxx | 2
sw/source/core/access/accfrmobjmap.cxx | 6 -
sw/source/core/access/accfrmobjslist.cxx | 4
sw/source/core/access/accmap.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/acctable.cxx | 2
sw/source/core/bastyp/swrect.cxx | 10 -
sw/source/core/bastyp/swregion.cxx | 6 -
sw/source/core/crsr/crsrsh.cxx | 8 -
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/core/crsr/trvlfnfl.cxx | 2
sw/source/core/crsr/viscrs.cxx | 10 -
sw/source/core/doc/docfly.cxx | 4
sw/source/core/doc/notxtfrm.cxx | 4
sw/source/core/docnode/ndtbl1.cxx | 2
sw/source/core/docnode/node.cxx | 2
sw/source/core/draw/dflyobj.cxx | 4
sw/source/core/draw/dpage.cxx | 4
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/frmedt/feshview.cxx | 18 +--
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/frmedt/fews.cxx | 2
sw/source/core/frmedt/tblsel.cxx | 14 +-
sw/source/core/layout/anchoredobject.cxx | 2
sw/source/core/layout/findfrm.cxx | 10 -
sw/source/core/layout/flowfrm.cxx | 2
sw/source/core/layout/flycnt.cxx | 14 +-
sw/source/core/layout/flylay.cxx | 6 -
sw/source/core/layout/frmtool.cxx | 24 ++--
sw/source/core/layout/layact.cxx | 10 -
sw/source/core/layout/pagechg.cxx | 4
sw/source/core/layout/paintfrm.cxx | 56 +++++-----
sw/source/core/layout/tabfrm.cxx | 4
sw/source/core/layout/trvlfrm.cxx | 40 +++----
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2
sw/source/core/ole/ndole.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2
sw/source/core/text/frmcrsr.cxx | 2
sw/source/core/text/frmpaint.cxx | 4
sw/source/core/text/itrcrsr.cxx | 4
sw/source/core/text/itrform2.cxx | 6 -
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/txtfly.cxx | 16 +-
sw/source/core/view/pagepreviewlayout.cxx | 6 -
sw/source/core/view/vdraw.cxx | 4
sw/source/core/view/viewimp.cxx | 4
sw/source/core/view/viewsh.cxx | 28 ++---
sw/source/ui/config/optpage.cxx | 2
sw/source/uibase/docvw/AnnotationWin2.cxx | 2
sw/source/uibase/docvw/HeaderFooterWin.cxx | 4
sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx | 2
sw/source/uibase/docvw/PageBreakWin.cxx | 4
sw/source/uibase/docvw/PostItMgr.cxx | 6 -
sw/source/uibase/docvw/UnfloatTableButton.cxx | 2
sw/source/uibase/docvw/edtdd.cxx | 6 -
sw/source/uibase/docvw/edtwin.cxx | 8 -
sw/source/uibase/docvw/edtwin2.cxx | 4
sw/source/uibase/misc/swruler.cxx | 6 -
sw/source/uibase/uiview/swcli.cxx | 2
sw/source/uibase/uiview/viewport.cxx | 6 -
sw/source/uibase/wrtsh/move.cxx | 4
toolkit/source/awt/vclxaccessiblecomponent.cxx | 2
toolkit/source/hatchwindow/ipwin.cxx | 4
tools/qa/cppunit/test_rectangle.cxx | 15 ++
tools/source/generic/gen.cxx | 8 -
tools/source/generic/poly.cxx | 4
tools/source/memtools/multisel.cxx | 18 +--
vcl/inc/regband.hxx | 2
vcl/inc/regionband.hxx | 2
vcl/osx/salnativewidgets.cxx | 2
vcl/source/app/help.cxx | 2
vcl/source/app/svapp.cxx | 2
vcl/source/control/button.cxx | 24 ++--
vcl/source/control/calendar.cxx | 4
vcl/source/control/edit.cxx | 4
vcl/source/control/imivctl1.cxx | 26 ++--
vcl/source/control/imp_listbox.cxx | 4
vcl/source/control/scrbar.cxx | 26 ++--
vcl/source/control/slider.cxx | 8 -
vcl/source/control/spinbtn.cxx | 16 +-
vcl/source/control/spinfld.cxx | 18 +--
vcl/source/control/tabctrl.cxx | 16 +-
vcl/source/gdi/regband.cxx | 2
vcl/source/gdi/region.cxx | 8 -
vcl/source/gdi/regionband.cxx | 4
vcl/source/graphic/GraphicObject.cxx | 2
vcl/source/outdev/text.cxx | 4
vcl/source/outdev/transparent.cxx | 6 -
vcl/source/treelist/headbar.cxx | 4
vcl/source/treelist/imap.cxx | 4
vcl/source/treelist/svimpbox.cxx | 6 -
vcl/source/treelist/svtabbx.cxx | 2
vcl/source/treelist/treelistbox.cxx | 4
vcl/source/window/brdwin.cxx | 22 +--
vcl/source/window/dockmgr.cxx | 2
vcl/source/window/event.cxx | 4
vcl/source/window/floatwin.cxx | 4
vcl/source/window/layout.cxx | 2
vcl/source/window/mouse.cxx | 6 -
vcl/source/window/seleng.cxx | 4
vcl/source/window/splitwin.cxx | 24 ++--
vcl/source/window/stacking.cxx | 4
vcl/source/window/status.cxx | 4
vcl/source/window/toolbox.cxx | 26 ++--
vcl/source/window/toolbox2.cxx | 6 -
vcl/unx/generic/app/wmadaptor.cxx | 4
vcl/unx/generic/window/salframe.cxx | 6 -
vcl/win/window/salframe.cxx | 6 -
vcl/workben/vcldemo.cxx | 2
236 files changed, 678 insertions(+), 663 deletions(-)
New commits:
commit b22d4785310eac35696df771803dfba0871a50ac
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri Sep 17 21:49:21 2021 +0200
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Sep 20 12:10:44 2021 +0200
clean up ambiguous confusing rectangle APIs like IsInside()
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 <noel.grandin at collabora.co.uk>
Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
Tested-by: Jenkins
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 4a5b27f5249f..7dd780508816 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -147,7 +147,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
if( xCurrChildComp.is() &&
- VCLRectangle( xCurrChildComp->getBounds() ).IsInside( aPoint ) )
+ VCLRectangle( xCurrChildComp->getBounds() ).Contains( aPoint ) )
xChild = xCurrChild;
}
}
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;
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 22e6539b8afd..c90cc0384b46 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -166,7 +166,7 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
if( xCurrChildComp.is() &&
- VCLRectangle( xCurrChildComp->getBounds() ).IsInside( aPoint ) )
+ VCLRectangle( xCurrChildComp->getBounds() ).Contains( aPoint ) )
xChild = xCurrChild;
}
}
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 34a6edadfa7d..c118c70f7a32 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -184,7 +184,7 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale()
sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const 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 AccessibleGridControlBase::getBounds()
@@ -273,7 +273,7 @@ bool AccessibleGridControlBase::implIsShowing()
css::uno::Reference< css::accessibility::XAccessibleComponent >
xParentComp( m_xParent->getAccessibleContext(), uno::UNO_QUERY );
if( xParentComp.is() )
- bShowing = implGetBoundingBox().IsOver(
+ bShowing = implGetBoundingBox().Overlaps(
VCLRectangle( xParentComp->getBounds() ) );
}
return bShowing;
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 8cc2f083ad63..5a995a94fc91 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -138,7 +138,7 @@ namespace accessibility
{
Reference< XAccessibleComponent > xParentComp( xParentContext, uno::UNO_QUERY );
if( xParentComp.is() )
- bShowing = GetBoundingBox_Impl().IsOver( VCLRectangle( xParentComp->getBounds() ) );
+ bShowing = GetBoundingBox_Impl().Overlaps( VCLRectangle( xParentComp->getBounds() ) );
}
return bShowing;
@@ -336,7 +336,7 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint )
{
- return tools::Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+ return tools::Rectangle( Point(), GetBoundingBox().GetSize() ).Contains( VCLPoint( rPoint ) );
}
Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& )
@@ -445,7 +445,7 @@ namespace accessibility
for ( tools::Long i = 0; i < nLen; ++i )
{
tools::Rectangle aRect = aLayoutData.GetCharacterBounds(i);
- bool bInside = aRect.IsInside( aPnt );
+ bool bInside = aRect.Contains( aPnt );
if ( bInside )
break;
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 06cc2cf6897e..716955b69595 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -175,7 +175,7 @@ namespace accessibility
{
Reference< XAccessibleComponent > xParentComp( xParentContext, uno::UNO_QUERY );
if( xParentComp.is() )
- bShowing = GetBoundingBox_Impl().IsOver( VCLRectangle( xParentComp->getBounds() ) );
+ bShowing = GetBoundingBox_Impl().Overlaps( VCLRectangle( xParentComp->getBounds() ) );
}
return bShowing;
@@ -544,7 +544,7 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint )
{
- return tools::Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+ return tools::Rectangle( Point(), GetBoundingBox().GetSize() ).Contains( VCLPoint( rPoint ) );
}
Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint )
@@ -562,7 +562,7 @@ namespace accessibility
assert(xListBox.is());
auto pAccEntry = m_rListBox.implGetAccessible(*pEntry);
tools::Rectangle aRect = pAccEntry->GetBoundingBox_Impl();
- if ( aRect.IsInside( VCLPoint( _aPoint ) ) )
+ if ( aRect.Contains( VCLPoint( _aPoint ) ) )
xAcc = pAccEntry.get();
return xAcc;
}
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 218ed1cab071..e983c1e47471 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -385,7 +385,7 @@ namespace accessibility
{
tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
Point aPos = VCLPoint( rPoint );
- if ( aRect.IsInside( aPos ) )
+ if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 37b1ab279522..3c7f9976e0af 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -514,7 +514,7 @@ namespace accessibility
{
tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
Point aPos = VCLPoint( rPoint );
- if ( aRect.IsInside( aPos ) )
+ if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index e873322f9c56..bce5968c7cfc 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -361,7 +361,7 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po
{
tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
Point aPos = VCLPoint( rPoint );
- if ( aRect.IsInside( aPos ) )
+ if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index e25c1070f8ed..dea8682c127e 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -293,7 +293,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi
{
tools::Rectangle aRect(pListBoxHelper->GetBoundingRectangle(static_cast<sal_uInt16>(m_nIndexInParent)));
aRect.Move(-aRect.Left(), -aRect.Top());
- bInside = aRect.IsInside( VCLPoint( _aPoint ) );
+ bInside = aRect.Contains( VCLPoint( _aPoint ) );
}
return bInside;
}
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 3c0a9ada8e1d..8dd5a24199f7 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -421,7 +421,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
{
tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
Point aPos = VCLPoint( rPoint );
- if ( aRect.IsInside( aPos ) )
+ if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 0b641c8aca5e..e52d08bfe458 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -194,7 +194,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
// check, if the shape's bounding box intersects with the bounding box of its parent
tools::Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
- if ( aParentRect.IsOver( aRect ) )
+ if ( aParentRect.Overlaps( aRect ) )
bVisible = true;
}
}
@@ -717,7 +717,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
{
tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
Point aPos = VCLPoint( rPoint );
- if ( aRect.IsInside( aPos ) )
+ if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
break;
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 34f17ea7677f..82e43490b28c 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -341,7 +341,7 @@ void DockingWindow::Hide ()
bool DockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect )
{
- if (aDockingRect.IsInside(rPos))
+ if (aDockingRect.Contains(rPos))
{
rRect.SetSize(aDockingRect.GetSize());
return false; // dock
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index da0a20bbaf55..8d666f0694d1 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -50,7 +50,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
tools::Long nDeltaX = pHScroll->GetLineSize();
tools::Long nDeltaY = pVScroll->GetLineSize();
- if( !aOutRect.IsInside( rPos ) )
+ if( !aOutRect.Contains( rPos ) )
{
if( rPos.X() < aOutRect.Left() )
nDeltaX = -nDeltaX;
@@ -233,7 +233,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
tools::Rectangle aMarkRect( rView.GetMarkedObjRect() );
aMarkRect.Move( nX, nY );
- if ( !rWorkArea.IsInside( aMarkRect ) )
+ if ( !rWorkArea.Contains( aMarkRect ) )
{
if ( aMarkRect.Left() < rWorkArea.Left() )
nX += rWorkArea.Left() - aMarkRect.Left();
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index 0878596d8f41..d6c67b7e9f7a 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -63,7 +63,7 @@ void DlgEdView::MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin )
tools::Rectangle aVisRect( RectTmp );
// check, if rectangle is inside visible area
- if ( aVisRect.IsInside( rRect ) )
+ if ( aVisRect.Contains( rRect ) )
return;
// calculate scroll distance; the rectangle must be inside the visible area
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index d72e6cb2dccf..afa919b1e3ec 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -283,7 +283,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject const * pObj, const Point& rPnt )
if(pObj)
{
tools::Rectangle aRect(pObj->GetCurrentBoundRect());
- return aRect.IsInside(rPnt);
+ return aRect.Contains(rPnt);
}
return false;
}
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 0006f45de56f..db4dc6da6290 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -522,7 +522,7 @@ void SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMouseP
tools::Rectangle aColRect = GetItemRect(nId);
aColRect.AdjustLeft(nId ? 3 : 0 ); // the handle col (nId == 0) does not have a left margin for resizing
aColRect.AdjustRight( -3 );
- bResizingCol = !aColRect.IsInside(_rMousePos);
+ bResizingCol = !aColRect.Contains(_rMousePos);
}
if (bResizingCol)
return;
@@ -1164,7 +1164,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
break;
tools::Rectangle aRect = GetCellRect(nRow, nCol, false);
- if (!aRect.IsInside(rEvt.maPosPixel))
+ if (!aRect.Contains(rEvt.maPosPixel))
// not dropped within a cell (a cell isn't as wide as the column - the are small spaces)
break;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index ff31bcefddc0..5d0bd23534ae 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -580,9 +580,9 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
aBottom.AdjustX(aNewSize.Width() );
aBottom.AdjustY(aNewSize.Height() );
- if(!GetHScrollBar().GetRange().IsInside(aBottom.X()))
+ if(!GetHScrollBar().GetRange().Contains(aBottom.X()))
GetHScrollBar().SetRange( Range(0, aBottom.X()) );
- if(!GetVScrollBar().GetRange().IsInside(aBottom.Y()))
+ if(!GetVScrollBar().GetRange().Contains(aBottom.Y()))
GetVScrollBar().SetRange( Range(0, aBottom.Y()) );
pTabWin->SetPosSizePixel( aNewPos, aNewSize );
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index f49b97c7787c..3a35d4a66f9b 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -153,9 +153,9 @@ namespace dbaui
{
Point aPoint(_aPoint.X,_aPoint.Y);
tools::Rectangle aRect(m_pTable->GetDesktopRectPixel());
- if( aRect.IsInside(aPoint) )
+ if( aRect.Contains(aPoint) )
aRet = this;
- else if( m_pTable->GetListBox()->GetDesktopRectPixel().IsInside(aPoint))
+ else if( m_pTable->GetListBox()->GetDesktopRectPixel().Contains(aPoint))
aRet = m_pTable->GetListBox()->GetAccessible();
}
return aRet;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index dc5eafeefb5f..840b59968cf3 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -735,7 +735,7 @@ bool ExtensionBox_Impl::MouseMove( const MouseEvent& rMEvt )
if ( ( nPos >= 0 ) && ( nPos < static_cast<tools::Long>(m_vEntries.size()) ) )
{
const auto& rEntry = m_vEntries[nPos];
- bOverHyperlink = !rEntry->m_sPublisher.isEmpty() && rEntry->m_aLinkRect.IsInside(rMEvt.GetPosPixel());
+ bOverHyperlink = !rEntry->m_sPublisher.isEmpty() && rEntry->m_aLinkRect.Contains(rMEvt.GetPosPixel());
}
if (bOverHyperlink)
@@ -752,7 +752,7 @@ OUString ExtensionBox_Impl::RequestHelp(tools::Rectangle& rRect)
if ( ( nPos >= 0 ) && ( nPos < static_cast<tools::Long>(m_vEntries.size()) ) )
{
const auto& rEntry = m_vEntries[nPos];
- bool bOverHyperlink = !rEntry->m_sPublisher.isEmpty() && rEntry->m_aLinkRect.IsInside(rRect);
+ bool bOverHyperlink = !rEntry->m_sPublisher.isEmpty() && rEntry->m_aLinkRect.Contains(rRect);
if (bOverHyperlink)
{
rRect = rEntry->m_aLinkRect;
@@ -776,7 +776,7 @@ bool ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
if ( ( nPos >= 0 ) && ( nPos < static_cast<tools::Long>(m_vEntries.size()) ) )
{
const auto& rEntry = m_vEntries[nPos];
- if (!rEntry->m_sPublisher.isEmpty() && rEntry->m_aLinkRect.IsInside(rMEvt.GetPosPixel()))
+ if (!rEntry->m_sPublisher.isEmpty() && rEntry->m_aLinkRect.Contains(rMEvt.GetPosPixel()))
{
try
{
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6ab01d631910..c5b06a2eb6ee 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1721,7 +1721,7 @@ bool CallbackFlushHandler::processInvalidateTilesEvent(int type, CallbackData& a
if (rcOld.m_nPart == -1 || rcOld.m_nPart == rcNew.m_nPart)
{
// If fully overlapping.
- if (rcOld.m_aRectangle.IsInside(rcNew.m_aRectangle))
+ if (rcOld.m_aRectangle.Contains(rcNew.m_aRectangle))
{
SAL_INFO("lok", "Skipping queue [" << type << "]: [" << payload
<< "] since overlaps existing all-parts.");
@@ -1767,7 +1767,7 @@ bool CallbackFlushHandler::processInvalidateTilesEvent(int type, CallbackData& a
// Don't merge unless fully overlapped.
SAL_INFO("lok", "New " << rcNew.toString() << " has " << rcOld.toString()
<< "?");
- if (rcNew.m_aRectangle.IsInside(rcOld.m_aRectangle))
+ if (rcNew.m_aRectangle.Contains(rcOld.m_aRectangle))
{
SAL_INFO("lok", "New " << rcNew.toString() << " engulfs old "
<< rcOld.toString() << ".");
@@ -1779,7 +1779,7 @@ bool CallbackFlushHandler::processInvalidateTilesEvent(int type, CallbackData& a
// Don't merge unless fully overlapped.
SAL_INFO("lok", "Old " << rcOld.toString() << " has " << rcNew.toString()
<< "?");
- if (rcOld.m_aRectangle.IsInside(rcNew.m_aRectangle))
+ if (rcOld.m_aRectangle.Contains(rcNew.m_aRectangle))
{
SAL_INFO("lok", "New " << rcNew.toString() << " engulfs old "
<< rcOld.toString() << ".");
@@ -1914,7 +1914,7 @@ bool CallbackFlushHandler::processWindowEvent(int type, CallbackData& aCallbackD
return false;
}
// new one engulfs the old one?
- else if (aNewRect.IsInside(aOldRect))
+ else if (aNewRect.Contains(aOldRect))
{
SAL_INFO("lok.dialog",
"New rect [" << aNewRect.toString() << "] engulfs old ["
@@ -1922,7 +1922,7 @@ bool CallbackFlushHandler::processWindowEvent(int type, CallbackData& aCallbackD
return true;
}
// old one engulfs the new one?
- else if (aOldRect.IsInside(aNewRect))
+ else if (aOldRect.Contains(aNewRect))
{
SAL_INFO("lok.dialog",
"Old rect [" << aOldRect.toString() << "] engulfs new ["
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 77a3adae255d..2ad0e342a209 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -572,7 +572,7 @@ void VclProcessor2D::RenderFillGraphicPrimitive2D(
const ::tools::Rectangle aOutRectPixel(
Point(nXPos, nYPos), aNeededBitmapSizePixel);
- if (aOutRectPixel.IsOver(aVisiblePixel))
+ if (aOutRectPixel.Overlaps(aVisiblePixel))
{
if (bPreScaled)
{
@@ -606,7 +606,7 @@ void VclProcessor2D::RenderFillGraphicPrimitive2D(
const ::tools::Rectangle aOutRectPixel(
Point(nXPos, nYPos), aNeededBitmapSizePixel);
- if (aOutRectPixel.IsOver(aVisiblePixel))
+ if (aOutRectPixel.Overlaps(aVisiblePixel))
{
if (bPreScaled)
{
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 5f86bf041433..70d7ed49b6bd 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1003,7 +1003,7 @@ namespace accessibility
tools::Rectangle aRect( Point(aTmpRect.X, aTmpRect.Y), Size(aTmpRect.Width, aTmpRect.Height) );
Point aPoint( aTmpPoint.X, aTmpPoint.Y );
- return aRect.IsInside( aPoint );
+ return aRect.Contains( aPoint );
}
uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAtPoint( const awt::Point& _aPoint )
@@ -1030,7 +1030,7 @@ namespace accessibility
{
tools::Rectangle aRect = aBulletInfo.aBounds;
- if( aRect.IsInside( aLogPoint ) )
+ if( aRect.Contains( aLogPoint ) )
return getAccessibleChild(0);
}
}
@@ -1361,7 +1361,7 @@ namespace accessibility
awt::Rectangle aRect1( getCharacterBounds(nIndex) );
tools::Rectangle aRect2( aRect1.X, aRect1.Y,
aRect1.Width + aRect1.X, aRect1.Height + aRect1.Y );
- if( aRect2.IsInside( Point( rPoint.X, rPoint.Y ) ) )
+ if( aRect2.Contains( Point( rPoint.X, rPoint.Y ) ) )
return nIndex;
else
return -1;
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index a5dc2b66bd92..a83f427bfeba 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -218,7 +218,7 @@ namespace accessibility
tools::Rectangle aRect( Point(aTmpRect.X, aTmpRect.Y), Size(aTmpRect.Width, aTmpRect.Height) );
Point aPoint( rPoint.X, rPoint.Y );
- return aRect.IsInside( aPoint );
+ return aRect.Contains( aPoint );
}
uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAtPoint( const awt::Point& /*aPoint*/ )
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 77149d1df70d..29ed20295760 100644
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -80,7 +80,7 @@ sal_Int32 AccessibleStringWrap::GetIndexAtPoint( const Point& rPoint )
for( i=0; i<nLen; ++i )
{
GetCharacterBounds(i, aRect);
- if( aRect.IsInside(rPoint) )
+ if( aRect.Contains(rPoint) )
return i;
}
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 19bd96ccde71..3ad33fa5525d 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1603,7 +1603,7 @@ Pair ImpEditView::Scroll( tools::Long ndX, tools::Long ndY, ScrollRangeCheck nRa
if ( bVisCursor )
{
tools::Rectangle aCursorRect( pCrsr->GetPos(), pCrsr->GetSize() );
- if ( aOutArea.IsInside( aCursorRect ) )
+ if ( aOutArea.Contains( aCursorRect ) )
pCrsr->Show();
}
@@ -1818,7 +1818,7 @@ void ImpEditView::DeleteSelected()
const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara, sal_Int32* pPos ) const
{
- if( !GetOutputArea().IsInside( rPos ) )
+ if( !GetOutputArea().Contains( rPos ) )
return nullptr;
Point aDocPos( GetDocPos( rPos ) );
@@ -1858,7 +1858,7 @@ bool ImpEditView::IsBulletArea( const Point& rPos, sal_Int32* pPara )
if ( pPara )
*pPara = EE_PARA_NOT_FOUND;
- if( !GetOutputArea().IsInside( rPos ) )
+ if( !GetOutputArea().Contains( rPos ) )
return false;
Point aDocPos( GetDocPos( rPos ) );
@@ -2063,7 +2063,7 @@ bool ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
const OutputDevice& rOutDev = GetOutputDevice();
Point aMousePos = rOutDev.PixelToLogic(rPosPixel);
- if ( ( !GetOutputArea().IsInside( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
+ if ( ( !GetOutputArea().Contains( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
{
return false;
}
@@ -2083,7 +2083,7 @@ bool ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
const OutputDevice& rOutDev = GetOutputDevice();
aMousePos = rOutDev.PixelToLogic( aMousePos );
- if ( ( !GetOutputArea().IsInside( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
+ if ( ( !GetOutputArea().Contains( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
{
return false;
}
@@ -2486,7 +2486,7 @@ void ImpEditView::dragOver(const css::datatransfer::dnd::DropTargetDragEvent& rD
bool bAccept = false;
- if ( GetOutputArea().IsInside( aMousePos ) && !bReadOnly )
+ if ( GetOutputArea().Contains( aMousePos ) && !bReadOnly )
{
if ( pDragAndDropInfo && pDragAndDropInfo->bHasValidData )
{
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 67dd5b0bb768..3d4061a82cde 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -436,7 +436,7 @@ bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, bool* pbBu
if ( ( nPara != EE_PARA_NOT_FOUND ) && ImplHasNumberFormat( nPara ) )
{
tools::Rectangle aBulArea = ImpCalcBulletArea( nPara, true, true );
- if ( aBulArea.IsInside( rPaperPos ) )
+ if ( aBulArea.Contains( rPaperPos ) )
{
bTextPos = true;
if ( pbBullet)
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 83ab8aca2a5f..3e910db125aa 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -244,7 +244,7 @@ sal_Int32 OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTa
sal_Int32 nPara = EE_PARA_NOT_FOUND;
Point aMousePosWin = pEditView->GetOutputDevice().PixelToLogic( rPosPix );
- if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
+ if( !pEditView->GetOutputArea().Contains( aMousePosWin ) )
{
reTarget = MouseTarget::Outside;
}
@@ -288,7 +288,7 @@ bool OutlinerView::MouseMove( const MouseEvent& rMEvt )
return pEditView->MouseMove( rMEvt );
Point aMousePosWin( pEditView->GetOutputDevice().PixelToLogic( rMEvt.GetPosPixel() ) );
- if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
+ if( !pEditView->GetOutputArea().Contains( aMousePosWin ) )
return false;
PointerStyle aPointer = GetPointer( rMEvt.GetPosPixel() );
@@ -303,7 +303,7 @@ bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
return pEditView->MouseButtonDown( rMEvt );
Point aMousePosWin( pEditView->GetOutputDevice().PixelToLogic( rMEvt.GetPosPixel() ) );
- if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
+ if( !pEditView->GetOutputArea().Contains( aMousePosWin ) )
return false;
PointerStyle aPointer = GetPointer( rMEvt.GetPosPixel() );
@@ -351,7 +351,7 @@ bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
return pEditView->MouseButtonUp( rMEvt );
Point aMousePosWin( pEditView->GetOutputDevice().PixelToLogic( rMEvt.GetPosPixel() ) );
- if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
+ if( !pEditView->GetOutputArea().Contains( aMousePosWin ) )
return false;
PointerStyle aPointer = GetPointer( rMEvt.GetPosPixel() );
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 161633a137a2..0eeaa796c0bb 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -793,7 +793,7 @@ bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32&
aBulletInfo.bVisible &&
aBulletInfo.nType != SVX_NUM_BITMAP )
{
- if( aBulletInfo.aBounds.IsInside( rPoint) )
+ if( aBulletInfo.aBounds.Contains( rPoint) )
{
OutputDevice* pOutDev = GetRefDevice();
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index b3ab1542f083..85f22fb017e7 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -65,7 +65,7 @@ class GridWindow : public weld::CustomWidgetController
{
const Point aOffset(rWin.PixelToLogic(Point(mnOffX, mnOffY)));
const tools::Rectangle aTarget(maPos - aOffset, maPos + aOffset);
- return aTarget.IsInside(rPos);
+ return aTarget.Contains(rPos);
}
};
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 4e901dd282bd..6ad7939ccb8f 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -2160,7 +2160,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
awt::Rectangle aWindowRect = rRowColumnWindowData.aRowColumnWindows[i]->getPosSize();
::tools::Rectangle aRect( aWindowRect.X, aWindowRect.Y, aWindowRect.X+aWindowRect.Width, aWindowRect.Y+aWindowRect.Height );
aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() )));
- if ( aRect.IsInside( rMousePos ))
+ if ( aRect.Contains( rMousePos ))
{
// Check if we have found the excluded element. If yes, we have to provide an empty rectangle.
// We prevent that a toolbar cannot be moved when the mouse pointer is inside its own rectangle!
@@ -2637,7 +2637,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
}
// default docking operation, dock on the given row/column
- bool bOpOutsideOfDockingArea( !aDockingAreaRect.IsInside( rMousePos ));
+ bool bOpOutsideOfDockingArea( !aDockingAreaRect.Contains( rMousePos ));
std::vector< SingleRowColumnWindowData > aRowColumnsWindowData;
@@ -2678,7 +2678,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() )));
}
- bool bIsInsideRowCol( aRect.IsInside( rMousePos ) );
+ bool bIsInsideRowCol( aRect.Contains( rMousePos ) );
if ( bIsInsideRowCol )
{
nIndex = i;
@@ -2960,7 +2960,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d
constexpr sal_Int32 nHorzVerticalRegionSize = 6;
constexpr sal_Int32 nHorzVerticalMoveRegion = 4;
- if ( rRowColRect.IsInside( rMousePos ))
+ if ( rRowColRect.Contains( rMousePos ))
{
if ( isHorizontalDockingArea( DockingArea ))
{
@@ -3330,23 +3330,23 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent
VclPtr<vcl::Window> pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) );
::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )));
- if ( aHotZoneTopDockRect.IsInside( aMousePos ))
+ if ( aHotZoneTopDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_TOP;
- else if ( aHotZoneBottomDockRect.IsInside( aMousePos ))
+ else if ( aHotZoneBottomDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_BOTTOM;
- else if ( aHotZoneLeftDockRect.IsInside( aMousePos ))
+ else if ( aHotZoneLeftDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_LEFT;
- else if ( aHotZoneRightDockRect.IsInside( aMousePos ))
+ else if ( aHotZoneRightDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_RIGHT;
// Higher priority for movements inside the real docking area
- if ( aTopDockRect.IsInside( aMousePos ))
+ if ( aTopDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_TOP;
- else if ( aBottomDockRect.IsInside( aMousePos ))
+ else if ( aBottomDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_BOTTOM;
- else if ( aLeftDockRect.IsInside( aMousePos ))
+ else if ( aLeftDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_LEFT;
- else if ( aRightDockRect.IsInside( aMousePos ))
+ else if ( aRightDockRect.Contains( aMousePos ))
eDockingArea = ui::DockingArea_DOCKINGAREA_RIGHT;
// Determine if we have a toolbar and set alignment according to the docking area!
diff --git a/include/sfx2/LokControlHandler.hxx b/include/sfx2/LokControlHandler.hxx
index b32be1b70593..fc0b065c8834 100644
--- a/include/sfx2/LokControlHandler.hxx
+++ b/include/sfx2/LokControlHandler.hxx
@@ -35,7 +35,7 @@ public:
if (pUnoObect)
{
tools::Rectangle aControlRectHMM = pUnoObect->GetLogicRect();
- if (aControlRectHMM.IsInside(aPointHmm))
+ if (aControlRectHMM.Contains(aPointHmm))
{
css::uno::Reference<css::awt::XControl> xControl
= pUnoObect->GetUnoControl(*pDrawView, *rMainWindow.GetOutDev());
@@ -137,7 +137,7 @@ public:
// Check if we intersect with the tile rectangle and we
// need to draw the control.
- if (aObjectRectHMM.IsOver(aTileRectHMM))
+ if (aObjectRectHMM.Overlaps(aTileRectHMM))
{
drawUnoControl(pDrawView, pUnoObect, rMainWindow, rDevice, aTileRectHMM,
double(scaleX), double(scaleY));
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index f255168b3709..d016546724e2 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -336,7 +336,7 @@ public:
tools::Long& Min() { return nA; }
tools::Long& Max() { return nB; }
- bool IsInside( tools::Long nIs ) const;
+ bool Contains( tools::Long nIs ) const;
void Justify();
@@ -346,7 +346,7 @@ public:
using Pair::toString;
};
-inline bool Range::IsInside( tools::Long nIs ) const
+inline bool Range::Contains( tools::Long nIs ) const
{
return ((nA <= nIs) && (nIs <= nB ));
}
@@ -397,7 +397,7 @@ public:
tools::Long& Min() { return nA; }
tools::Long& Max() { return nB; }
- bool IsInside( tools::Long nIs ) const;
+ bool Contains( tools::Long nIs ) const;
void Justify();
@@ -413,7 +413,7 @@ public:
using Pair::toString;
};
-inline bool Selection::IsInside( tools::Long nIs ) const
+inline bool Selection::Contains( tools::Long nIs ) const
{
return ((nA <= nIs) && (nIs < nB ));
}
@@ -551,9 +551,9 @@ public:
void Justify();
- bool IsInside( const Point& rPOINT ) const;
- bool IsInside( const tools::Rectangle& rRect ) const;
- bool IsOver( const tools::Rectangle& rRect ) const;
+ bool Contains( const Point& rPOINT ) const;
+ bool Contains( const tools::Rectangle& rRect ) const;
+ bool Overlaps( const tools::Rectangle& rRect ) const;
void SetEmpty() { nRight = nBottom = RECT_EMPTY; }
void SetWidthEmpty() { nRight = RECT_EMPTY; }
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 9caec8bbe210..3c39f2d6c56b 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -116,7 +116,7 @@ public:
void Clear();
tools::Rectangle GetBoundRect() const;
- bool IsInside( const Point& rPt ) const;
+ bool Contains( const Point& rPt ) const;
double CalcDistance( sal_uInt16 nPt1, sal_uInt16 nPt2 ) const;
void Clip( const tools::Rectangle& rRect );
void Optimize( PolyOptimizeFlags nOptimizeFlags );
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index cf48fbdff6e1..579d6e2c4fad 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -107,8 +107,8 @@ public:
bool HasPolyPolygonOrB2DPolyPolygon() const { return (getB2DPolyPolygon() || getPolyPolygon()); }
void GetRegionRectangles(RectangleVector& rTarget) const;
- bool IsInside( const Point& rPoint ) const;
- bool IsOver( const tools::Rectangle& rRect ) const;
+ bool Contains( const Point& rPoint ) const;
+ bool Overlaps( const tools::Rectangle& rRect ) const;
vcl::Region& operator=( const vcl::Region& rRegion );
vcl::Region& operator=( vcl::Region&& rRegion ) noexcept;
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 727109b5d3e8..d2eab67962f4 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -192,7 +192,7 @@ void Drawing::convertAndInsert() const
const uno::Any aGroup( "autoGroup_" + BoxItr.first );
for ( auto RadioItr = RadioButtonMap.begin(); RadioItr != RadioButtonMap.end(); )
{
- if ( BoxItr.second.IsInside(RadioItr->second) )
+ if ( BoxItr.second.Contains(RadioItr->second) )
{
RadioItr->first->setPropertyValue("GroupName", aGroup );
// If conflict, first created GroupBox wins
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index b711b13dff33..071d95108847 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -75,7 +75,7 @@ void OSectionView::MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin
const tools::Rectangle aVisRect( Point(-aOrg.X(),-aOrg.Y()), aVisSize );
// check, if rectangle is inside visible area
- if ( !aVisRect.IsInside( rRect ) )
+ if ( !aVisRect.Contains( rRect ) )
{
// calculate scroll distance; the rectangle must be inside the visible area
sal_Int32 nScrollX = 0, nScrollY = 0;
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index a5871fc52524..69bb14bf756c 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -174,7 +174,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
const Size aOutputSize = GetOutputSizePixel();
if( aPos.X() > aOutputSize.Width() || aPos.Y() > aOutputSize.Height() )
return;
- if ( rMEvt.GetClicks() == 2 || m_aImageRect.IsInside( aPos ) )
+ if ( rMEvt.GetClicks() == 2 || m_aImageRect.Contains( aPos ) )
{
m_bCollapsed = !m_bCollapsed;
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 4f7cc5be2d7e..68c110780ce1 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1429,7 +1429,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode)
tools::Rectangle aMarkRect( rView.GetMarkedObjRect() );
aMarkRect.Move( nX, nY );
- if ( !rWorkArea.IsInside( aMarkRect ) )
+ if ( !rWorkArea.Contains( aMarkRect ) )
{
if ( aMarkRect.Left() < rWorkArea.Left() )
nX += rWorkArea.Left() - aMarkRect.Left();
@@ -1487,7 +1487,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode)
}
aMarkRect.SetPos(aPos);
- if ( !rWorkArea.IsInside( aMarkRect ) )
+ if ( !rWorkArea.Contains( aMarkRect ) )
{
break;
}
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 1cf3b14b58c4..f6e236cd3c0c 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -84,7 +84,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
tools::Rectangle aWorkArea(Point(), pScrollWindow->getTotalSize());
aWorkArea.AdjustRight( -static_cast<tools::Long>(aStartWidth) );
aWorkArea = pScrollWindow->PixelToLogic( aWorkArea );
- if( !aOutRect.IsInside( rPos ) && aWorkArea.IsInside( rPos ) )
+ if( !aOutRect.Contains( rPos ) && aWorkArea.Contains( rPos ) )
{
ScrollBar& rHScroll = pScrollWindow->GetHScroll();
ScrollBar& rVScroll = pScrollWindow->GetVScroll();
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 60d67e5d6a39..bcd694b11f01 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2776,7 +2776,7 @@ void ScTiledRenderingTest::testEditCursorBounds()
CPPUNIT_ASSERT(!aView.m_aInvalidateCursorResult.empty());
CPPUNIT_ASSERT_MESSAGE("Edit cursor must be in cell bounds!",
- aCellBounds.IsInside(aView.m_aInvalidateCursorResult.getBounds()));
+ aCellBounds.Contains(aView.m_aInvalidateCursorResult.getBounds()));
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, nullptr);
}
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 1933601aa7db..60d6d6cf068b 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -108,7 +108,7 @@ bool ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName
while (pObject)
{
if ( pObject->GetObjIdentifier() == OBJ_OLE2 &&
- pObject->GetCurrentBoundRect().IsInside(rPos) )
+ pObject->GetCurrentBoundRect().Contains(rPos) )
{
// also Chart-Objects that are not in the Collection
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 5c6defa59f40..5a8f97bb36db 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -304,7 +304,7 @@ bool ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* p
while (pObject)
{
if ( pObject->GetObjIdentifier() == OBJ_OLE2 &&
- aMMRect.IsInside( pObject->GetCurrentBoundRect() ) )
+ aMMRect.Contains( pObject->GetCurrentBoundRect() ) )
return true;
pObject = aIter.Next();
@@ -357,7 +357,7 @@ bool ScDocument::HasBackgroundDraw( SCTAB nTab, const tools::Rectangle& rMMRect
SdrObject* pObject = aIter.Next();
while (pObject && !bFound)
{
- if ( pObject->GetLayer() == SC_LAYER_BACK && pObject->GetCurrentBoundRect().IsOver( rMMRect ) )
+ if ( pObject->GetLayer() == SC_LAYER_BACK && pObject->GetCurrentBoundRect().Overlaps( rMMRect ) )
bFound = true;
pObject = aIter.Next();
}
@@ -382,7 +382,7 @@ bool ScDocument::HasAnyDraw( SCTAB nTab, const tools::Rectangle& rMMRect ) const
SdrObject* pObject = aIter.Next();
while (pObject && !bFound)
{
- if ( pObject->GetCurrentBoundRect().IsOver( rMMRect ) )
+ if ( pObject->GetCurrentBoundRect().Overlaps( rMMRect ) )
bFound = true;
pObject = aIter.Next();
}
@@ -410,7 +410,7 @@ SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos )
SdrObject* pObject = aIter.Next();
while (pObject)
{
- if ( pObject->GetCurrentBoundRect().IsInside(rPos) )
+ if ( pObject->GetCurrentBoundRect().Contains(rPos) )
{
// Intern is of no interest
// Only object form background layer, when no object form another layer is found
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 0e1f55f4d7c8..27e860af94bc 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1520,7 +1520,7 @@ bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
while ( pObject && !bFound )
{
aObjRect = pObject->GetSnapRect(); //TODO: GetLogicRect ?
- if (aTestRect.IsInside(aObjRect.TopLeft()) || aTestRect.IsInside(aObjRect.BottomLeft()))
+ if (aTestRect.Contains(aObjRect.TopLeft()) || aTestRect.Contains(aObjRect.BottomLeft()))
bFound = true;
pObject = aIter.Next();
@@ -1570,13 +1570,13 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
if (pObjData && pObjData->meType == ScDrawObjData::ValidationCircle)
{
aObjRect = pObject->GetLogicRect();
- if(aDelCircle.IsInside(aObjRect))
+ if(aDelCircle.Contains(aObjRect))
ppObj.push_back(pObject);
}
else
{
aObjRect = pObject->GetCurrentBoundRect();
- if (aDelRect.IsInside(aObjRect))
+ if (aDelRect.Contains(aObjRect))
{
if (bAnchored)
{
@@ -1645,7 +1645,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
tools::Rectangle aObjRect = pObject->GetCurrentBoundRect();
ScRange aRange = pDoc->GetRange(nTab, aObjRect);
bool bObjectInMarkArea =
- aMarkBound.IsInside(aObjRect) && rMark.IsAllMarked(aRange);
+ aMarkBound.Contains(aObjRect) && rMark.IsAllMarked(aRange);
const ScDrawObjData* pObjData = ScDrawLayer::GetObjData(pObject);
ScAnchorType aAnchorType = ScDrawLayer::GetAnchorType(*pObject);
bool bObjectAnchoredToMarkedCell
@@ -1695,7 +1695,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const tools::Rec
{
tools::Rectangle aObjRect = pOldObject->GetCurrentBoundRect();
- bool bObjectInArea = rRange.IsInside(aObjRect);
+ bool bObjectInArea = rRange.Contains(aObjRect);
const ScDrawObjData* pObjData = ScDrawLayer::GetObjData(pOldObject);
if (pObjData)
{
@@ -1886,7 +1886,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
SCTAB nClipTab = bRestoreDestTabName ? nDestTab : nSourceTab;
ScRange aClipRange = lcl_getClipRangeFromClipDoc(pClipDoc, nClipTab);
- bool bObjectInArea = rSourceRange.IsInside(aObjRect);
+ bool bObjectInArea = rSourceRange.Contains(aObjRect);
const ScDrawObjData* pObjData = ScDrawLayer::GetObjData(pOldObject);
if (pObjData) // Consider images anchored to the copied cell
bObjectInArea = bObjectInArea || aClipRange.In(pObjData->maStart);
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 8013ac29ab76..cbd53ca5c870 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -410,9 +410,9 @@ bool ScDetectiveFunc::HasArrow( const ScAddress& rStart,
lcl_IsOtherTab( rSet.Get(XATTR_LINEEND).GetLineEndValue() );
bool bStartHit = bStartAlien ? bObjStartAlien :
- ( !bObjStartAlien && aStartRect.IsInside(pObject->GetPoint(0)) );
+ ( !bObjStartAlien && aStartRect.Contains(pObject->GetPoint(0)) );
bool bEndHit = bEndAlien ? bObjEndAlien :
- ( !bObjEndAlien && aEndRect.IsInside(pObject->GetPoint(1)) );
+ ( !bObjEndAlien && aEndRect.Contains(pObject->GetPoint(1)) );
if ( bStartHit && bEndHit )
bFound = true;
@@ -684,7 +684,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt )
if ( pObject->GetLayer()==SC_LAYER_INTERN &&
pObject->IsPolyObj() && pObject->GetPointCount()==2 )
{
- if (aRect.IsInside(pObject->GetPoint(bDestPnt ? 1 : 0))) // start/destinationpoint
+ if (aRect.Contains(pObject->GetPoint(bDestPnt ? 1 : 0))) // start/destinationpoint
ppObj[nDelCount++] = pObject;
}
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 055a04f81f81..50ff33b6ffc8 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -75,7 +75,7 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab,
while ( pObject )
{
tools::Rectangle aObjRect = pObject->GetCurrentBoundRect();
- if ( (bAll || aRect.IsInside( aObjRect )) && !ScDrawLayer::IsNoteCaption(pObject) )
+ if ( (bAll || aRect.Contains( aObjRect )) && !ScDrawLayer::IsNoteCaption(pObject) )
{
Size aSpace;
ScRange aR = pDoc->GetRange( nTab, aObjRect );
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index b1d9cf3dfab6..38620240baaf 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -143,7 +143,7 @@ sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoin
{
SolarMutexGuard aGuard;
IsObjectValid();
- return tools::Rectangle (Point(), GetBoundingBox().GetSize()).IsInside(VCLPoint(rPoint));
+ return tools::Rectangle (Point(), GetBoundingBox().GetSize()).Contains(VCLPoint(rPoint));
}
uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtPoint(
@@ -193,7 +193,7 @@ bool ScAccessibleContextBase::isShowing( )
{
tools::Rectangle aParentBounds(VCLRectangle(xParentComponent->getBounds()));
tools::Rectangle aBounds(VCLRectangle(getBounds()));
- bShowing = aBounds.IsOver(aParentBounds);
+ bShowing = aBounds.Overlaps(aParentBounds);
}
}
return bShowing;
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 3b78798d05c0..0ac7d931d6e6 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1647,7 +1647,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoin
if (xComp.is())
{
tools::Rectangle aBound(VCLRectangle(xComp->getBounds()));
- if (aBound.IsInside(VCLPoint(rPoint)))
+ if (aBound.Contains(VCLPoint(rPoint)))
xAccessible = mxTempAcc;
}
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 336fd112af8b..9656b82af035 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -273,7 +273,7 @@ struct ScPointFound
bool operator() (const ScAccNote& rNote)
{
bool bResult(false);
- if (maPoint.IsInside(rNote.maRect))
+ if (maPoint.Contains(rNote.maRect))
bResult = true;
else
mnParagraphs += rNote.mnParaCount;
@@ -918,7 +918,7 @@ struct ScShapePointFound
bool operator() (const ScShapeChild& rShape)
{
bool bResult(false);
- if (VCLRectangle(rShape.mpAccShape->getBounds()).IsInside(maPoint))
+ if (VCLRectangle(rShape.mpAccShape->getBounds()).Contains(maPoint))
bResult = true;
return bResult;
}
@@ -1117,10 +1117,10 @@ ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rDa
tools::Rectangle aObjRect;
- if ( rData.GetHeaderPosition( aObjRect ) && aObjRect.IsOver( aVisRect ) )
+ if ( rData.GetHeaderPosition( aObjRect ) && aObjRect.Overlaps( aVisRect ) )
nHeaders = 1;
- if ( rData.GetFooterPosition( aObjRect ) && aObjRect.IsOver( aVisRect ) )
+ if ( rData.GetFooterPosition( aObjRect ) && aObjRect.Overlaps( aVisRect ) )
nFooters = 1;
if ( rData.HasCellsInRange( aVisRect ) )
@@ -1289,7 +1289,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex );
mpTable->Init();
}
- if (mpTable.is() && VCLRectangle(mpTable->getBounds()).IsInside(VCLPoint(rPoint)))
+ if (mpTable.is() && VCLRectangle(mpTable->getBounds()).Contains(VCLPoint(rPoint)))
xAccessible = mpTable.get();
}
if (!xAccessible.is())
@@ -1313,9 +1313,9 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
Point aPoint(VCLPoint(rPoint));
- if (VCLRectangle(mpHeader->getBounds()).IsInside(aPoint))
+ if (VCLRectangle(mpHeader->getBounds()).Contains(aPoint))
xAccessible = mpHeader.get();
- else if (VCLRectangle(mpFooter->getBounds()).IsInside(aPoint))
+ else if (VCLRectangle(mpFooter->getBounds()).Contains(aPoint))
xAccessible = mpFooter.get();
}
if (!xAccessible.is())
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 29edeba6cf85..325353606fdd 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1028,7 +1028,7 @@ bool ScCsvGrid::Command( const CommandEvent& rCEvt )
case CommandEventId::Wheel:
{
tools::Rectangle aRect( Point(), maWinSize );
- if( aRect.IsInside( rCEvt.GetMousePosPixel() ) )
+ if( aRect.Contains( rCEvt.GetMousePosPixel() ) )
{
const CommandWheelData* pData = rCEvt.GetWheelData();
if( pData && (pData->GetMode() == CommandWheelMode::SCROLL) && !pData->IsHorz() )
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 7d18bfb31d5e..9935cf795d30 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -438,7 +438,7 @@ bool ScCsvRuler::MouseMove( const MouseEvent& rMEvt )
else
{
tools::Rectangle aRect( Point(), maWinSize );
- if( !IsVisibleSplitPos( nPos ) || !aRect.IsInside( rMEvt.GetPosPixel() ) )
+ if( !IsVisibleSplitPos( nPos ) || !aRect.Contains( rMEvt.GetPosPixel() ) )
// if focused, keep old cursor position for key input
nPos = HasFocus() ? GetRulerCursorPos() : CSV_POS_INVALID;
MoveCursor( nPos, false );
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 9306a5fd9556..ee9090765e2c 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -478,7 +478,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
tools::Rectangle aMarkRect(pView->GetMarkedObjRect());
aMarkRect.Move(nX, nY);
- if(!aMarkRect.IsInside(rWorkArea))
+ if(!aMarkRect.Contains(rWorkArea))
{
if(aMarkRect.Left() < rWorkArea.Left())
{
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index cd84fbca9b93..0d18fea87d00 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -129,7 +129,7 @@ bool FuSelection::IsNoteCaptionClicked( const Point& rPos ) const
SdrObjListIter aIter( pPageView->GetObjList(), SdrIterMode::DeepNoGroups, true );
for( SdrObject* pObj = aIter.Next(); pObj; pObj = aIter.Next() )
{
- if( pObj->GetLogicRect().IsInside( rPos ) )
+ if( pObj->GetLogicRect().Contains( rPos ) )
{
if( const ScDrawObjData* pCaptData = ScDrawLayer::GetNoteCaptionData( pObj, nTab ) )
{
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 96b2e03e06a2..7c5eafa81774 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -778,7 +778,7 @@ void ScModelObj::setTextSelection(int nType, int nX, int nY)
Point aPoint(convertTwipToMm100(nX), convertTwipToMm100(nY));
- if (pTableView->GetOutputArea().IsInside(aPoint))
+ if (pTableView->GetOutputArea().Contains(aPoint))
{
switch (nType)
{
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 877da1760bd4..250b1152f114 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -293,7 +293,7 @@ static void lcl_UnLockComment( ScDrawView* pView, const Point& rPos, const ScVie
ScAddress aCellPos( rViewData.GetCurX(), rViewData.GetCurY(), rViewData.GetTabNo() );
ScPostIt* pNote = rDoc.GetNote( aCellPos );
SdrObject* pObj = pNote ? pNote->GetCaption() : nullptr;
- if( pObj && pObj->GetLogicRect().IsInside( rPos ) && ScDrawLayer::IsNoteCaption( pObj ) )
+ if( pObj && pObj->GetLogicRect().Contains( rPos ) && ScDrawLayer::IsNoteCaption( pObj ) )
{
const ScProtectionAttr* pProtAttr = rDoc.GetAttr( aCellPos, ATTR_PROTECTION );
bool bProtectAttr = pProtAttr->GetProtection() || pProtAttr->GetHideCell() ;
@@ -1398,7 +1398,7 @@ bool ScGridWindow::TestMouse( const MouseEvent& rMEvt, bool bAction )
if (aMarkRange.aStart.Tab() == mrViewData.GetTabNo() && mpAutoFillRect)
{
Point aMousePos = rMEvt.GetPosPixel();
- if (mpAutoFillRect->IsInside(aMousePos))
+ if (mpAutoFillRect->Contains(aMousePos))
{
SetPointer( PointerStyle::Cross ); //! bold cross ?
if (bAction)
@@ -1868,7 +1868,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta
if ( bListValButton )
{
tools::Rectangle aButtonRect = GetListValButtonRect( aListValPos );
- if ( aButtonRect.IsInside( aPos ) )
+ if ( aButtonRect.Contains( aPos ) )
{
// tdf#125917 typically we have the mouse captured already, except if are editing the cell.
// Ensure its captured before the menu is launched even in the cell editing case
@@ -3217,7 +3217,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCCOL nCellX, S
{
OutlinerView* pOlView = pDrawView->GetTextEditOutlinerView();
tools::Rectangle aOutputArea = pOlView->GetOutputArea();
- if ( aOutputArea.IsInside( aLogicPos ) )
+ if ( aOutputArea.Contains( aLogicPos ) )
{
// handle selection within the OutlinerView
@@ -4631,7 +4631,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
for (size_t i = 0; i < nCount; ++i)
{
SdrObject* pObj = pDrawView->GetMarkedObjectByIndex(i);
- if (pObj && pObj->GetLogicRect().IsInside(aLogicPos))
+ if (pObj && pObj->GetLogicRect().Contains(aLogicPos))
{
// Inside an active drawing object. Bail out.
return;
@@ -5534,7 +5534,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
aLogicEdit.SetBottom( aLogicEdit.Top() + nTextHeight );
Point aLogicClick = PixelToLogic(rPos,aEditMode);
- if ( aLogicEdit.IsInside(aLogicClick) )
+ if ( aLogicEdit.Contains(aLogicClick) )
{
EditView aTempView(pEngine.get(), this);
aTempView.SetOutputArea( aLogicEdit );
@@ -5598,7 +5598,7 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow
aLogicEdit.setWidth(nTextWidth + 1);
- if (!aLogicEdit.IsInside(aLogicClick))
+ if (!aLogicEdit.Contains(aLogicClick))
return false;
pEngine->SetControlWord(pEngine->GetControlWord() | EEControlBits::ONLINESPELLING);
@@ -5662,7 +5662,7 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
aButtonPos.AdjustX( -(nBWidth - nHSpace) ); // same for top or bottom
tools::Rectangle aButRect( aButtonPos, Size(nBWidth,nBHeight) );
- if ( aButRect.IsInside( rPosPixel ) )
+ if ( aButRect.Contains( rPosPixel ) )
{
rScenRange = aRange;
return true;
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index f9a29bb3b5d7..cfcd088bba34 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -127,7 +127,7 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent&
Size aPopupSize;
mpFilterButton->getPopupBoundingBox(aPopupPos, aPopupSize);
tools::Rectangle aRect(aPopupPos, aPopupSize);
- if (aRect.IsInside(rMEvt.GetPosPixel()))
+ if (aRect.Contains(rMEvt.GetPosPixel()))
{
if ( DoPageFieldSelection( nCol, nRow ) )
return true;
@@ -358,7 +358,7 @@ bool ScGridWindow::DPTestFieldPopupArrow(
Size aPopupSize;
aBtn.getPopupBoundingBox(aPopupPos, aPopupSize);
tools::Rectangle aRect(aPopupPos, aPopupSize);
- if (aRect.IsInside(rMEvt.GetPosPixel()))
+ if (aRect.Contains(rMEvt.GetPosPixel()))
{
// Mouse cursor inside the popup arrow box. Launch the field menu.
DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize, rDimPos, pDPObj);
diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx
index e7922b252510..83538f0b21e8 100644
--- a/sc/source/ui/view/prevloc.cxx
+++ b/sc/source/ui/view/prevloc.cxx
@@ -324,7 +324,7 @@ bool ScPreviewLocationData::HasCellsInRange( const tools::Rectangle& rVisiblePix
for (auto const& it : m_Entries)
{
if ( it->eType == SC_PLOC_CELLRANGE || it->eType == SC_PLOC_COLHEADER || it->eType == SC_PLOC_ROWHEADER )
- if ( it->aPixelRect.IsOver( rVisiblePixel ) )
+ if ( it->aPixelRect.Overlaps( rVisiblePixel ) )
return true;
}
@@ -394,7 +394,7 @@ tools::Long ScPreviewLocationData::GetNoteCountInRange( const tools::Rectangle&
sal_uLong nRet = 0;
for (auto const& it : m_Entries)
{
- if ( it->eType == eType && it->aPixelRect.IsOver( rVisiblePixel ) )
+ if ( it->eType == eType && it->aPixelRect.Overlaps( rVisiblePixel ) )
++nRet;
}
@@ -409,7 +409,7 @@ bool ScPreviewLocationData::GetNoteInRange( const tools::Rectangle& rVisiblePixe
sal_uLong nPos = 0;
for (auto const& it : m_Entries)
{
- if ( it->eType == eType && it->aPixelRect.IsOver( rVisiblePixel ) )
+ if ( it->eType == eType && it->aPixelRect.Overlaps( rVisiblePixel ) )
{
if ( nPos == sal::static_int_cast<sal_uLong>(nIndex) )
{
@@ -431,7 +431,7 @@ tools::Rectangle ScPreviewLocationData::GetNoteInRangeOutputRect(const tools::Re
sal_uLong nPos = 0;
for (auto const& it : m_Entries)
{
- if ( it->eType == eType && it->aPixelRect.IsOver( rVisiblePixel ) )
+ if ( it->eType == eType && it->aPixelRect.Overlaps( rVisiblePixel ) )
{
if ( aCellPos == it->aCellRange.aStart )
return it->aPixelRect;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index f8e7c302b971..eb7de664694b 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1144,7 +1144,7 @@ void ScPrintFunc::SetDateTime( const DateTime& rDateTime )
static void lcl_DrawGraphic( const Graphic &rGraphic, vcl::RenderContext& rOutDev,
const tools::Rectangle &rGrf, const tools::Rectangle &rOut )
{
- const bool bNotInside = !rOut.IsInside( rGrf );
+ const bool bNotInside = !rOut.Contains( rGrf );
if ( bNotInside )
{
rOutDev.Push();
@@ -1273,7 +1273,7 @@ static void lcl_DrawGraphic( const SvxBrushItem &rBrush, vcl::RenderContext& rOu
default: OSL_ENSURE( false, "new Graphic position?" );
}
tools::Rectangle aGrf( aPos,aDrawSize );
- if ( bDraw && aGrf.IsOver( rOut ) )
+ if ( bDraw && aGrf.Overlaps( rOut ) )
{
lcl_DrawGraphic( *pGraphic, rOutDev, aGrf, rOut );
}
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index c44db32ce716..cb9fcba6f2d3 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -998,7 +998,7 @@ void ScTabView::AlignToCursor( SCCOL nCurX, SCROW nCurY, ScFollowMode eMode,
tools::Long nCSX, nCSY;
aViewData.GetMergeSizePixel( nCurX, nCurY, nCSX, nCSY );
tools::Rectangle aCursor( aStart, Size( nCSX, nCSY ) );
- if ( aCursor.IsOver( aDlgPixel ) )
+ if ( aCursor.Overlaps( aDlgPixel ) )
bLimit = true; // cell is covered by the dialog
}
}
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 1ed951437ba1..905a616bdcdf 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -412,7 +412,7 @@ void SdTiledRenderingTest::testRegisterCallback()
// Check that the top left 256x256px tile would be invalidated.
CPPUNIT_ASSERT(!m_aInvalidation.IsEmpty());
::tools::Rectangle aTopLeft(0, 0, 256*15, 256*15); // 1 px = 15 twips, assuming 96 DPI.
- CPPUNIT_ASSERT(m_aInvalidation.IsOver(aTopLeft));
+ CPPUNIT_ASSERT(m_aInvalidation.Overlaps(aTopLeft));
}
void SdTiledRenderingTest::testPostKeyEvent()
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 40d7f370ff29..360c709ac7ad 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -815,7 +815,7 @@ bool MotionPathTag::MarkPoints(const ::tools::Rectangle* pRect, bool bUnmark )
if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && pHdl->IsSelected() == bUnmark)
{
Point aPos(pHdl->GetPos());
- if( pRect==nullptr || pRect->IsInside(aPos))
+ if( pRect==nullptr || pRect->Contains(aPos))
{
if( mrView.MarkPointHelper(pHdl,mpMark.get(),bUnmark) )
bChgd=true;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index b51f5973ec20..c59dc3f9eabb 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -474,7 +474,7 @@ void AnnotationManagerImpl::InsertAnnotation(const OUString& rText)
aTagRect.SetRight( aTagRect.Left() + width - 1 );
aTagRect.SetBottom( aTagRect.Top() + height - 1 );
- if( aNewRect.IsOver( aTagRect ) )
+ if( aNewRect.Overlaps( aTagRect ) )
{
bFree = false;
break;
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index de684f8c061a..02521c2575ad 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -72,7 +72,7 @@ void Client::RequestNewObjectArea( ::tools::Rectangle& aObjRect )
aObjRect.SetSize( aOldRect.GetSize() );
::tools::Rectangle aWorkArea( pView->GetWorkArea() );
- if ( aWorkArea.IsInside(aObjRect) || bPosProtect || aObjRect == aOldRect )
+ if ( aWorkArea.Contains(aObjRect) || bPosProtect || aObjRect == aOldRect )
return;
// correct position
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 8d489d81b8e2..8880b41d36dd 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -280,7 +280,7 @@ bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
{
::tools::Rectangle aOutputArea(Point(0,0), mpWindow->GetOutputSizePixel());
- if (mpView && !aOutputArea.IsInside(rMEvt.GetPosPixel()))
+ if (mpView && !aOutputArea.Contains(rMEvt.GetPosPixel()))
mpView->GetSdrPageView()->DeleteHelpLine(nHelpLine);
mpWindow->ReleaseMouse();
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index f9b9e0a61675..db84fdf5ad19 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -128,7 +128,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
if ( bNoScrollUntilInside )
{
- if ( rRect.IsInside(aPos) )
+ if ( rRect.Contains(aPos) )
bNoScrollUntilInside = false;
}
else
@@ -673,7 +673,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
::tools::Rectangle aMarkRect(mpView->GetMarkedObjRect());
aMarkRect.Move(nX, nY);
- if(!aMarkRect.IsInside(rWorkArea))
+ if(!aMarkRect.Contains(rWorkArea))
{
if(aMarkRect.Left() < rWorkArea.Left())
{
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index a8dea819c428..f0fd9fbe9dc2 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -180,7 +180,7 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt (
if ( ! mrView.GetLayouter().GetPageObjectLayouter()->GetBoundingBox(
pDescriptorAtPoint,
view::PageObjectLayouter::Part::Preview,
- view::PageObjectLayouter::WindowCoordinateSystem).IsInside(aWindowPosition))
+ view::PageObjectLayouter::WindowCoordinateSystem).Contains(aWindowPosition))
{
pDescriptorAtPoint.reset();
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 1432fc7dd57e..c710a4c1be51 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -734,7 +734,7 @@ SelectionFunction::EventDescriptor::EventDescriptor (
// explicit test.
mbIsLeaving = rEvent.IsLeaveWindow()
|| ! ::tools::Rectangle(Point(0,0),
- rSlideSorter.GetContentWindow()->GetOutputSizePixel()).IsInside(maMousePosition);
+ rSlideSorter.GetContentWindow()->GetOutputSizePixel()).Contains(maMousePosition);
}
SelectionFunction::EventDescriptor::EventDescriptor (
@@ -762,7 +762,7 @@ SelectionFunction::EventDescriptor::EventDescriptor (
// explicit test.
mbIsLeaving = rEvent.mbLeaving
|| ! ::tools::Rectangle(Point(0,0),
- rSlideSorter.GetContentWindow()->GetOutputSizePixel()).IsInside(maMousePosition);
+ rSlideSorter.GetContentWindow()->GetOutputSizePixel()).Contains(maMousePosition);
}
sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent (
@@ -1394,7 +1394,7 @@ void MultiSelectionModeHandler::UpdateSelection()
for (sal_Int32 nIndex=0; nIndex<nPageCount; ++nIndex)
{
- UpdateSelectionState(rModel.GetPageDescriptor(nIndex), aRange.IsInside(nIndex));
+ UpdateSelectionState(rModel.GetPageDescriptor(nIndex), aRange.Contains(nIndex));
}
}
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index a299f9327843..2e7d9a35137b 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -446,7 +446,7 @@ void SlideSorterView::DeterminePageObjectVisibilities()
SetState(
pDescriptor,
PageDescriptor::ST_Visible,
- aRange.IsInside(nIndex));
+ aRange.Contains(nIndex));
}
// Broadcast a change of the set of visible page objects.
@@ -485,7 +485,7 @@ void SlideSorterView::UpdatePreciousFlags()
{
pCache->SetPreciousFlag(
pDescriptor->GetPage(),
- maVisiblePageRange.IsInside(nIndex));
+ maVisiblePageRange.Contains(nIndex));
}
else
{
@@ -758,7 +758,7 @@ void SlideSorterView::UpdatePageUnderMouse ()
{
const Window::PointerState aPointerState (pWindow->GetPointerState());
const ::tools::Rectangle aWindowBox (pWindow->GetPosPixel(), pWindow->GetSizePixel());
- if (aWindowBox.IsInside(aPointerState.maPos))
+ if (aWindowBox.Contains(aPointerState.maPos))
{
UpdatePageUnderMouse(aPointerState.maPos);
return;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 7e4932b29856..05fca2edad19 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -273,7 +273,7 @@ void DrawViewShell::StartRulerDrag (
Point aWPos = GetActiveWindow()->PixelToLogic(GetActiveWindow()->GetPointerPosPixel());
- if ( rRuler.GetExtraRect().IsInside(rMEvt.GetPosPixel()) )
+ if ( rRuler.GetExtraRect().Contains(rMEvt.GetPosPixel()) )
{
mpDrawView->BegSetPageOrg(aWPos);
mbIsRulerDrag = true;
@@ -356,7 +356,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
::tools::Rectangle aOutputArea(Point(0,0), GetActiveWindow()->GetOutputSizePixel());
- if ( !aOutputArea.IsInside(rMEvt.GetPosPixel()) )
+ if ( !aOutputArea.Contains(rMEvt.GetPosPixel()) )
{
bool bInsideOtherWindow = false;
@@ -366,7 +366,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
mpContentWindow->GetOutputSizePixel());
Point aPos = mpContentWindow->GetPointerPosPixel();
- if ( aOutputArea.IsInside(aPos) )
+ if ( aOutputArea.Contains(aPos) )
bInsideOtherWindow = true;
}
@@ -467,7 +467,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
::tools::Rectangle aOutputArea(Point(0,0), GetActiveWindow()->GetOutputSizePixel());
- if (aOutputArea.IsInside(rMEvt.GetPosPixel()))
+ if (aOutputArea.Contains(rMEvt.GetPosPixel()))
{
mpDrawView->EndAction();
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index e6c3cc8e7f20..3c8738dc3f53 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -83,7 +83,7 @@ void DrawViewShell::MakeVisible(const ::tools::Rectangle& rRect, vcl::Window& rW
rWin.GetOutDev()->Pop();
Size aVisAreaSize(aVisArea.GetSize());
- if ( aVisArea.IsInside(rRect) )
+ if ( aVisArea.Contains(rRect) )
return;
// object is not entirely in visible area
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 5f305228c1e3..3a40d4065d93 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -456,7 +456,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
aRect.Union( pObj->GetLogicRect() );
}
- if( aRect.IsInside( pOLV->GetWindow()->PixelToLogic( rEvt.maPosPixel ) ) )
+ if( aRect.Contains( pOLV->GetWindow()->PixelToLogic( rEvt.maPosPixel ) ) )
{
bIsInsideOutlinerView = true;
}
@@ -637,7 +637,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
Point aPos( pOLV->GetWindow()->PixelToLogic( rEvt.maPosPixel ) );
- if( aRect.IsInside( aPos ) )
+ if( aRect.Contains( aPos ) )
{
bIsInsideOutlinerView = true;
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index a7204648ee4d..787c16319fcd 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -114,7 +114,7 @@ static void ImpCheckInsertPos(Point& rPos, const Size& rSize, const ::tools::Rec
::tools::Rectangle aMarkRect(Point(rPos.X() - (rSize.Width() / 2), rPos.Y() - (rSize.Height() / 2)), rSize);
- if(aMarkRect.IsInside(rWorkArea))
+ if(aMarkRect.Contains(rWorkArea))
return;
if(aMarkRect.Left() < rWorkArea.Left())
@@ -1421,7 +1421,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
::tools::Rectangle aRect( pOLV->GetOutputArea() );
Point aPos( pOLV->GetWindow()->PixelToLogic( maDropPos ) );
- if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) )
+ if( aRect.Contains( aPos ) || ( !bDrag && IsTextEdit() ) )
{
// mba: clipboard always must contain absolute URLs (could be from alien source)
pOLV->Read( *xStm, EETextFormat::Xml, mpDocSh->GetHeaderAttributes() );
@@ -1459,7 +1459,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
::tools::Rectangle aRect( pOLV->GetOutputArea() );
Point aPos( pOLV->GetWindow()->PixelToLogic( maDropPos ) );
- if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) )
+ if( aRect.Contains( aPos ) || ( !bDrag && IsTextEdit() ) )
{
// mba: clipboard always must contain absolute URLs (could be from alien source)
pOLV->Read( *xStm, EETextFormat::Rtf, mpDocSh->GetHeaderAttributes() );
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 00e27a641c01..02febb2823be 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -85,7 +85,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
if(pPV && dynamic_cast< const ::sd::slidesorter::view::SlideSorterView* >(this) != nullptr)
{
- if(!pPV->GetPageRect().IsInside(rPos))
+ if(!pPV->GetPageRect().Contains(rPos))
pPV = nullptr;
}
@@ -313,7 +313,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
if(pPV && dynamic_cast<const ::sd::slidesorter::view::SlideSorterView* >(this) )
{
- if(!pPV->GetPageRect().IsInside(rPos))
+ if(!pPV->GetPageRect().Contains(rPos))
pPV = nullptr;
}
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 6f6ab50f4210..4bdad2e492b9 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -2245,7 +2245,7 @@ void SfxWorkWindow::EndAutoShow_Impl( Point aPos )
{
Point aLocalPos = p->ScreenToOutputPixel( aPos );
tools::Rectangle aRect( Point(), p->GetSizePixel() );
- if ( !aRect.IsInside( aLocalPos ) )
+ if ( !aRect.Contains( aLocalPos ) )
p->FadeOut();
}
}
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index d73b44dbd0a9..0d0648f222a8 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -105,7 +105,7 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView &rView, const OUStri
{
::tools::Rectangle aRect(ThumbnailViewItem::updateHighlight(bVisible, rPoint));
- if (bVisible && getRemoveIconArea().IsInside(rPoint))
+ if (bVisible && getRemoveIconArea().Contains(rPoint))
{
if (!m_bRemoveIconHighlighted)
aRect.Union(getRemoveIconArea());
@@ -161,7 +161,7 @@ void RecentDocsViewItem::MouseButtonUp(const MouseEvent& rMEvt)
{
if (rMEvt.IsLeft())
{
- if (getRemoveIconArea().IsInside(rMEvt.GetPosPixel()))
+ if (getRemoveIconArea().Contains(rMEvt.GetPosPixel()))
{
SvtHistoryOptions::DeleteItem(EHistoryType::PickList, maURL);
mrParent.Reload();
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 619ede548701..ef97894f9162 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -200,7 +200,7 @@ OUString ThumbnailView::RequestHelp(tools::Rectangle& rHelpRect)
if (!pItem->mbVisible)
continue;
const tools::Rectangle& rDrawArea = pItem->getDrawArea();
- if (pItem->mbVisible && rDrawArea.IsInside(aPos))
+ if (pItem->mbVisible && rDrawArea.Contains(aPos))
{
rHelpRect = rDrawArea;
return pItem->getHelpText();
@@ -494,7 +494,7 @@ size_t ThumbnailView::ImplGetItem( const Point& rPos ) const
for (size_t i = 0; i < mFilteredItemList.size(); ++i)
{
- if (mFilteredItemList[i]->isVisible() && mFilteredItemList[i]->getDrawArea().IsInside(rPos))
+ if (mFilteredItemList[i]->isVisible() && mFilteredItemList[i]->getDrawArea().Contains(rPos))
return i;
}
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 4c789823dad2..8ec4e0098872 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -249,7 +249,7 @@ sal_Bool SAL_CALL ThumbnailViewAcc::containsPoint( const awt::Point& aPoint )
const Point aSize( aRect.Width, aRect.Height );
const Point aNullPoint, aTestPoint( aPoint.X, aPoint.Y );
- return tools::Rectangle( aNullPoint, aSize ).IsInside( aTestPoint );
+ return tools::Rectangle( aNullPoint, aSize ).Contains( aTestPoint );
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleAtPoint( const awt::Point& aPoint )
@@ -764,7 +764,7 @@ sal_Bool SAL_CALL ThumbnailViewItemAcc::containsPoint( const awt::Point& aPoint
const Point aSize( aRect.Width, aRect.Height );
const Point aNullPoint, aTestPoint( aPoint.X, aPoint.Y );
- return tools::Rectangle( aNullPoint, aSize ).IsInside( aTestPoint );
+ return tools::Rectangle( aNullPoint, aSize ).Contains( aTestPoint );
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleAtPoint( const awt::Point& )
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 809f6b935bcd..36dad7840445 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -77,7 +77,7 @@ void ThumbnailViewItem::setHighlight (bool state)
{
bool bNeedsPaint = false;
- if (bVisible && getDrawArea().IsInside(rPoint))
+ if (bVisible && getDrawArea().Contains(rPoint))
{
if (!isHighlighted())
bNeedsPaint = true;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 48e57efaacc4..5e1c5d3e1c35 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -640,7 +640,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect )
bool bFloatMode = false;
- if ( GetOuterRect().IsInside( rPos ) )
+ if ( GetOuterRect().Contains( rPos ) )
{
// Mouse within OuterRect: calculate Alignment and Rectangle
SfxChildAlignment eAlign = CalcAlignment(rPos, rRect);
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index cb27aed0c23f..1389dd8e1dbe 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -994,7 +994,7 @@ bool SfxSplitWindow::CursorIsOverRect() const
aRect = aRect.GetUnion( aVisRect );
}
- return aRect.IsInside( OutputToScreenPixel( static_cast<vcl::Window*>(const_cast<SfxSplitWindow *>(this))->GetPointerPosPixel() ) );
+ return aRect.Contains( OutputToScreenPixel( static_cast<vcl::Window*>(const_cast<SfxSplitWindow *>(this))->GetPointerPosPixel() ) );
}
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 068946cb5b65..c8f847fffb3b 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -179,7 +179,7 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
if (mEvt->IsLeft())
{
tools::Rectangle aGrip = mpSidebarController->GetDeckDragArea();
- if ( aGrip.IsInside( mEvt->GetPosPixel() ) )
+ if ( aGrip.Contains( mEvt->GetPosPixel() ) )
mbIsReadyToDrag = true;
}
}
@@ -187,7 +187,7 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
{
const MouseEvent *mEvt = rEvent.GetMouseEvent();
tools::Rectangle aGrip = mpSidebarController->GetDeckDragArea();
- if (mEvt->IsLeft() && aGrip.IsInside( mEvt->GetPosPixel() ) && mbIsReadyToDrag )
+ if (mEvt->IsLeft() && aGrip.Contains( mEvt->GetPosPixel() ) && mbIsReadyToDrag )
{
Point aPos = mEvt->GetPosPixel();
vcl::Window* pWindow = rEvent.GetWindow();
diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index 1e85f269cf3d..789a497f9593 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -165,7 +165,7 @@ bool LokChartHelper::Hit(const Point& aPos)
if (pChartWindow)
{
tools::Rectangle rChartBBox = GetChartBoundingBox();
- return rChartBBox.IsInside(aPos);
+ return rChartBBox.Contains(aPos);
}
}
return false;
@@ -281,7 +281,7 @@ bool LokChartHelper::postMouseEvent(int nType, int nX, int nY,
if (pChartWindow)
{
tools::Rectangle rChartBBox = GetChartBoundingBox();
- if (rChartBBox.IsInside(aMousePos))
+ if (rChartBBox.Contains(aMousePos))
{
int nChartWinX = nX - rChartBBox.Left();
int nChartWinY = nY - rChartBBox.Top();
@@ -303,7 +303,7 @@ bool LokChartHelper::postMouseEvent(int nType, int nX, int nY,
bool LokChartHelper::setTextSelection(int nType, int nX, int nY)
{
tools::Rectangle rChartBBox = GetChartBoundingBox();
- if (rChartBBox.IsInside(Point(nX, nY)))
+ if (rChartBBox.Contains(Point(nX, nY)))
{
css::uno::Reference<css::frame::XDispatch> xDispatcher = GetXDispatcher();
if (xDispatcher.is())
@@ -330,7 +330,7 @@ bool LokChartHelper::setGraphicSelection(int nType, int nX, int nY,
double fScaleX, double fScaleY)
{
tools::Rectangle rChartBBox = GetChartBoundingBox();
- if (rChartBBox.IsInside(Point(nX, nY)))
+ if (rChartBBox.Contains(Point(nX, nY)))
{
int nChartWinX = nX - rChartBBox.Left();
int nChartWinY = nY - rChartBBox.Top();
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 73d709436d9b..6bbc18f86ca7 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1686,7 +1686,7 @@ void SfxViewShell::CheckIPClient_Impl(
// object in client is currently not active
// check if the object wants to be activated always or when it becomes at least partially visible
// TODO/LATER: maybe we should use the scaled area instead of the ObjArea?!
- if (bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())))
+ if (bAlwaysActive || (bActiveWhenVisible && rVisArea.Overlaps(pIPClient->GetObjArea())))
{
try
{
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 278b2287b40b..c627980440e5 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -561,13 +561,13 @@ bool SmElementsControl::MouseMove( const MouseEvent& rMouseEvent )
return false;
}
- if (tools::Rectangle(Point(0, 0), GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel()))
+ if (tools::Rectangle(Point(0, 0), GetOutputSizePixel()).Contains(rMouseEvent.GetPosPixel()))
{
const SmElement* pPrevElement = current();
if (pPrevElement)
{
const tools::Rectangle rect(pPrevElement->mBoxLocation, pPrevElement->mBoxSize);
- if (rect.IsInside(rMouseEvent.GetPosPixel()))
+ if (rect.Contains(rMouseEvent.GetPosPixel()))
return true;
}
@@ -579,7 +579,7 @@ bool SmElementsControl::MouseMove( const MouseEvent& rMouseEvent )
continue;
const tools::Rectangle rect(element->mBoxLocation, element->mBoxSize);
- if (rect.IsInside(rMouseEvent.GetPosPixel()))
+ if (rect.Contains(rMouseEvent.GetPosPixel()))
{
m_nCurrentRolloverElement = n;
Invalidate();
@@ -613,13 +613,13 @@ bool SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent)
{
GrabFocus();
- if (rMouseEvent.IsLeft() && tools::Rectangle(Point(0, 0), GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel()) && maSelectHdlLink.IsSet())
+ if (rMouseEvent.IsLeft() && tools::Rectangle(Point(0, 0), GetOutputSizePixel()).Contains(rMouseEvent.GetPosPixel()) && maSelectHdlLink.IsSet())
{
const SmElement* pPrevElement = hasRollover() ? current() : nullptr;
if (pPrevElement)
{
tools::Rectangle rect(pPrevElement->mBoxLocation, pPrevElement->mBoxSize);
- if (rect.IsInside(rMouseEvent.GetPosPixel()))
+ if (rect.Contains(rMouseEvent.GetPosPixel()))
{
setCurrentElement(m_nCurrentRolloverElement);
maSelectHdlLink.Call(*const_cast<SmElement*>(pPrevElement));
@@ -633,7 +633,7 @@ bool SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent)
{
SmElement* element = maElementList[n].get();
tools::Rectangle rect(element->mBoxLocation, element->mBoxSize);
- if (rect.IsInside(rMouseEvent.GetPosPixel()))
+ if (rect.Contains(rMouseEvent.GetPosPixel()))
{
setCurrentElement(n);
maSelectHdlLink.Call(*element);
@@ -726,7 +726,7 @@ void SmElementsControl::stepFocus(const bool bBackward)
const tools::Rectangle outputRect(Point(0,0), GetOutputSizePixel());
const SmElement *pCur = maElementList[nPos].get();
tools::Rectangle elementRect(pCur->mBoxLocation, pCur->mBoxSize);
- if (!outputRect.IsInside(elementRect))
+ if (!outputRect.Contains(elementRect))
scrollToElement(bBackward, pCur);
Invalidate();
}
@@ -753,7 +753,7 @@ void SmElementsControl::pageFocus(const bool bBackward)
SmElement *pCur = maElementList[nPos].get();
tools::Rectangle elementRect(pCur->mBoxLocation, pCur->mBoxSize);
- if (!outputRect.IsInside(elementRect))
+ if (!outputRect.Contains(elementRect))
{
if (nPrevPos != nStartPos)
{
@@ -1134,7 +1134,7 @@ bool SmElementsControl::itemIsVisible(sal_uInt16 nPos) const
return false;
tools::Rectangle outputRect(Point(0, 0), GetOutputSizePixel());
- return outputRect.IsInside(elementRect);
+ return outputRect.Contains(elementRect);
}
sal_uInt16 SmElementsControl::itemCount() const { return maElementList.size(); }
@@ -1185,7 +1185,7 @@ sal_uInt16 SmElementsControl::itemAtPos(const Point& rPoint) const
{
const SmElement* pItem = maElementList[n].get();
tools::Rectangle elementRect(pItem->mBoxLocation, pItem->mBoxSize);
- if (elementRect.IsInside(rPoint))
+ if (elementRect.Contains(rPoint))
return n;
}
return SAL_MAX_UINT16;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 3bb9d1196482..6eb9da06a5f2 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -549,7 +549,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoin
Size aSize( pNode->GetSize() );
tools::Rectangle aRect( aTLPos, aSize );
- if (aRect.IsInside( aPos ))
+ if (aRect.Contains( aPos ))
{
OSL_ENSURE( pNode->IsVisible(), "node is not a leaf" );
OUStringBuffer aBuf;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index ff1d001578de..a67273dc32ef 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1030,7 +1030,7 @@ bool SmShowSymbolSet::MouseButtonDown(const MouseEvent& rMEvt)
aPoint.AdjustX( -nXOffset );
aPoint.AdjustY( -nYOffset );
- if (rMEvt.IsLeft() && tools::Rectangle(Point(0, 0), aOutputSize).IsInside(rMEvt.GetPosPixel()))
+ if (rMEvt.IsLeft() && tools::Rectangle(Point(0, 0), aOutputSize).Contains(rMEvt.GetPosPixel()))
{
tools::Long nPos = (aPoint.Y() / nLen) * nColumns + (aPoint.X() / nLen) +
m_xScrolledWindow->vadjustment_get_value() * nColumns;
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 1641b39f8b41..9dee11a5d549 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -1988,7 +1988,7 @@ bool BrowseBox::IsFieldVisible( sal_Int32 nRow, sal_uInt16 nColumnId,
if ( bCompletely )
// test if the field is completely visible
- return aOutRect.IsInside( aRect );
+ return aOutRect.Contains( aRect );
else
// test if the field is partly of completely visible
return !aOutRect.Intersection( aRect ).IsEmpty();
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index c3c76bf65e5e..cba104827c8d 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list