diff options
236 files changed, 678 insertions, 663 deletions
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 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -412,9 +412,9 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) Range aJustifiedRange( aSelRange ); aJustifiedRange.Justify(); - bool bSelectThis = ( bSelect != aJustifiedRange.IsInside( rEvt.GetRow() ) ); + bool bSelectThis = ( bSelect != aJustifiedRange.Contains( rEvt.GetRow() ) ); - if ( aJustifiedRange.IsInside( rEvt.GetRow() ) ) + if ( aJustifiedRange.Contains( rEvt.GetRow() ) ) { // down and up while ( rEvt.GetRow() < aSelRange.Max() ) diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 04ba4b489f08..5652a74b72af 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -269,7 +269,7 @@ namespace svt aBoxSize); // we want the initial mouse event to act as if it was performed on the checkbox - if (aHotRect.IsInside(aPos)) + if (aHotRect.Contains(aPos)) rControl.Clicked(); } diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 7d557a622ad4..c7718935bdbe 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -73,7 +73,7 @@ sal_Bool SAL_CALL SvtRulerAccessible::containsPoint( const awt::Point& rPoint ) { // no guard -> done in getBounds() // return GetBoundingBox().IsInside( VCLPoint( rPoint ) ); - return tools::Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); + return tools::Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).Contains( VCLPoint( rPoint ) ); } uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleAtPoint( const awt::Point& ) diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 4322f15dacf9..467b6d8a7534 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1500,7 +1500,7 @@ bool Ruler::ImplDoHitTest( const Point& rPos, RulerSelection* pHitTest, aRect.SetRight( n1 - ruler_tab.cwidth2 + ruler_tab.cwidth ); } - if ( aRect.IsInside( Point( nX, nY ) ) ) + if ( aRect.Contains( Point( nX, nY ) ) ) { pHitTest->eType = RulerType::Tab; pHitTest->nAryPos = i; @@ -1540,7 +1540,7 @@ bool Ruler::ImplDoHitTest( const Point& rPos, RulerSelection* pHitTest, aRect.SetBottom( nIndentHeight+RULER_OFF-1 ); } - if ( aRect.IsInside( Point( nX, nY ) ) ) + if ( aRect.Contains( Point( nX, nY ) ) ) { pHitTest->eType = RulerType::Indent; pHitTest->nAryPos = i-1; @@ -1686,7 +1686,7 @@ bool Ruler::ImplDoHitTest( const Point& rPos, RulerSelection* pHitTest, aRect.AdjustLeft( -1 ); aRect.AdjustRight( 1 ); - if ( aRect.IsInside( Point( nX, nY ) ) ) + if ( aRect.Contains( Point( nX, nY ) ) ) { pHitTest->eType = RulerType::Tab; pHitTest->nAryPos = i; @@ -1925,7 +1925,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt ) Invalidate(InvalidateFlags::NoErase); } - if ( maExtraRect.IsInside( aMousePos ) ) + if ( maExtraRect.Contains( aMousePos ) ) { ExtraDown(); } diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 4bca7ccbb99d..66f1fc67552e 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1760,7 +1760,7 @@ sal_uInt16 TabBar::GetPageId(const Point& rPos) const { for (const auto& rItem : mpImpl->maItemList) { - if (rItem.maRect.IsInside(rPos)) + if (rItem.maRect.Contains(rPos)) return rItem.mnId; } diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index de0873a7aad6..d8f97826499f 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -303,7 +303,7 @@ sal_Bool SAL_CALL ValueItemAcc::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 ValueItemAcc::getAccessibleAtPoint( const awt::Point& ) @@ -705,7 +705,7 @@ sal_Bool SAL_CALL ValueSetAcc::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 ); } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 9e14b49dbe46..8f7b87a03af3 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -171,12 +171,12 @@ size_t ValueSet::ImplGetItem( const Point& rPos ) const return VALUESET_ITEM_NOTFOUND; } - if (mpNoneItem && maNoneItemRect.IsInside(rPos)) + if (mpNoneItem && maNoneItemRect.Contains(rPos)) { return VALUESET_ITEM_NONEITEM; } - if (maItemListRect.IsInside(rPos)) + if (maItemListRect.Contains(rPos)) { const int xc = rPos.X() - maItemListRect.Left(); const int yc = rPos.Y() - maItemListRect.Top(); diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 65e158e164b6..d28666be8b80 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1499,7 +1499,7 @@ namespace accessibility tools::Rectangle aParaBounds( rCacheTF.GetParaBounds( nChild ) ); - if( aParaBounds.IsInside( aLogPoint ) ) + if( aParaBounds.Contains( aLogPoint ) ) return getAccessibleChild( nChild - mnFirstVisibleChild + GetStartIndex() ); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index c4b75024c9fc..4d474a4953fa 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -315,7 +315,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes ( // Insert shape if it is visible, i.e. its bounding box overlaps // the visible area. - if ( aBoundingBox.IsOver (aVisibleArea) ) + if ( aBoundingBox.Overlaps(aVisibleArea) ) raDescriptorList.emplace_back(xShape); } } @@ -439,7 +439,7 @@ void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape) if (xParent != mxShapeList) return; - if (!aBoundingBox.IsOver (aVisibleArea)) + if (!aBoundingBox.Overlaps(aVisibleArea)) return; // Add shape to list of visible shapes. diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 8910db46c804..50fdca8133db 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -154,7 +154,7 @@ bool SvxShowCharSet::MouseButtonUp(const MouseEvent& rMEvt) if ( bDrag && rMEvt.IsLeft() ) { // released mouse over character map - if ( tools::Rectangle(Point(), GetOutputSizePixel()).IsInside(rMEvt.GetPosPixel())) + if ( tools::Rectangle(Point(), GetOutputSizePixel()).Contains(rMEvt.GetPosPixel())) aSelectHdl.Call( this ); ReleaseMouse(); bDrag = false; diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index bfc0adb8cd97..eb77959f4a91 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -165,7 +165,7 @@ bool ContourWindow::MouseMove( const MouseEvent& rMEvt ) aPipetteColor = GetDrawingArea()->get_ref_device().GetPixel( aLogPt ); weld::CustomWidgetController::MouseMove( rMEvt ); - if ( aPipetteLink.IsSet() && tools::Rectangle( Point(), GetGraphicSize() ).IsInside( aLogPt ) ) + if ( aPipetteLink.IsSet() && tools::Rectangle( Point(), GetGraphicSize() ).Contains( aLogPt ) ) { SetPointer( PointerStyle::RefHand ); aPipetteLink.Call( *this ); @@ -182,7 +182,7 @@ bool ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) const tools::Rectangle aGraphRect( Point(), GetGraphicSize() ); const Point aLogPt( GetDrawingArea()->get_ref_device().PixelToLogic( rMEvt.GetPosPixel() ) ); - bClickValid = aGraphRect.IsInside( aLogPt ); + bClickValid = aGraphRect.Contains( aLogPt ); ReleaseMouse(); if ( bPipetteMode ) diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 75e1a066ec63..435cd489d482 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -180,7 +180,7 @@ void FrameBorder::AddClickRect( const tools::Rectangle& rRect ) bool FrameBorder::ContainsClickPoint( const Point& rPos ) const { - return vcl::Region( maClickArea ).IsInside( rPos ); + return vcl::Region( maClickArea ).Contains( rPos ); } tools::Rectangle FrameBorder::GetClickBoundRect() const diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index f23afd447cf7..8b113c86e7d8 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -434,7 +434,7 @@ bool GraphCtrl::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()) { @@ -585,7 +585,7 @@ bool GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) const Point aLogPt( rDevice.PixelToLogic( rMEvt.GetPosPixel() ) ); - if ( !tools::Rectangle( Point(), aGraphSize ).IsInside( aLogPt ) && !pView->IsEditMode() ) + if ( !tools::Rectangle( Point(), aGraphSize ).Contains( aLogPt ) && !pView->IsEditMode() ) weld::CustomWidgetController::MouseButtonDown( rMEvt ); else { @@ -645,7 +645,7 @@ bool GraphCtrl::MouseMove(const MouseEvent& rMEvt) if ( aMousePosLink.IsSet() ) { - if ( tools::Rectangle( Point(), aGraphSize ).IsInside( aLogPos ) ) + if ( tools::Rectangle( Point(), aGraphSize ).Contains( aLogPos ) ) aMousePos = aLogPos; else aMousePos = Point(); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 5f820685dd2d..0d90d3dcef4e 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -440,7 +440,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const SdrObject* pObj = nullptr; Point aPt = rDevice.PixelToLogic( rPosPixel ); - if ( tools::Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) ) + if ( tools::Rectangle( Point(), GetGraphicSize() ).Contains( aPt ) ) { SdrPage* pPage = pModel->GetPage( 0 ); if ( pPage ) diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index dbb1e0410491..aa82ccecaf7b 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -639,7 +639,7 @@ void SwFrameExample::Paint(vcl::RenderContext& rRenderContext, const tools::Rect if (i == (nLines - 1)) aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight())); - if (aTxt.IsOver(aFrmRect) && nAnchor != RndStdIds::FLY_AS_CHAR && !bIgnoreWrap) + if (aTxt.Overlaps(aFrmRect) && nAnchor != RndStdIds::FLY_AS_CHAR && !bIgnoreWrap) { switch(nWrap) { @@ -658,7 +658,7 @@ void SwFrameExample::Paint(vcl::RenderContext& rRenderContext, const tools::Rect default: break; } } - if (pOuterFrame->IsInside(aTxt)) + if (pOuterFrame->Contains(aTxt)) DrawRect_Impl(rRenderContext, aTxt, m_aTxtCol, m_aTransColor ); aTxt.Move(0, nStep); @@ -692,7 +692,7 @@ void SwFrameExample::Paint(vcl::RenderContext& rRenderContext, const tools::Rect DrawRect_Impl(rRenderContext, aRect, m_aTransColor, m_aAlignColor); // Frame View - bool bDontFill = (nAnchor == RndStdIds::FLY_AT_CHAR && aFrmRect.IsOver(aAutoCharFrame)) || bTrans; + bool bDontFill = (nAnchor == RndStdIds::FLY_AT_CHAR && aFrmRect.Overlaps(aAutoCharFrame)) || bTrans; DrawRect_Impl(rRenderContext, aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor); } diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 171f8348b9ac..6c3b328ba5ea 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -87,7 +87,7 @@ void CandidateMgr::PaintTransparentChildren(vcl::Window const & rWindow, tools:: pCandidate->GetPosPixel(), pCandidate->GetSizePixel()); - if (aCandidatePosSizePixel.IsOver(rPixelRect)) + if (aCandidatePosSizePixel.Overlaps(rPixelRect)) { m_aCandidates.emplace_back(pCandidate); pCandidate->AddEventListener(LINK(this, CandidateMgr, WindowEventListener)); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 2288db38cc7b..0d4bb55d09f5 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -687,13 +687,13 @@ void SdrEditView::ForceMarkedObjToAnotherPage() SdrObject* pObj=pM->GetMarkedSdrObj(); tools::Rectangle aObjRect(pObj->GetCurrentBoundRect()); tools::Rectangle aPgRect(pM->GetPageView()->GetPageRect()); - if (!aObjRect.IsOver(aPgRect)) { + if (!aObjRect.Overlaps(aPgRect)) { bool bFnd=false; SdrPageView* pPV = GetSdrPageView(); if(pPV) { - bFnd = aObjRect.IsOver(pPV->GetPageRect()); + bFnd = aObjRect.Overlaps(pPV->GetPageRect()); } if(bFnd) diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index e284b5c965f2..4e5a5e3c4f43 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -128,7 +128,7 @@ void SdrEditView::MovMarkedToTop() nNewPos--; bEnd=true; } - else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect())) + else if (rBR.Overlaps(pCmpObj->GetCurrentBoundRect())) { nNewPos=nCmpPos; bEnd=true; @@ -218,7 +218,7 @@ void SdrEditView::MovMarkedToBtm() nNewPos++; bEnd=true; } - else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect())) + else if (rBR.Overlaps(pCmpObj->GetCurrentBoundRect())) { nNewPos=nCmpPos; bEnd=true; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 273719218663..45ac84a3c49b 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1721,7 +1721,7 @@ bool SdrObjEditView::IsTextEditHit(const Point& rHit) const if (OutlinerView* pOLV = pTextEditOutliner->GetView(0)) aEditArea.Union(pOLV->GetOutputArea()); - if (aEditArea.IsInside(rHit)) + if (aEditArea.Contains(rHit)) { // check if any characters were actually hit const Point aPnt(rHit - aEditArea.TopLeft()); tools::Long nHitTol = 2000; @@ -1750,14 +1750,14 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const sal_uInt16 nPixSiz = pOLV->GetInvalidateMore(); tools::Rectangle aEditArea(aMinTextEditArea); aEditArea.Union(pOLV->GetOutputArea()); - if (!aEditArea.IsInside(rHit)) + if (!aEditArea.Contains(rHit)) { Size aSiz(pWin->PixelToLogic(Size(nPixSiz, nPixSiz))); aEditArea.AdjustLeft(-(aSiz.Width())); aEditArea.AdjustTop(-(aSiz.Height())); aEditArea.AdjustRight(aSiz.Width()); aEditArea.AdjustBottom(aSiz.Height()); - bOk = aEditArea.IsInside(rHit); + bOk = aEditArea.Contains(rHit); } } } diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index e97593ca0319..2ad70c9dee90 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -503,7 +503,7 @@ namespace if(pText && pObj->IsClosedObj() && (!bMaster || (!pObj->IsNotVisibleAsMaster() && 0 != no)) - && pObj->GetCurrentBoundRect().IsInside(rPnt) + && pObj->GetCurrentBoundRect().Contains(rPnt) && !pText->IsHideContour() && SdrObjectPrimitiveHit(*pObj, rPnt, 0, rTextEditPV, &rVisLayers, false)) { diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 7f25074cf425..9808372f8401 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -276,7 +276,7 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos()); Size aSiz=rOut.PixelToLogic(aGlueHalfSize); tools::Rectangle aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(),aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height()); - return aRect.IsInside(rPnt); + return aRect.Contains(rPnt); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 456ffd30f7fd..7334b82324aa 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -2074,7 +2074,7 @@ void SdrMarkView::MarkObj(const tools::Rectangle& rRect, bool bUnmark) for (size_t nO=0; nO<nObjCount; ++nO) { SdrObject* pObj=pObjList->GetObj(nO); tools::Rectangle aRect(pObj->GetCurrentBoundRect()); - if (aFrm1.IsInside(aRect)) { + if (aFrm1.Contains(aRect)) { if (!bUnmark) { if (IsObjMarkable(pObj,pPV)) { @@ -2279,7 +2279,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT aRect.AdjustRight(nTol2 ); aRect.AdjustBottom(nTol2 ); - if (aRect.IsInside(rPnt)) + if (aRect.Contains(rPnt)) { if (!bCheckIfMarkable || IsObjMarkable(pObj,pPV)) { @@ -2499,7 +2499,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie aRect.AdjustTop( -mnHitTolLog ); aRect.AdjustRight(mnHitTolLog ); aRect.AdjustBottom(mnHitTolLog ); - if (aRect.IsInside(rPnt)) { + if (aRect.Contains(rPnt)) { rpObj=pObj; rpPV=pPV; return true; diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 0c32aefcfd11..693965b10f81 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -215,7 +215,7 @@ bool SdrMarkView::MarkPoints(const tools::Rectangle* pRect, bool bUnmark) } } Point aPos(pHdl->GetPos()); - if (pM!=nullptr && (pRect==nullptr || pRect->IsInside(aPos))) { + if (pM!=nullptr && (pRect==nullptr || pRect->Contains(aPos))) { if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=true; } } @@ -415,7 +415,7 @@ bool SdrMarkView::MarkGluePoints(const tools::Rectangle* pRect, bool bUnmark) if(rGP.IsUserDefined()) { Point aPos(rGP.GetAbsolutePos(*pObj)); - if (pRect==nullptr || pRect->IsInside(aPos)) { + if (pRect==nullptr || pRect->Contains(aPos)) { bool bContains = rPts.find( rGP.GetId() ) != rPts.end(); if (!bUnmark && !bContains) { bChgd=true; diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 45e4329a54a8..549d75af74e1 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -2177,7 +2177,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO (pThis==nullptr || pObj!=static_cast<SdrObject const *>(pThis))) // don't connect it to itself { tools::Rectangle aObjBound(pObj->GetCurrentBoundRect()); - if (aObjBound.IsOver(aMouseRect)) { + if (aObjBound.Overlaps(aMouseRect)) { aTestCon.ResetVars(); bool bEdge=dynamic_cast<const SdrEdgeObj *>(pObj) != nullptr; // no BestCon for Edge // User-defined connectors have absolute priority. @@ -2222,7 +2222,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO bOk = true; } } - if (bOk && aMouseRect.IsInside(aConPos)) { + if (bOk && aMouseRect.Contains(aConPos)) { if (bUser) bUserFnd = true; bFnd = true; sal_uIntPtr nDist=static_cast<sal_uIntPtr>(std::abs(aConPos.X()-rPt.X()))+static_cast<sal_uIntPtr>(std::abs(aConPos.Y()-rPt.Y())); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 3a9fa3970cb8..188dae9ff881 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -845,7 +845,7 @@ void SdrPaintView::InvalidateAllWin(const tools::Rectangle& rRect) tools::Rectangle aOutRect(aOrg, rOutDev.GetOutputSize()); // In case of tiled rendering we want to get all invalidations, so visual area is not interesting. - if (aRect.IsOver(aOutRect) || comphelper::LibreOfficeKit::isActive()) + if (aRect.Overlaps(aOutRect) || comphelper::LibreOfficeKit::isActive()) { InvalidateOneWin(rOutDev, aRect); } diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index b827ab6ae439..bcef8b3c3ea5 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -334,7 +334,7 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const aRect.AdjustRight(mx ); aRect.AdjustTop( -my ); aRect.AdjustBottom(my ); - if (aRect.IsInside(rPnt)) { + if (aRect.Contains(rPnt)) { if (bOPntSnap && nMaxPointSnapCount>0) { sal_uInt32 nCount(pO->GetSnapPointCount()); @@ -357,7 +357,7 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const aR1.AdjustRight(mx ); aR1.AdjustTop( -my ); aR1.AdjustBottom(my ); - if (aR1.IsInside(rPnt)) { + if (aR1.Contains(rPnt)) { if (std::abs(x-aLog.Left ())<=mx) { dx1=-(x-aLog.Left ()); if (std::abs(dx1)<std::abs(dx)) dx=dx1; } if (std::abs(x-aLog.Right ())<=mx) { dx1=-(x-aLog.Right ()); if (std::abs(dx1)<std::abs(dx)) dx=dx1; } if (std::abs(y-aLog.Top ())<=my) { dy1=-(y-aLog.Top ()); if (std::abs(dy1)<std::abs(dy)) dy=dy1; } diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 12ac69f92411..e5861ffb5060 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -860,7 +860,7 @@ bool GraphicExporter::GetGraphic( ExportSettings const & rSettings, Graphic& aGr // metafile) tools::Rectangle aTextRect; - if( aScrollRectangle.IsInside( aPaintRectangle ) ) + if( aScrollRectangle.Contains( aPaintRectangle ) ) aTextRect = aScrollRectangle; else aTextRect = aPaintRectangle; diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 38b12309c4f2..ddc4ef53834b 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -517,7 +517,7 @@ public: /* * Returns if cursor is wholly or partly within visible range. */ - bool IsCursorVisible() const { return VisArea().IsOver( GetCharRect() ); } + bool IsCursorVisible() const { return VisArea().Overlaps( GetCharRect() ); } /* * Returns SwRect, at which the character is located. */ diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 9467b728f2e7..3ba1f67d0882 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -82,10 +82,10 @@ public: // Same as Intersection, only assume that Rects are overlapping! SwRect &Intersection_( const SwRect &rRect ); - bool IsInside( const Point& rPOINT ) const; + bool Contains( const Point& rPOINT ) const; + bool Contains( const SwRect& rRect ) const; + bool Overlaps( const SwRect& rRect ) const; bool IsNear(const Point& rPoint, tools::Long nTolerance ) const; - bool IsInside( const SwRect& rRect ) const; - bool IsOver( const SwRect& rRect ) const; inline bool HasArea() const; inline bool IsEmpty() const; inline void Clear(); diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index a14c2e207722..9ad0753f0bc0 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -189,7 +189,7 @@ public: virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const override; // Check if SPoint is within table SSelection. - bool IsInside( const Point& rPt ) const; + bool Contains( const Point& rPt ) const; virtual void SetMark() override; virtual SwCursor* Create( SwPaM* pRing = nullptr ) const override; diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx index 46ede2b8ada3..b1cb3136b963 100644 --- a/sw/qa/core/layout/layout.cxx +++ b/sw/qa/core/layout/layout.cxx @@ -223,7 +223,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTextBoxAutoGrowVertical) tools::Rectangle aFlyRect(nFlyLeft, nFlyTop, nFlyRight, nFlyBottom); // Without the accompanying fix in place, this test would have failed, as aFlyRect was too wide, // so it was not inside aShapeRect anymore. - CPPUNIT_ASSERT(aShapeRect.IsInside(aFlyRect)); + CPPUNIT_ASSERT(aShapeRect.Contains(aFlyRect)); } CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTextboxModification) diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 11d4f2ed378c..6c7e71df3ef2 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -522,7 +522,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf136613) CPPUNIT_ASSERT(!rRect.IsEmpty()); //...if it is on the page. This will fail if not. - CPPUNIT_ASSERT_MESSAGE("The pictures are outside the page!", rPageRect.IsInside(rRect)); + CPPUNIT_ASSERT_MESSAGE("The pictures are outside the page!", rPageRect.Contains(rRect)); } } @@ -2750,7 +2750,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testBtlrCell) { std::stringstream ss; ss << "selection rectangle " << rRect << " is not inside cell rectangle " << aCellRect; - CPPUNIT_ASSERT_MESSAGE(ss.str(), aCellRect.IsInside(rRect)); + CPPUNIT_ASSERT_MESSAGE(ss.str(), aCellRect.Contains(rRect)); } // Make sure that the correct rectangle gets repainted on scroll. @@ -3181,7 +3181,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlapWrap) SwAnchoredObject* pSecond = rObjs[1]; // Without the accompanying fix in place, this test would have failed: AllowOverlap=no had // priority over Surround=through (which is bad for Word compat). - CPPUNIT_ASSERT(pSecond->GetObjRect().IsOver(pFirst->GetObjRect())); + CPPUNIT_ASSERT(pSecond->GetObjRect().Overlaps(pFirst->GetObjRect())); } CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124600) @@ -3513,7 +3513,7 @@ static SwRect lcl_getVisibleFlyObjRect(SwWrtShell* pWrtShell) pDrawObj = (*pDrawObjs)[0]; CPPUNIT_ASSERT_EQUAL(OUString("Rahmen123"), pDrawObj->GetFrameFormat().GetName()); SwRect aFlyRect = pDrawObj->GetObjRect(); - CPPUNIT_ASSERT(pPage->getFrameArea().IsInside(aFlyRect)); + CPPUNIT_ASSERT(pPage->getFrameArea().Contains(aFlyRect)); return aFlyRect; } diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index dad0d84ff135..91cb32016942 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -273,7 +273,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testtdf138951) const bool bIsAnchTheSame = *pShFrm->GetAnchor().GetContentAnchor() == *pShFrm->GetAnchor().GetContentAnchor(); CPPUNIT_ASSERT_MESSAGE("The anchor is different for the textbox and shape!", bIsAnchTheSame); - CPPUNIT_ASSERT_MESSAGE("The textbox has fallen apart!", aShpRect.IsInside(aTxtFrmRect)); + CPPUNIT_ASSERT_MESSAGE("The textbox has fallen apart!", aShpRect.Contains(aTxtFrmRect)); // Without the fix the anchor differs, and the frame outside of the shape } diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 03f6b21d8c9f..1890f2819d37 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -586,7 +586,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf112443) const SwRect aPageRect = pRootFrame->getFrameArea(); const SwRect aShapeRect(getShape(1)->getPosition().X, getShape(1)->getPosition().Y, getShape(1)->getSize().Width, getShape(1)->getSize().Height); - CPPUNIT_ASSERT_MESSAGE("The textframe must be off-page!", !aPageRect.IsInside(aShapeRect)); + CPPUNIT_ASSERT_MESSAGE("The textframe must be off-page!", !aPageRect.Contains(aShapeRect)); //OUString aTop = parseDump("//anchored/fly[1]/infos/bounds", "top"); //CPPUNIT_ASSERT_EQUAL(sal_Int32(30624), aTop.toInt32() ); @@ -788,7 +788,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf127825) CPPUNIT_ASSERT(rDrawObjs.size()); // Without the accompanying fix in place, this overlapped the footer area, not the body area. - CPPUNIT_ASSERT(rDrawObjs[0]->GetObjRect().IsOver(pBody->getFrameArea())); + CPPUNIT_ASSERT(rDrawObjs[0]->GetObjRect().Overlaps(pBody->getFrameArea())); } CPPUNIT_TEST_FIXTURE(Test, testTdf103345) diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index c87f81b08a8a..ed2ba675644f 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -442,7 +442,7 @@ void SwTiledRenderingTest::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 SwTiledRenderingTest::testPostKeyEvent() @@ -3065,7 +3065,7 @@ void SwTiledRenderingTest::testBulletDeleteInvalidation() SwFrame* pBody = pPage->GetLower(); SwFrame* pFirstText = pBody->GetLower(); tools::Rectangle aFirstTextRect = pFirstText->getFrameArea().SVRect(); - CPPUNIT_ASSERT(!aFirstTextRect.IsOver(m_aInvalidations)); + CPPUNIT_ASSERT(!aFirstTextRect.Overlaps(m_aInvalidations)); } void SwTiledRenderingTest::testBulletNoNumInvalidation() @@ -3097,7 +3097,7 @@ void SwTiledRenderingTest::testBulletNoNumInvalidation() SwFrame* pBody = pPage->GetLower(); SwFrame* pFirstText = pBody->GetLower(); tools::Rectangle aFirstTextRect = pFirstText->getFrameArea().SVRect(); - CPPUNIT_ASSERT(!aFirstTextRect.IsOver(m_aInvalidations)); + CPPUNIT_ASSERT(!aFirstTextRect.Overlaps(m_aInvalidations)); } void SwTiledRenderingTest::testBulletMultiDeleteInvalidation() @@ -3133,7 +3133,7 @@ void SwTiledRenderingTest::testBulletMultiDeleteInvalidation() SwFrame* pBody = pPage->GetLower(); SwFrame* pFirstText = pBody->GetLower(); tools::Rectangle aFirstTextRect = pFirstText->getFrameArea().SVRect(); - CPPUNIT_ASSERT(!aFirstTextRect.IsOver(m_aInvalidations)); + CPPUNIT_ASSERT(!aFirstTextRect.Overlaps(m_aInvalidations)); } void SwTiledRenderingTest::testCondCollCopy() diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index ecfcc65b60bc..76638a251913 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -135,9 +135,9 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame, if( rLower.IsAccessible( GetShell()->IsPreview() ) ) { Action eAction = Action::NONE; - if( aBox.IsOver( rNewVisArea ) ) + if( aBox.Overlaps( rNewVisArea ) ) { - if( aBox.IsOver( rOldVisArea ) ) + if( aBox.Overlaps( rOldVisArea ) ) { eAction = Action::SCROLLED_WITHIN; } @@ -154,7 +154,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame, } } } - else if( aBox.IsOver( rOldVisArea ) ) + else if( aBox.Overlaps( rOldVisArea ) ) { if ( bVisibleChildrenOnly && !rLower.AlwaysIncludeAsChild() ) @@ -251,8 +251,8 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame, } else if ( rLower.GetSwFrame() && ( !bVisibleChildrenOnly || - aBox.IsOver( rOldVisArea ) || - aBox.IsOver( rNewVisArea ) ) ) + aBox.Overlaps( rOldVisArea ) || + aBox.Overlaps( rNewVisArea ) ) ) { // There are no unaccessible SdrObjects that need to be notified ChildrenScrolled( rLower.GetSwFrame(), rOldVisArea ); diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 2643877038d0..e73e4e951acc 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -305,7 +305,7 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint( aPixBounds.Move(-aPixBounds.Left(), -aPixBounds.Top()); Point aPixPoint( aPoint.X, aPoint.Y ); - return aPixBounds.IsInside( aPixPoint ); + return aPixBounds.Contains( aPixPoint ); } uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAtPoint( @@ -324,7 +324,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAt } Point aPixPoint( aPoint.X, aPoint.Y ); // px rel to window - if( mpChildWin->GetWindowExtentsRelative( pWin ).IsInside( aPixPoint ) ) + if( mpChildWin->GetWindowExtentsRelative( pWin ).Contains( aPixPoint ) ) return mpChildWin->GetAccessible(); } diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 7b0ff2693e69..684953c6df6f 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -226,7 +226,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea, if( !aLogBounds.IsEmpty() ) { tools::Rectangle aPixBounds( rAccMap.CoreToPixel( aLogBounds ) ); - if( aPixBounds.IsInside( rPixPos ) ) + if( aPixBounds.Contains( rPixPos ) ) aRet = rLower; } } @@ -257,7 +257,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea, if( !aLogBounds.IsEmpty() ) { tools::Rectangle aPixBounds( rAccMap.CoreToPixel( aLogBounds ) ); - if( aPixBounds.IsInside( rPixPos ) ) + if( aPixBounds.Contains( rPixPos ) ) aRet = rLower; } } diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx index c3ebd59d40ec..6f2dff0ae555 100644 --- a/sw/source/core/access/accframe.hxx +++ b/sw/source/core/access/accframe.hxx @@ -143,7 +143,7 @@ protected: inline bool SwAccessibleFrame::IsShowing( const SwRect& rFrame ) const { - return !rFrame.IsEmpty() && rFrame.IsOver( maVisArea ); + return !rFrame.IsEmpty() && rFrame.Overlaps( maVisArea ); } inline bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap ) const diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx index f088ff8fd419..5da8dad1ad2b 100644 --- a/sw/source/core/access/accfrmobjmap.cxx +++ b/sw/source/core/access/accfrmobjmap.cxx @@ -46,7 +46,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, { if ( !bVisibleChildrenOnly || aLower.AlwaysIncludeAsChild() || - aLower.GetBox( rAccMap ).IsOver( rVisArea ) ) + aLower.GetBox( rAccMap ).Overlaps( rVisArea ) ) { insert( nPos++, SwAccessibleChildMapKey::TEXT, aLower ); } @@ -65,7 +65,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, for(const SwAnchoredObject* pObj : *pObjs) { aLower = pObj->GetDrawObj(); - if ( aLower.GetBox( rAccMap ).IsOver( rVisArea ) ) + if ( aLower.GetBox( rAccMap ).Overlaps( rVisArea ) ) { insert( aLower.GetDrawObject(), aLower ); } @@ -83,7 +83,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, if ( aLower.IsBoundAsChar() && ( !bVisibleChildrenOnly || aLower.AlwaysIncludeAsChild() || - aLower.GetBox( rAccMap ).IsOver( rVisArea ) ) ) + aLower.GetBox( rAccMap ).Overlaps( rVisArea ) ) ) { insert( aLower.GetDrawObject(), aLower ); } diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx index 7eca43a7b873..c62987798ccc 100644 --- a/sw/source/core/access/accfrmobjslist.cxx +++ b/sw/source/core/access/accfrmobjslist.cxx @@ -78,7 +78,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator( // Find the first visible while( m_aCurr.IsValid() && !m_aCurr.AlwaysIncludeAsChild() && - !m_aCurr.GetBox( rAccMap ).IsOver( m_rList.GetVisArea() ) ) + !m_aCurr.GetBox( rAccMap ).Overlaps( m_rList.GetVisArea() ) ) { next(); } @@ -147,7 +147,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne next(); while( m_aCurr.IsValid() && !m_aCurr.AlwaysIncludeAsChild() && - !m_aCurr.GetBox( m_rList.GetAccMap() ).IsOver( m_rList.GetVisArea() ) ) + !m_aCurr.GetBox( m_rList.GetAccMap() ).Overlaps( m_rList.GetVisArea() ) ) { next(); } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 04fd9f659f91..c1c4eebcfb2e 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -818,7 +818,7 @@ struct ContainsPredicate explicit ContainsPredicate( const Point& rPoint ) : mrPoint(rPoint) {} bool operator() ( const tools::Rectangle& rRect ) const { - return rRect.IsInside( mrPoint ); + return rRect.Contains( mrPoint ); } }; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 1c3f64e1f6dd..9aed81d4759e 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2117,7 +2117,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) aPoint.setX(aPoint.getX() + aPixPos.getX()); aPoint.setY(aPoint.getY() + aPixPos.getY()); Point aCorePoint( GetMap()->PixelToCore( aPoint ) ); - if( !aLogBounds.IsInside( aCorePoint ) ) + if( !aLogBounds.Contains( aCorePoint ) ) { // #i12332# rPoint is may also be in rectangle returned by // getCharacterBounds(getCharacterCount() diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index da48a7aadc12..49a0520cf499 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -231,7 +231,7 @@ void SwAccessibleTableData_Impl::GetSelection( const SwFrame *pLower = rLower.GetSwFrame(); OSL_ENSURE( pLower, "child should be a frame" ); const SwRect& rBox = rLower.GetBox( mrAccMap ); - if( pLower && rBox.IsOver( rArea ) ) + if( pLower && rBox.Overlaps( rArea ) ) { if( rLower.IsAccessible( mbIsInPagePreview ) ) { diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index 62984819175a..8f94cef23727 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -56,7 +56,7 @@ SwRect& SwRect::Union( const SwRect& rRect ) SwRect& SwRect::Intersection( const SwRect& rRect ) { // any similarity between me and given element? - if ( IsOver( rRect ) ) + if ( Overlaps( rRect ) ) { // get smaller right and lower, and greater left and upper edge if ( Left() < rRect.Left() ) @@ -90,7 +90,7 @@ SwRect& SwRect::Intersection_( const SwRect& rOther ) return *this; } -bool SwRect::IsInside( const SwRect& rRect ) const +bool SwRect::Contains( const SwRect& rRect ) const { const tools::Long nRight = Right(); const tools::Long nBottom = Bottom(); @@ -102,7 +102,7 @@ bool SwRect::IsInside( const SwRect& rRect ) const (Top() <= nrBottom) && (nrBottom <= nBottom); } -bool SwRect::IsInside( const Point& rPoint ) const +bool SwRect::Contains( const Point& rPoint ) const { return (Left() <= rPoint.X()) && (Top() <= rPoint.Y()) && @@ -117,10 +117,10 @@ bool SwRect::IsNear( const Point& rPoint, tools::Long nTolerance ) const ((Top() - nTolerance) <= rPoint.Y()) && ((Right() + nTolerance) >= rPoint.X()) && ((Bottom() + nTolerance) >= rPoint.Y())); - return IsInside(rPoint) || bIsNearby; + return Contains(rPoint) || bIsNearby; } -bool SwRect::IsOver( const SwRect& rRect ) const +bool SwRect::Overlaps( const SwRect& rRect ) const { return (Top() <= rRect.Bottom()) && (Left() <= rRect.Right()) && diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx index a2e3c405707d..21e645500fa0 100644 --- a/sw/source/core/bastyp/swregion.cxx +++ b/sw/source/core/bastyp/swregion.cxx @@ -66,7 +66,7 @@ void SwRegionRects::operator-=( const SwRect &rRect ) sal_uInt16 nMax = size(); for ( sal_uInt16 i = 0; i < nMax; ++i ) { - if ( rRect.IsOver( (*this)[i] ) ) + if ( rRect.Overlaps( (*this)[i] ) ) { SwRect aTmp( (*this)[i] ); SwRect aInter( aTmp ); @@ -175,11 +175,11 @@ void SwRegionRects::Compress() { // If one rectangle contains a second completely than the latter // does not need to be stored and can be deleted - if ( (*this)[i].IsInside( (*this)[j] ) ) + if ( (*this)[i].Contains( (*this)[j] ) ) { erase( begin() + j ); } - else if ( (*this)[j].IsInside( (*this)[i] ) ) + else if ( (*this)[j].Contains( (*this)[i] ) ) { (*this)[i] = (*this)[j]; erase( begin() + j ); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 2d86a96d9a6d..916e1aa6f980 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -818,7 +818,7 @@ int SwCursorShell::SetCursor( const Point &rLPt, bool bOnlyText, bool bBlock ) { if( pFrame ) { - if( pFrame->getFrameArea().IsInside( rCurrentCursorPt )) + if( pFrame->getFrameArea().Contains( rCurrentCursorPt )) return bRet; } else if( aPos.nNode.GetNode().IsContentNode() ) @@ -839,7 +839,7 @@ int SwCursorShell::SetCursor( const Point &rLPt, bool bOnlyText, bool bBlock ) { // SSelection over not allowed sections or if in header/footer -> different if( !CheckNodesRange( aPos.nNode, pCursor->GetMark()->nNode, true ) - || ( pFrame && !pFrame->getFrameArea().IsInside( pCursor->GetMkPos() ) )) + || ( pFrame && !pFrame->getFrameArea().Contains( pCursor->GetMkPos() ) )) return bRet; // is at same position but not in header/footer @@ -996,7 +996,7 @@ bool SwCursorShell::TestCurrPam( // check if the SPoint is in a table selection if( m_pTableCursor ) - return m_pTableCursor->IsInside( rPt ); + return m_pTableCursor->Contains( rPt ); SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed // search position <rPt> in document @@ -1418,7 +1418,7 @@ void SwCursorShell::Paint(vcl::RenderContext& rRenderContext, const tools::Recta bool bVis = false; // if a cursor is visible then hide the SV cursor - if( m_pVisibleCursor->IsVisible() && !aRect.IsOver( m_aCharRect ) ) + if( m_pVisibleCursor->IsVisible() && !aRect.Overlaps( m_aCharRect ) ) { bVis = true; m_pVisibleCursor->Hide(); diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 4ba5d741a68a..87ab068e6ded 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1721,7 +1721,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, if( aTmpState.m_bPosCorr ) { - if( pF && !pF->getFrameArea().IsInside( aPt )) + if( pF && !pF->getFrameArea().Contains( aPt )) pF = nullptr; } else if( !pF ) diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx index c93faffff95b..45dcb5415afa 100644 --- a/sw/source/core/crsr/trvlfnfl.cxx +++ b/sw/source/core/crsr/trvlfnfl.cxx @@ -357,7 +357,7 @@ void SwCursorShell::GotoFlyAnchor() // jump in BodyFrame closest to FlyFrame SwRect aTmpRect( m_aCharRect ); - if( !pFrame->getFrameArea().IsInside( aTmpRect )) + if( !pFrame->getFrameArea().Contains( aTmpRect )) aTmpRect = pFrame->getFrameArea(); Point aPt( aTmpRect.Left(), aTmpRect.Top() + ( aTmpRect.Bottom() - aTmpRect.Top() ) / 2 ); diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 7d8064719228..c430c228def5 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -94,7 +94,7 @@ void SwVisibleCursor::Show() m_bIsVisible = true; // display at all? - if( m_pCursorShell->VisArea().IsOver( m_pCursorShell->m_aCharRect ) || comphelper::LibreOfficeKit::isActive() ) + if( m_pCursorShell->VisArea().Overlaps( m_pCursorShell->m_aCharRect ) || comphelper::LibreOfficeKit::isActive() ) SetPosAndShow(nullptr); } } @@ -872,7 +872,7 @@ void SwShellTableCursor::FillRects() while ( pFrame ) { - if( aReg.GetOrigin().IsOver( pFrame->getFrameArea() ) ) + if( aReg.GetOrigin().Overlaps( pFrame->getFrameArea() ) ) { aReg -= pFrame->getFrameArea(); if (bStart) @@ -899,7 +899,7 @@ void SwShellTableCursor::FillStartEnd(SwRect& rStart, SwRect& rEnd) const } // Check if the SPoint is within the Table-SSelection. -bool SwShellTableCursor::IsInside( const Point& rPt ) const +bool SwShellTableCursor::Contains( const Point& rPt ) const { // Calculate the new rectangles. If the cursor is still "parked" do nothing if (m_SelectedBoxes.empty() || m_bParked || !GetPoint()->nNode.GetIndex()) @@ -918,12 +918,12 @@ bool SwShellTableCursor::IsInside( const Point& rPt ) const while( pFrame && !pFrame->IsCellFrame() ) pFrame = pFrame->GetUpper(); OSL_ENSURE( pFrame, "Node not in a table" ); - if( pFrame && pFrame->getFrameArea().IsInside( rPt ) ) + if( pFrame && pFrame->getFrameArea().Contains( rPt ) ) return true; for ( SwCellFrame* pCellFrame = static_cast<SwCellFrame*>(pFrame); pCellFrame; pCellFrame = pCellFrame->GetFollowCell() ) { - if( pCellFrame->getFrameArea().IsInside( rPt ) ) + if( pCellFrame->getFrameArea().Contains( rPt ) ) return true; } } diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index d8fe293c7f0a..f8b0a15e942a 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -853,7 +853,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, case RndStdIds::FLY_AT_PAGE: { pNewAnchorFrame = getIDocumentLayoutAccess().GetCurrentLayout()->Lower(); - while ( pNewAnchorFrame && !pNewAnchorFrame->getFrameArea().IsInside( aPt ) ) + while ( pNewAnchorFrame && !pNewAnchorFrame->getFrameArea().Contains( aPt ) ) pNewAnchorFrame = pNewAnchorFrame->GetNext(); if ( !pNewAnchorFrame ) continue; @@ -889,7 +889,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, SwTextFrame const*const pFrame( static_cast<SwTextFrame const*>(pNewAnchorFrame)); SwPosition aPos( *pFrame->GetTextNodeForParaProps() ); - if ( pNewAnchorFrame->getFrameArea().IsInside( aPoint ) ) + if ( pNewAnchorFrame->getFrameArea().Contains( aPoint ) ) { // We need to find a TextNode, because only there we can anchor a // content-bound DrawObject. diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index a934cee0e13a..4cd8c10ec25a 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -298,7 +298,7 @@ void SwNoTextFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons SwRect aNormal( getFrameArea().Pos() + getFramePrintArea().Pos(), getFramePrintArea().SSize() ); aNormal.Justify(); // Normalized rectangle for the comparisons - if( aPaintArea.IsOver( aNormal ) ) + if( aPaintArea.Overlaps( aNormal ) ) { // Calculate the four to-be-deleted rectangles if( pSh->GetWin() ) @@ -679,7 +679,7 @@ bool SwNoTextFrame::GetCharRect( SwRect &rRect, const SwPosition& rPos, rRect.Justify(); // Is the Bitmap in the visible area at all? - if( !aFrameRect.IsOver( rRect ) ) + if( !aFrameRect.Overlaps( rRect ) ) { // If not, then the Cursor is on the Frame rRect = aFrameRect; diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index c36e7e3b3f6e..9922a5d97338 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -598,7 +598,7 @@ static void lcl_CollectCells( std::vector<SwCellFrame*> &rArr, const SwRect &rUn while ( !pCell->IsCellFrame() ) pCell = pCell->GetUpper(); OSL_ENSURE( pCell, "Frame is not a Cell" ); - if ( rUnion.IsOver( pCell->getFrameArea() ) ) + if ( rUnion.Overlaps( pCell->getFrameArea() ) ) ::InsertCell( rArr, static_cast<SwCellFrame*>(pCell) ); // Make sure the Cell is left (Areas) diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 1e34abfa4b5f..7d7ff10ed73d 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -405,7 +405,7 @@ bool SwNode::IsInVisibleArea( SwViewShell const * pSh ) const while ( pFrame && !pFrame->isFrameAreaDefinitionValid() ); } - if( !pFrame || pSh->VisArea().IsOver( pFrame->getFrameArea() ) ) + if( !pFrame || pSh->VisArea().Overlaps( pFrame->getFrameArea() ) ) bRet = true; } } diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index d37a65b83482..428c567662ea 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -1269,14 +1269,14 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons else aRect = m_pFlyFrame->getFrameArea(); - if( aRect.IsInside( rRec.aPos ) ) + if( aRect.Contains( rRec.aPos ) ) { aRect.Pos().setX(aRect.Pos().getX() + rRec.nTol); aRect.Pos().setY(aRect.Pos().getY() + rRec.nTol); aRect.AddHeight( -(2 * rRec.nTol) ); aRect.AddWidth( -(2 * rRec.nTol) ); - if( aRect.IsInside( rRec.aPos ) ) + if( aRect.Contains( rRec.aPos ) ) { if( !rURL.GetMap() || m_pFlyFrame->GetFormat()->GetIMapObject( rRec.aPos, m_pFlyFrame )) diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 13e08682b23e..bd62ee33e4be 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -123,7 +123,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList( const SwRect aRect( *pRect ); const SwFrame *pPg = pSh->GetLayout()->Lower(); do - { if ( pPg->getFrameArea().IsOver( aRect ) ) + { if ( pPg->getFrameArea().Overlaps( aRect ) ) ::InsertGridFrame( const_cast<SwDPage*>(this)->m_pGridLst.get(), pPg ); pPg = pPg->GetNext(); } while ( pPg ); @@ -136,7 +136,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList( do { ::InsertGridFrame( const_cast<SwDPage*>(this)->m_pGridLst.get(), pPg ); pPg = pPg->GetNext(); - } while ( pPg && pPg->getFrameArea().IsOver( pSh->VisArea() ) ); + } while ( pPg && pPg->getFrameArea().Overlaps( pSh->VisArea() ) ); } } return m_pGridLst.get(); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 6e3792eb9f29..b5fcb696ec24 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -223,7 +223,7 @@ void SwFEShell::Copy( SwDoc& rClpDoc, const OUString* pNewClpText ) static const Point &lcl_FindBasePos( const SwFrame *pFrame, const Point &rPt ) { const SwFrame *pF = pFrame; - while ( pF && !pF->getFrameArea().IsInside( rPt ) ) + while ( pF && !pF->getFrameArea().Contains( rPt ) ) { if ( pF->IsContentFrame() ) pF = static_cast<const SwContentFrame*>(pF)->GetFollow(); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index c55324d48150..81b8becdc24a 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -879,14 +879,14 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst ) SwRect aTmpCalcPnt( pAct->getFramePrintArea() ); aTmpCalcPnt += pAct->getFrameArea().Pos(); - if ( aRect.IsOver( aTmpCalcPnt ) ) + if ( aRect.Overlaps( aTmpCalcPnt ) ) { SwContentFrame *pCnt = pAct->ContainsContent(); while ( pCnt ) { aTmpCalcPnt = pCnt->getFramePrintArea(); aTmpCalcPnt += pCnt->getFrameArea().Pos(); - if ( aRect.IsOver( aTmpCalcPnt ) ) + if ( aRect.Overlaps( aTmpCalcPnt ) ) static_cast<SwFrame*>(pCnt)->Prepare( PrepareHint::FlyFrameAttributesChanged ); pCnt = pCnt->GetNextContentFrame(); } @@ -1448,7 +1448,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) const SwContentFrame* pContentFrame( pPageFrame->ContainsContent() ); while ( pContentFrame ) { - if ( pContentFrame->UnionFrame().IsInside( rPt ) ) + if ( pContentFrame->UnionFrame().Contains( rPt ) ) { const SwTextFrame* pTextFrame = pContentFrame->DynCastTextFrame(); if ( pTextFrame ) @@ -1461,7 +1461,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) if (pTextFrame->GetCharRect(aCursorCharRect, aPos)) { - if ( aCursorCharRect.IsOver( SwRect( pObj->GetLastBoundRect() ) ) ) + if ( aCursorCharRect.Overlaps( SwRect( pObj->GetLastBoundRect() ) ) ) { bRet = false; } @@ -1500,7 +1500,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) SdrObject *pCandidate = pPage->GetObj(a); SwVirtFlyDrawObj* pDrawObj = dynamic_cast<SwVirtFlyDrawObj*>(pCandidate); - if (pDrawObj && pDrawObj->GetCurrentBoundRect().IsInside(rPt)) + if (pDrawObj && pDrawObj->GetCurrentBoundRect().Contains(rPt)) { bRet = false; } @@ -1915,7 +1915,7 @@ bool SwFEShell::ImpEndCreate() aRect.AdjustRight(constTwips_1cm); aRect.AdjustBottom(constTwips_1cm); - if( !aRect.IsOver( rBound ) && !::GetHtmlMode( GetDoc()->GetDocShell() )) + if( !aRect.Overlaps( rBound ) && !::GetHtmlMode( GetDoc()->GetDocShell() )) bCharBound = false; // anchor in header/footer also not allowed. @@ -1971,7 +1971,7 @@ bool SwFEShell::ImpEndCreate() SwRect aBound( rBound ); while( pTmp ) { - if( pTmp->getFrameArea().IsInside( aBound ) ) + if( pTmp->getFrameArea().Contains( aBound ) ) { if( !bBodyOnly || !pTmp->FindFooterOrHeader() ) pPage = pTmpFrame; @@ -2816,7 +2816,7 @@ void SwFEShell::CheckUnboundObjects() const Point aPt( rBound.TopLeft() ); const SwFrame *pPage = GetLayout()->Lower(); const SwFrame *pLast = pPage; - while ( pPage && !pPage->getFrameArea().IsInside( aPt ) ) + while ( pPage && !pPage->getFrameArea().Contains( aPt ) ) { if ( aPt.Y() > pPage->getFrameArea().Bottom() ) pLast = pPage; @@ -3325,7 +3325,7 @@ Point SwFEShell::GetRelativePagePosition(const Point& rDocPos) { Point aRet(-1, -1); const SwFrame *pPage = GetLayout()->Lower(); - while ( pPage && !pPage->getFrameArea().IsInside( rDocPos ) ) + while ( pPage && !pPage->getFrameArea().Contains( rDocPos ) ) { pPage = pPage->GetNext(); } diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 11103b98cfbf..352ba86f587c 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1503,7 +1503,7 @@ static const SwCellFrame *lcl_FindFrame( const SwLayoutFrame *pLay, const Point SwRect aPrevRect = pPrev->getFramePrintArea(); aPrevRect.Pos() += pPrev->getFrameArea().Pos(); - if( aPrevRect.IsInside( rPt ) ) + if( aPrevRect.Contains( rPt ) ) { bCloseToCol = false; } diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index ae04ee30efb7..9cda400c1c80 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -185,7 +185,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt, sal_uInt16 SwFEShell::GetPageNumber( const Point &rPoint ) const { const SwFrame *pPage = GetLayout()->Lower(); - while ( pPage && !pPage->getFrameArea().IsInside( rPoint ) ) + while ( pPage && !pPage->getFrameArea().Contains( rPoint ) ) pPage = pPage->GetNext(); if ( pPage ) return static_cast<const SwPageFrame*>(pPage)->GetPhyPageNum(); diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index e5aae5f1a945..6a99841d1bdd 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -301,7 +301,7 @@ void GetTableSel( const SwLayoutFrame* pStart, const SwLayoutFrame* pEnd, break; } - if ( pRow->getFrameArea().IsOver( pUnion->GetUnion() ) ) + if ( pRow->getFrameArea().Overlaps( pUnion->GetUnion() ) ) { const SwLayoutFrame *pCell = pRow->FirstCell(); @@ -515,7 +515,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) break; } - if( pRow->getFrameArea().IsOver( pUnion->GetUnion() ) ) + if( pRow->getFrameArea().Overlaps( pUnion->GetUnion() ) ) { const SwLayoutFrame *pCell = pRow->FirstCell(); @@ -728,7 +728,7 @@ bool GetAutoSumSel( const SwCursorShell& rShell, SwCellFrames& rBoxes ) while( pRow ) { - if( pRow->getFrameArea().IsOver( pUnion->GetUnion() ) ) + if( pRow->getFrameArea().Overlaps( pUnion->GetUnion() ) ) { const SwCellFrame* pUpperCell = nullptr; const SwLayoutFrame *pCell = pRow->FirstCell(); @@ -799,7 +799,7 @@ bool GetAutoSumSel( const SwCursorShell& rShell, SwCellFrames& rBoxes ) while( pRow ) { - if( pRow->getFrameArea().IsOver( pUnion->GetUnion() ) ) + if( pRow->getFrameArea().Overlaps( pUnion->GetUnion() ) ) { const SwLayoutFrame *pCell = pRow->FirstCell(); @@ -979,7 +979,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, while ( pRow ) { - if ( pRow->getFrameArea().IsOver( rUnion ) ) + if ( pRow->getFrameArea().Overlaps( rUnion ) ) { const SwLayoutFrame *pCell = pRow->FirstCell(); @@ -1896,7 +1896,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrame *pStart, pTable->GetFirstNonHeadlineRow() : static_cast<const SwLayoutFrame*>(pTable->Lower()); - while ( pRow && !pRow->getFrameArea().IsOver( aUnion ) ) + while ( pRow && !pRow->getFrameArea().Overlaps( aUnion ) ) pRow = static_cast<const SwLayoutFrame*>(pRow->GetNext()); // #i31976# @@ -2016,7 +2016,7 @@ bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv, while ( pRow ) { - if ( pRow->getFrameArea().IsOver( rSelUnion.GetUnion() ) ) + if ( pRow->getFrameArea().Overlaps( rSelUnion.GetUnion() ) ) { const SwLayoutFrame *pCell = pRow->FirstCell(); diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index a2e182870f55..23c1e2f17906 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -801,7 +801,7 @@ bool SwAnchoredObject::OverlapsPrevColumn() const aChkRect.Union( pTmpColFrame->getFrameArea() ); pTmpColFrame = pTmpColFrame->GetPrev(); } - bOverlapsPrevColumn = GetObjRect().IsOver( aChkRect ); + bOverlapsPrevColumn = GetObjRect().Overlaps( aChkRect ); } } diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 48088fdb2d1c..e90ee98c1fdf 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -585,7 +585,7 @@ const SwPageFrame* SwRootFrame::GetPageAtPos( const Point& rPt, const Size* pSiz if ( !bExtend ) { - if( !getFrameArea().IsInside( rPt ) ) + if( !getFrameArea().Contains( rPt ) ) return nullptr; // skip pages above point: @@ -600,8 +600,8 @@ const SwPageFrame* SwRootFrame::GetPageAtPos( const Point& rPt, const Size* pSiz { const SwRect& rBoundRect = bExtend ? maPageRects[ nPageIdx++ ] : pPage->getFrameArea(); - if ( (!pSize && rBoundRect.IsInside(rPt)) || - (pSize && rBoundRect.IsOver(aRect)) ) + if ( (!pSize && rBoundRect.Contains(rPt)) || + (pSize && rBoundRect.Overlaps(aRect)) ) { pRet = static_cast<const SwPageFrame*>(pPage); } @@ -614,7 +614,7 @@ const SwPageFrame* SwRootFrame::GetPageAtPos( const Point& rPt, const Size* pSiz bool SwRootFrame::IsBetweenPages(const Point& rPt) const { - if (!getFrameArea().IsInside(rPt)) + if (!getFrameArea().Contains(rPt)) return false; // top visible page @@ -631,7 +631,7 @@ bool SwRootFrame::IsBetweenPages(const Point& rPt) const rPt.X() <= pPage->getFrameArea().Right()) { // Trivial case when we're right in between. - if (!pPage->getFrameArea().IsInside(rPt)) + if (!pPage->getFrameArea().Contains(rPt)) return true; // In normal mode the gap is large enough and diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index a86c35d9bbd1..1ffbbeed764e 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -370,7 +370,7 @@ sal_uInt8 SwFlowFrame::BwdMoveNecessary( const SwPageFrame *pPage, const SwRect SwAnchoredObject* pObj = rObjs[i]; const SwFrameFormat& rFormat = pObj->GetFrameFormat(); const SwRect aRect( pObj->GetObjRect() ); - if ( aRect.IsOver( rRect ) && + if ( aRect.Overlaps( rRect ) && rFormat.GetSurround().GetSurround() != css::text::WrapTextMode_THROUGH ) { if( m_rThis.IsLayoutFrame() && //Fly Lower of This? diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 9f3bf54debb0..b90469066c70 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -600,7 +600,7 @@ static const SwFrame * lcl_CalcDownDist( SwDistance &rRet, rRet.m_nSub = 0; //If the point stays inside the Cnt everything is clear already; the Content //automatically has a distance of 0. - if ( pCnt->getFrameArea().IsInside( rPt ) ) + if ( pCnt->getFrameArea().Contains( rPt ) ) { rRet.m_nMain = 0; return pCnt; @@ -619,7 +619,7 @@ static const SwFrame * lcl_CalcDownDist( SwDistance &rRet, // #i70582# // --> OD 2009-03-05 - adopted for Support for Classical Mongolian Script const SwTwips nTopForObjPos = lcl_GetTopForObjPos(pCnt, bVert, bVertL2R); - if ( pUp->getFrameArea().IsInside( rPt ) ) + if ( pUp->getFrameArea().Contains( rPt ) ) { // <rPt> point is inside environment of given content frame // #i70582# @@ -760,7 +760,7 @@ static const SwFrame * lcl_CalcDownDist( SwDistance &rRet, } bSct = nullptr != pSect; } - while ( pLay && !pLay->getFrameArea().IsInside( rPt ) && + while ( pLay && !pLay->getFrameArea().Contains( rPt ) && ( pLay->getFrameArea().Top() <= rPt.Y() || pLay->IsInFly() || ( pLay->IsInSct() && pLay->FindSctFrame()->GetUpper()->getFrameArea().Top() <= rPt.Y())) ) @@ -867,7 +867,7 @@ static const SwFrame * lcl_CalcDownDist( SwDistance &rRet, } if ( pLay ) { - if ( pLay->getFrameArea().IsInside( rPt ) ) + if ( pLay->getFrameArea().Contains( rPt ) ) { SwTwips nDiff = pLay->IsVertical() ? ( pLay->IsVertLR() ? ( rPt.X() - nFrameTop ) : ( nFrameTop - rPt.X() ) ) : ( rPt.Y() - nFrameTop ); @@ -1093,7 +1093,7 @@ const SwContentFrame *FindAnchor( const SwFrame *pOldAnch, const Point &rNew, ::lcl_PointToPrt( aNew, pPage ); } - if ( pCnt->IsInDocBody() == bBody && pCnt->getFrameArea().IsInside( aNew ) ) + if ( pCnt->IsInDocBody() == bBody && pCnt->getFrameArea().Contains( aNew ) ) return pCnt; else if ( pOldAnch->IsInDocBody() || pOldAnch->IsPageFrame() ) { @@ -1102,7 +1102,7 @@ const SwContentFrame *FindAnchor( const SwFrame *pOldAnch, const Point &rNew, Point aTmp( aNew ); const SwContentFrame *pTmp = pCnt->FindPageFrame()-> GetContentPos( aTmp, false, true ); - if ( pTmp && pTmp->getFrameArea().IsInside( aNew ) ) + if ( pTmp && pTmp->getFrameArea().Contains( aNew ) ) return pTmp; } @@ -1251,7 +1251,7 @@ void SwFlyAtContentFrame::SetAbsPos( const Point &rNew ) //!!!!!We can optimize here: FindAnchor could also return RelPos! const SwFrame *pFrame = nullptr; SwTwips nY; - if ( pCnt->getFrameArea().IsInside( aNew ) ) + if ( pCnt->getFrameArea().Contains( aNew ) ) { // #i70582# if ( bVert ) diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index b39fdd3452ec..44083e8a5001 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -1304,7 +1304,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) else { if( ( pUp->GetType() & (SwFrameType::Fly | SwFrameType::Ftn ) ) && - !pUp->getFrameArea().IsInside( pFly->getFrameArea().Pos() ) ) + !pUp->getFrameArea().Contains( pFly->getFrameArea().Pos() ) ) { if( pUp->IsFlyFrame() ) { @@ -1312,7 +1312,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) while( pTmpFly->GetNextLink() ) { pTmpFly = pTmpFly->GetNextLink(); - if( pTmpFly->getFrameArea().IsInside( pFly->getFrameArea().Pos() ) ) + if( pTmpFly->getFrameArea().Contains( pFly->getFrameArea().Pos() ) ) break; } pUp = pTmpFly; @@ -1323,7 +1323,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) while( pTmp->GetFollow() ) { pTmp = pTmp->GetFollow(); - if( pTmp->getFrameArea().IsInside( pFly->getFrameArea().Pos() ) ) + if( pTmp->getFrameArea().Contains( pFly->getFrameArea().Pos() ) ) break; } pUp = pTmp; diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 2a0b52b8f219..549e88f20e14 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3294,7 +3294,7 @@ static void lcl_CheckFlowBack( SwFrame* pFrame, const SwRect &rRect ) { if( pFrame->IsLayoutFrame() ) { - if( rRect.IsOver( pFrame->getFrameArea() ) ) + if( rRect.Overlaps( pFrame->getFrameArea() ) ) lcl_CheckFlowBack( static_cast<SwLayoutFrame*>(pFrame)->Lower(), rRect ); } else if( !pFrame->GetNext() && nBottom > pFrame->getFrameArea().Bottom() ) @@ -3320,12 +3320,12 @@ static void lcl_NotifyContent( const SdrObject *pThis, SwContentFrame *pCnt, { // #i35640# - use given rectangle <rRect> instead // of current bound rectangle - if ( aCntPrt.IsOver( rRect ) ) + if ( aCntPrt.Overlaps( rRect ) ) pCnt->Prepare( PrepareHint::FlyFrameAttributesChanged ); } // #i23129# - only invalidate, if the text frame // printing area overlaps with the given rectangle. - else if ( aCntPrt.IsOver( rRect ) ) + else if ( aCntPrt.Overlaps( rRect ) ) pCnt->Prepare( eHint, static_cast<void*>(&aCntPrt.Intersection_( rRect )) ); if ( !pCnt->GetDrawObjs() ) return; @@ -3434,8 +3434,8 @@ void Notify_Background( const SdrObject* pObj, // instead of <GetCurrentBoundRect()>, because a recalculation // of the bounding rectangle isn't intended here. if (!isValidTableBeforeAnchor - && (pTab->getFrameArea().IsOver(SwRect(pObj->GetLastBoundRect())) || - pTab->getFrameArea().IsOver(rRect))) + && (pTab->getFrameArea().Overlaps(SwRect(pObj->GetLastBoundRect())) || + pTab->getFrameArea().Overlaps(rRect))) { if ( !pFlyFrame || !pFlyFrame->IsLowerOf( pTab ) ) pTab->InvalidatePrt(); @@ -3446,8 +3446,8 @@ void Notify_Background( const SdrObject* pObj, // instead of <GetCurrentBoundRect()>, because a recalculation // of the bounding rectangle isn't intended here. if (!isValidTableBeforeAnchor && pCell->IsCellFrame() && - ( pCell->getFrameArea().IsOver( SwRect(pObj->GetLastBoundRect()) ) || - pCell->getFrameArea().IsOver( rRect ) ) ) + ( pCell->getFrameArea().Overlaps( SwRect(pObj->GetLastBoundRect()) ) || + pCell->getFrameArea().Overlaps( rRect ) ) ) { const SwFormatVertOrient &rOri = pCell->GetFormat()->GetVertOrient(); if ( text::VertOrientation::NONE != rOri.GetVertOrient() ) @@ -3531,14 +3531,14 @@ const SwFrame* GetVirtualUpper( const SwFrame* pFrame, const Point& rPos ) if( pFrame->IsTextFrame() ) { pFrame = pFrame->GetUpper(); - if( !pFrame->getFrameArea().IsInside( rPos ) ) + if( !pFrame->getFrameArea().Contains( rPos ) ) { if( pFrame->IsFootnoteFrame() ) { const SwFootnoteFrame* pTmp = static_cast<const SwFootnoteFrame*>(pFrame)->GetFollow(); while( pTmp ) { - if( pTmp->getFrameArea().IsInside( rPos ) ) + if( pTmp->getFrameArea().Contains( rPos ) ) return pTmp; pTmp = pTmp->GetFollow(); } @@ -3548,7 +3548,7 @@ const SwFrame* GetVirtualUpper( const SwFrame* pFrame, const Point& rPos ) SwFlyFrame* pTmp = const_cast<SwFlyFrame*>(pFrame->FindFlyFrame()); while( pTmp ) { - if( pTmp->getFrameArea().IsInside( rPos ) ) + if( pTmp->getFrameArea().Contains( rPos ) ) return pTmp; pTmp = pTmp->GetNextLink(); } @@ -3689,7 +3689,7 @@ SwTwips CalcRowRstHeight( SwLayoutFrame *pRow ) const SwFrame* FindPage( const SwRect &rRect, const SwFrame *pPage ) { - if ( !rRect.IsOver( pPage->getFrameArea() ) ) + if ( !rRect.Overlaps( pPage->getFrameArea() ) ) { const SwRootFrame* pRootFrame = static_cast<const SwRootFrame*>(pPage->GetUpper()); const SwFrame* pTmpPage = pRootFrame ? pRootFrame->GetPageAtPos( rRect.TopLeft(), &rRect.SSize(), true ) : nullptr; @@ -3817,7 +3817,7 @@ SwFrame* GetFrameOfModify(SwRootFrame const*const pLayout, sw::BroadcastingModif else aCalcRect = pTmpFrame->getFrameArea(); - if (aCalcRect.IsInside(pViewPosAndCalcFrame->first)) + if (aCalcRect.Contains(pViewPosAndCalcFrame->first)) { pMinFrame = pTmpFrame; break; diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 2b689f10b52e..5205e214b735 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -120,7 +120,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwContentFrame *p SwFlyFrame *pFly = pVirtFly->GetFlyFrame(); - if ( pFly == pSelfFly || !rRect.IsOver( pFly->getFrameArea() ) ) + if ( pFly == pSelfFly || !rRect.Overlaps( pFly->getFrameArea() ) ) continue; if ( pSelfFly && pSelfFly->IsLowerOf( pFly ) ) @@ -1603,7 +1603,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) // Ugly shortcut! if ( pTab->IsLowersFormatted() && - (bPainted || !m_pImp->GetShell()->VisArea().IsOver( pTab->getFrameArea())) ) + (bPainted || !m_pImp->GetShell()->VisArea().Overlaps( pTab->getFrameArea())) ) return false; // Now, deal with the lowers @@ -2174,7 +2174,7 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) pPage = static_cast<SwPageFrame*>(pPage->GetNext()); if ( pPage && bVisAreaOnly && - !pPage->getFrameArea().IsOver( m_pImp->GetShell()->VisArea())) + !pPage->getFrameArea().Overlaps( m_pImp->GetShell()->VisArea())) break; } return false; @@ -2238,7 +2238,7 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pI ) : bool bVis = false; if ( auto pCursorShell = dynamic_cast<SwCursorShell*>( &rSh) ) { - bVis = pCursorShell->GetCharRect().IsOver(rSh.VisArea()); + bVis = pCursorShell->GetCharRect().Overlaps(rSh.VisArea()); } aBools.push_back( bVis ); } @@ -2286,7 +2286,7 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pI ) : bActions |= aTmp != rSh.VisArea(); if ( aTmp == rSh.VisArea() ) if ( auto pCursorShell = dynamic_cast< SwCursorShell*>( &rSh) ) - bActions |= aBools[nBoolIdx] != pCursorShell->GetCharRect().IsOver( rSh.VisArea() ); + bActions |= aBools[nBoolIdx] != pCursorShell->GetCharRect().Overlaps( rSh.VisArea() ); } ++nBoolIdx; diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 4d289a69e5d7..5c74da5b7a8a 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -2493,7 +2493,7 @@ bool SwPageFrame::IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rC SwViewShell* pViewShell = getRootFrame()->GetCurrShell(); const bool bHideWhitespaceMode = pViewShell->GetViewOptions()->IsHideWhitespaceMode(); - if ( aHeaderArea.IsInside( rPt ) ) + if ( aHeaderArea.Contains( rPt ) ) { if (!bHideWhitespaceMode || static_cast<const SwFrameFormat*>(GetDep())->GetHeader().IsActive()) { @@ -2506,7 +2506,7 @@ bool SwPageFrame::IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rC SwRect aFooterArea( Point( getFrameArea().Left(), nLowerLimit ), Size( getFrameArea().Width(), getFrameArea().Bottom() - nLowerLimit ) ); - if ( aFooterArea.IsInside( rPt ) && + if ( aFooterArea.Contains( rPt ) && (!bHideWhitespaceMode || static_cast<const SwFrameFormat*>(GetDep())->GetFooter().IsActive()) ) { rControl = FrameControlType::Footer; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 0e7d0a031a46..c910daa2053e 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -683,7 +683,7 @@ void SwLineRects::ConnectEdges( OutputDevice const *pOut, SwPaintProperties cons SwRect aIns( rL1 ); aIns.Bottom( pLA->Bottom() ); - if ( !rL1.IsInside( aIns ) ) + if ( !rL1.Contains( aIns ) ) continue; m_aLineRects.emplace_back(aIns, &rL1.GetColor(), SvxBorderLineStyle::SOLID, rL1.GetTab(), @@ -724,7 +724,7 @@ void SwLineRects::ConnectEdges( OutputDevice const *pOut, SwPaintProperties cons SwRect aIns( rL1 ); aIns.Right( pLA->Right() ); - if ( !rL1.IsInside( aIns ) ) + if ( !rL1.Contains( aIns ) ) continue; m_aLineRects.emplace_back(aIns, &rL1.GetColor(), SvxBorderLineStyle::SOLID, rL1.GetTab(), @@ -792,7 +792,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects, S if ( !bVerticalSubs == ( rLine.Height() > rLine.Width() ) ) //same direction? continue; - if ( aSubsRect.IsOver( rLine ) ) + if ( aSubsRect.Overlaps( rLine ) ) { if ( bVerticalSubs ) // Vertical? { @@ -1403,7 +1403,7 @@ static void lcl_SubtractFlys( const SwFrame *pFrame, const SwPageFrame *pPage, if (!pFly) continue; - if (pSelfFly == pFly || gProp.pSRetoucheFly == pFly || !rRect.IsOver(pFly->getFrameArea())) + if (pSelfFly == pFly || gProp.pSRetoucheFly == pFly || !rRect.Overlaps(pFly->getFrameArea())) continue; if (!pFly->GetFormat()->GetPrint().GetValue() && @@ -1679,7 +1679,7 @@ static void lcl_DrawGraphic( const SvxBrushItem& rBrush, vcl::RenderContext &rOu ::SwAlignRect( aAlignedGrfRect, &rSh, &rOutDev ); // Change type from <bool> to <bool>. - const bool bNotInside = !rOut.IsInside( aAlignedGrfRect ); + const bool bNotInside = !rOut.Contains( aAlignedGrfRect ); if ( bNotInside ) { rOutDev.Push( PushFlags::CLIPREGION ); @@ -1907,7 +1907,7 @@ void DrawGraphic( // E.g. this is the case for a Fly Frame without a background // brush positioned on the border of the page which inherited the background // brush from the page. - bRetouche = !rOut.IsInside( aGrf ); + bRetouche = !rOut.Contains( aGrf ); break; case GPOS_TILED: @@ -2131,7 +2131,7 @@ void DrawGraphic( rOutDev.Pop(); } - if( bDraw && aGrf.IsOver( rOut ) ) + if( bDraw && aGrf.Overlaps( rOut ) ) lcl_DrawGraphic( *pBrush, rOutDev, rSh, aGrf, rOut, bGrfNum, gProp, bGrfBackgrdAlreadyDrawn ); @@ -2544,7 +2544,7 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons } } - if (!rRect.IsOver(aRepaintRect)) + if (!rRect.Overlaps(aRepaintRect)) { continue; } @@ -3143,7 +3143,7 @@ void SwRootFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& SwPageFrame::GetBorderAndShadowBoundRect( pPage->getFrameArea(), pSh, &rRenderContext, aPaintRect, bPaintLeftShadow, bPaintRightShadow, bRightSidebar ); - if ( aRect.IsOver( aPaintRect ) ) + if ( aRect.Overlaps( aPaintRect ) ) { if ( pSh->GetWin() ) { @@ -3305,7 +3305,7 @@ void SwRootFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& bPaintLeftShadow, bPaintRightShadow, bRightSidebar ); aPaintRect.Intersection_( aRect ); - if ( aRect.IsOver( aEmptyPageRect ) ) + if ( aRect.Overlaps( aEmptyPageRect ) ) { // #i75172# if called from SwViewShell::ImplEndAction it should no longer // really be used but handled by SwViewShell::ImplEndAction already @@ -3482,10 +3482,10 @@ void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons pFrame->ResetRetouche(); } - if ( rRect.IsOver( aPaintRect ) ) + if ( rRect.Overlaps( aPaintRect ) ) { if ( bCnt && pFrame->IsCompletePaint() && - !rRect.IsInside( aPaintRect ) && Application::AnyInput( VclInputFlags::KEYBOARD ) ) + !rRect.Contains( aPaintRect ) && Application::AnyInput( VclInputFlags::KEYBOARD ) ) { //fix(8104): It may happen, that the processing wasn't complete //but some parts of the paragraph were still repainted. @@ -3894,7 +3894,7 @@ bool SwFlyFrame::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) //HACK: exception: printing of frames in tables, those can overlap //a page once in a while when dealing with oversized tables (HTML). SwPageFrame *pPage = pFly->FindPageFrame(); - if ( pPage && pPage->getFrameArea().IsOver( pFly->getFrameArea() ) ) + if ( pPage && pPage->getFrameArea().Overlaps( pFly->getFrameArea() ) ) { pAnch = pFly->AnchorFrame(); } @@ -3917,7 +3917,7 @@ bool SwFlyFrame::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) //right now. Afterwards they must not be printed if the //page over which they float position wise gets printed. const SwPageFrame *pPage = pAnch->FindPageFrame(); - if ( !pPage->getFrameArea().IsOver( SwRect(pObj->GetCurrentBoundRect()) ) ) + if ( !pPage->getFrameArea().Overlaps( SwRect(pObj->GetCurrentBoundRect()) ) ) pAnch = nullptr; } } @@ -3992,7 +3992,7 @@ void SwFlyFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& if (bInGenerateThumbnail) { const SwRect& aVisRect = pShell->VisArea(); - if (!aVisRect.IsOver(getFrameArea())) + if (!aVisRect.Overlaps(getFrameArea())) return; } } @@ -4516,7 +4516,7 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& rOutRect, for (const SwRect & rOut : aRegion) { aOut = rOut; - if ( rRect.IsOver( aOut ) && aOut.Height() > 0 && aOut.Width() > 0 ) + if ( rRect.Overlaps( aOut ) && aOut.Height() > 0 && aOut.Width() > 0 ) { aOut.Intersection_( rRect ); pOut->DrawRect( aOut.SVRect() ); @@ -4576,7 +4576,7 @@ void SwFrame::PaintBorderLine( const SwRect& rRect, const Color *pColor, const SvxBorderLineStyle nStyle ) const { - if ( !rOutRect.IsOver( rRect ) ) + if ( !rOutRect.Overlaps( rRect ) ) return; SwRect aOut( rOutRect ); @@ -5207,7 +5207,7 @@ void SwFrame::PaintSwFrameShadowAndBorder( // suspend border paint under special cases - see below. // NOTE: This is a fix for the implementation of feature #99657#. bool bDrawOnlyShadowForTransparentFrame = false; - if ( aRect.IsInside( rRect ) ) + if ( aRect.Contains( rRect ) ) { // paint shadow, if background is transparent. // Because of introduced transparent background for fly frame #99657#, @@ -5345,7 +5345,7 @@ void SwFootnoteContFrame::PaintSwFrameShadowAndBorder( //be painted. SwRect aRect( getFramePrintArea() ); aRect.Pos() += getFrameArea().Pos(); - if ( !aRect.IsInside( rRect ) ) + if ( !aRect.Contains( rRect ) ) PaintLine( rRect, pPage ); } @@ -5438,7 +5438,7 @@ void SwLayoutFrame::PaintColLines( const SwRect &rRect, const SwFormatCol &rForm { (aLineRect.*fnRect->fnSetPosX) ( (pCol->getFrameArea().*fnGetX)() - nPenHalf ); - if ( aRect.IsOver( aLineRect ) ) + if ( aRect.Overlaps( aLineRect ) ) PaintBorderLine( aRect, aLineRect , pPage, &rFormatCol.GetLineColor(), rFormatCol.GetLineStyle() ); pCol = pCol->GetNext(); @@ -6108,7 +6108,7 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin tools::Rectangle aRectBottom(aPointBottom,aSize); tools::Rectangle aRectTop(aPointTop,aSize); - if (aRectBottom.IsOver(aVisRect)) + if (aRectBottom.Overlaps(aVisRect)) { if (Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) @@ -6129,7 +6129,7 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin Point aMiddleSecond(aPointBottom + Point(pMgr->GetSidebarWidth()/3*2,_pViewShell->GetOut()->PixelToLogic(Size(0,nScrollerHeight)).Height()/2)); PaintNotesSidebarArrows(aMiddleFirst,aMiddleSecond,_pViewShell,pMgr->GetArrowColor(KEY_PAGEUP,nPageNum), pMgr->GetArrowColor(KEY_PAGEDOWN,nPageNum)); } - if (!aRectTop.IsOver(aVisRect)) + if (!aRectTop.Overlaps(aVisRect)) return; if (Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) @@ -6359,7 +6359,7 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP // bOnlyTextBackground means background that's on top of background shapes, // this includes both text and cell frames. - if ( (!bOnlyTextBackground || IsTextFrame() || IsCellFrame()) && aPaintRect.IsOver( rRect ) ) + if ( (!bOnlyTextBackground || IsTextFrame() || IsCellFrame()) && aPaintRect.Overlaps( rRect ) ) { if ( bBack || bPageFrame || !bLowerMode ) { @@ -6496,11 +6496,11 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP SfxProgress::Reschedule(); aFrameRect = pFrame->GetPaintArea(); - if ( aFrameRect.IsOver( aBorderRect ) ) + if ( aFrameRect.Overlaps( aBorderRect ) ) { SwBorderAttrAccess aAccess( SwFrame::GetCache(), pFrame ); const SwBorderAttrs &rTmpAttrs = *aAccess.Get(); - if ( ( pFrame->IsLayoutFrame() && bLowerBorder ) || aFrameRect.IsOver( aRect ) ) + if ( ( pFrame->IsLayoutFrame() && bLowerBorder ) || aFrameRect.Overlaps( aRect ) ) { pFrame->PaintSwFrameBackground( aRect, pPage, rTmpAttrs, bLowMode, bLowerBorder, bOnlyTextBackground ); @@ -6563,7 +6563,7 @@ void SwLayoutFrame::RefreshLaySubsidiary( const SwPageFrame *pPage, SwShortCut aShortCut( *pLow, rRect ); while( pLow && !aShortCut.Stop( pLow->getFrameArea() ) ) { - if ( pLow->getFrameArea().IsOver( rRect ) && pLow->getFrameArea().HasArea() ) + if ( pLow->getFrameArea().Overlaps( rRect ) && pLow->getFrameArea().HasArea() ) { if ( pLow->IsLayoutFrame() ) static_cast<const SwLayoutFrame*>(pLow)->RefreshLaySubsidiary( pPage, rRect); @@ -6576,7 +6576,7 @@ void SwLayoutFrame::RefreshLaySubsidiary( const SwPageFrame *pPage, pAnchoredObj->GetDrawObj()->GetLayer() ) ) if (auto pFly = pAnchoredObj->DynCastFlyFrame() ) { - if ( pFly->IsFlyInContentFrame() && pFly->getFrameArea().IsOver( rRect ) ) + if ( pFly->IsFlyInContentFrame() && pFly->getFrameArea().Overlaps( rRect ) ) { if ( !pFly->Lower() || !pFly->Lower()->IsNoTextFrame() || !static_cast<const SwNoTextFrame*>(pFly->Lower())->HasAnimation()) @@ -6937,7 +6937,7 @@ void SwLayoutFrame::PaintSubsidiaryLines( const SwPageFrame *pPage, ::SwAlignRect( aOriginal, gProp.pSGlobalShell, gProp.pSGlobalShell->GetOut() ); - if ( !aOriginal.IsOver( rRect ) ) + if ( !aOriginal.Overlaps( rRect ) ) return; SwRect aOut( aOriginal ); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 5771bbab6dd6..38d8c0e14305 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2812,7 +2812,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper, // fly anchored at character or at paragraph pFly->IsFlyAtContentFrame() && // fly overlaps with corresponding table rectangle - aFlyRect.IsOver( aRect ) && + aFlyRect.Overlaps( aRect ) && // fly isn't lower of table and // anchor character frame of fly isn't lower of table (pSpaceBelowBottom // not if in ShouldBwdMoved @@ -5380,7 +5380,7 @@ void SwCellFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder { SwRect aTmp( pAnchoredObj->GetObjRect() ); const SwFrame* pAnch = pAnchoredObj->GetAnchorFrame(); - if ( (bConsiderWrapOnObjPos && IsAnLower( pAnch )) || (!bConsiderWrapOnObjPos && aTmp.IsOver( aRect )) ) + if ( (bConsiderWrapOnObjPos && IsAnLower( pAnch )) || (!bConsiderWrapOnObjPos && aTmp.Overlaps( aRect )) ) { const SwFrameFormat& rAnchoredObjFrameFormat = pAnchoredObj->GetFrameFormat(); const SwFormatSurround &rSur = rAnchoredObjFrameFormat.GetSurround(); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index d8eee05dc383..bbf94d9d149a 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -96,7 +96,7 @@ namespace { // If the point is inside the rectangle, then distance is 0 // Otherwise, compute the distance to the center of the rectangle. - if ( !rRect.IsInside( rPoint ) ) + if ( !rRect.Contains( rPoint ) ) { tools::Line aLine( rPoint, rRect.Center( ) ); nDist = aLine.GetLength( ); @@ -164,7 +164,7 @@ bool SwLayoutFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoin pFrame->UnionFrame() : pFrame->GetPaintArea() ); - if ( aPaintRect.IsInside( rPoint ) && + if ( aPaintRect.Contains( rPoint ) && ( bContentCheck || pFrame->GetModelPositionForViewPoint( pPos, rPoint, pCMS ) ) ) bRet = true; else @@ -183,7 +183,7 @@ bool SwPageFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, Point aPoint( rPoint ); // check, if we have to adjust the point - if ( !getFrameArea().IsInside( aPoint ) ) + if ( !getFrameArea().Contains( aPoint ) ) { aPoint.setX( std::max( aPoint.X(), getFrameArea().Left() ) ); aPoint.setX( std::min( aPoint.X(), getFrameArea().Right() ) ); @@ -366,7 +366,7 @@ bool SwPageFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, bool SwLayoutFrame::FillSelection( SwSelectionList& rList, const SwRect& rRect ) const { - if( rRect.IsOver(GetPaintArea()) ) + if( rRect.Overlaps(GetPaintArea()) ) { const SwFrame* pFrame = Lower(); while( pFrame ) @@ -381,7 +381,7 @@ bool SwLayoutFrame::FillSelection( SwSelectionList& rList, const SwRect& rRect ) bool SwPageFrame::FillSelection( SwSelectionList& rList, const SwRect& rRect ) const { bool bRet = false; - if( rRect.IsOver(GetPaintArea()) ) + if( rRect.Overlaps(GetPaintArea()) ) { bRet = SwLayoutFrame::FillSelection( rList, rRect ); if( GetSortedObjs() ) @@ -504,7 +504,7 @@ bool SwCellFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, while ( pFrame && !bRet ) { pFrame->Calc(pRenderContext); - if ( pFrame->getFrameArea().IsInside( rPoint ) ) + if ( pFrame->getFrameArea().Contains( rPoint ) ) { bRet = pFrame->GetModelPositionForViewPoint( pPos, rPoint, pCMS ); if ( pCMS && pCMS->m_bStop ) @@ -547,7 +547,7 @@ bool SwFlyFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, //However if the Point sits inside a Fly which is completely located inside //the current one, we call GetModelPositionForViewPoint for it. Calc(pRenderContext); - bool bInside = getFrameArea().IsInside( rPoint ) && Lower(); + bool bInside = getFrameArea().Contains( rPoint ) && Lower(); bool bRet = false; //If a Frame contains a graphic, but only text was requested, it basically @@ -565,8 +565,8 @@ bool SwFlyFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, { const SwVirtFlyDrawObj* pObj = static_cast<const SwVirtFlyDrawObj*>(aIter()); const SwFlyFrame* pFly = pObj ? pObj->GetFlyFrame() : nullptr; - if ( pFly && pFly->getFrameArea().IsInside( rPoint ) && - getFrameArea().IsInside( pFly->getFrameArea() ) ) + if ( pFly && pFly->getFrameArea().Contains( rPoint ) && + getFrameArea().Contains( pFly->getFrameArea() ) ) { if (g_OszCtrl.ChkOsz(pFly)) break; @@ -586,7 +586,7 @@ bool SwFlyFrame::GetModelPositionForViewPoint( SwPosition *pPos, Point &rPoint, while ( pFrame && !bRet ) { pFrame->Calc(pRenderContext); - if ( pFrame->getFrameArea().IsInside( rPoint ) ) + if ( pFrame->getFrameArea().Contains( rPoint ) ) { bRet = pFrame->GetModelPositionForViewPoint( pPos, rPoint, pCMS ); if ( pCMS && pCMS->m_bStop ) @@ -912,11 +912,11 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart, else aInsideCnt = Point( nX, nTmpTop ); - if ( pCell && pCell->getFrameArea().IsInside( aInsideCell ) ) + if ( pCell && pCell->getFrameArea().Contains( aInsideCell ) ) { bEnd = true; //Get the right Content out of the cell. - if ( !pCnt->getFrameArea().IsInside( aInsideCnt ) ) + if ( !pCnt->getFrameArea().Contains( aInsideCnt ) ) { pCnt = pCell->ContainsContent(); if ( fnNxtPrv == lcl_GetPrvCnt ) @@ -924,7 +924,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart, pCnt = pCnt->GetNextContentFrame(); } } - else if ( pCnt->getFrameArea().IsInside( aInsideCnt ) ) + else if ( pCnt->getFrameArea().Contains( aInsideCnt ) ) bEnd = true; } } @@ -1170,7 +1170,7 @@ static const SwLayoutFrame* lcl_Inside( const SwContentFrame *pCnt, Point const return nullptr; } if( pUp->IsFootnoteContFrame() ) - return pUp->getFrameArea().IsInside( rPt ) ? pUp : nullptr; + return pUp->getFrameArea().Contains( rPt ) ? pUp : nullptr; pUp = pUp->GetUpper(); } return nullptr; @@ -1227,7 +1227,7 @@ const SwContentFrame *SwLayoutFrame::GetContentPos( Point& rPoint, if ( !pContent->IsTextFrame() || !static_cast<const SwTextFrame*>(pContent)->IsHiddenNow() ) { SwRect aContentFrame( pContent->UnionFrame() ); - if ( aContentFrame.IsInside( rPoint ) ) + if ( aContentFrame.Contains( rPoint ) ) { pActual = pContent; aPoint = rPoint; @@ -1402,7 +1402,7 @@ void SwPageFrame::GetContentPosition( const Point &rPt, SwPosition &rPos ) const while ( pContent ) { SwRect aContentFrame( pContent->UnionFrame() ); - if ( aContentFrame.IsInside( rPt ) ) + if ( aContentFrame.Contains( rPt ) ) { //This is the nearest one. pAct = pContent; @@ -1524,7 +1524,7 @@ Point SwRootFrame::GetNextPrevContentPos( const Point& rPoint, bool bNext ) cons { //Does the point lie in the current ContentFrame? SwRect aContentFrame( pCnt->UnionFrame() ); - if ( aContentFrame.IsInside( rPoint ) && !lcl_IsInRepeatedHeadline( pCnt )) + if ( aContentFrame.Contains( rPoint ) && !lcl_IsInRepeatedHeadline( pCnt )) { aRet = rPoint; break; @@ -1917,7 +1917,7 @@ bool SwRootFrame::MakeTableCursors( SwTableCursor& rTableCursor ) while ( pRow ) { - if ( pRow->getFrameArea().IsOver( rUnion.GetUnion() ) ) + if ( pRow->getFrameArea().Overlaps( rUnion.GetUnion() ) ) { const SwLayoutFrame *pCell = pRow->FirstCell(); @@ -1971,7 +1971,7 @@ bool SwRootFrame::MakeTableCursors( SwTableCursor& rTableCursor ) static void Sub( SwRegionRects& rRegion, const SwRect& rRect ) { if( rRect.Width() > 1 && rRect.Height() > 1 && - rRect.IsOver( rRegion.GetOrigin() )) + rRect.Overlaps( rRegion.GetOrigin() )) rRegion -= rRect; } @@ -2507,7 +2507,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) { SwRect aCRect( pContent->UnionFrame( true ) ); aCRect.Intersection( pContent->GetPaintArea() ); - if( aCRect.IsOver( aRegion.GetOrigin() )) + if( aCRect.Overlaps( aRegion.GetOrigin() )) { SwRect aTmp( aPrvRect ); aTmp.Union( aCRect ); diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 1a00e0b7919f..86628d906bcf 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2302,7 +2302,7 @@ SwTwips SwContentFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) if( aBound.Left() > aRect.Right() ) continue; - if( aBound.IsOver( aRect ) ) + if( aBound.Overlaps( aRect ) ) { const SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat(); if( css::text::WrapTextMode_THROUGH != rFormat.GetSurround().GetSurround() ) diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index d6d17459fc2b..a5ea2bf7e43f 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -1164,7 +1164,7 @@ void SwToContentAnchoredObjectPosition::CalcOverlap(const SwTextFrame* pAnchorFr continue; } - if (!GetAnchoredObj().GetObjRect().IsOver(pAnchoredObj->GetObjRect())) + if (!GetAnchoredObj().GetObjRect().Overlaps(pAnchoredObj->GetObjRect())) { // Found an already positioned object, but it doesn't overlap, ignore. continue; diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 26079490a2f4..024b73cdbbed 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -666,7 +666,7 @@ void SwOLENode::SetChanged() { CurrShell aCurr(&rShell); - if(rShell.VisArea().IsOver(aFrameArea) && OUTDEV_WINDOW == rShell.GetOut()->GetOutDevType()) + if(rShell.VisArea().Overlaps(aFrameArea) && OUTDEV_WINDOW == rShell.GetOut()->GetOutDevType()) { // invalidate instead of painting rShell.GetWin()->Invalidate(aFrameArea.SVRect()); diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index c81b41f35b75..0cbc2187fd37 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -816,7 +816,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType ) rInf.CalcRect( *pPor, &aPorRect ); const Point aPorCenter = aPorRect.Center(); auto aIter = std::find_if(rLinkIdMap.begin(), rLinkIdMap.end(), - [&aPorCenter](const IdMapEntry& rEntry) { return rEntry.first.IsInside(aPorCenter); }); + [&aPorCenter](const IdMapEntry& rEntry) { return rEntry.first.Contains(aPorCenter); }); if (aIter != rLinkIdMap.end()) { sal_Int32 nLinkId = (*aIter).second; diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 9ea484912cff..d2d7434b0da2 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -629,7 +629,7 @@ bool SwTextFrame::GetModelPositionForViewPoint_(SwPosition* pPos, const Point& r } } bool bChgFillData = false; - if( pFillData && FindPageFrame()->getFrameArea().IsInside( aOldPoint ) ) + if( pFillData && FindPageFrame()->getFrameArea().Contains( aOldPoint ) ) { FillCursorPos( *pFillData ); bChgFillData = true; diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 76630fc573f6..98582b931659 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -248,7 +248,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, tools::Long nAsc, tools::Long nMax, SwRect aRct( Point( aTmpPos.X(), aTmpPos.Y() - pTmpFnt->GetAscent( m_pSh, *m_pSh->GetOut() ) ), aSize ); - if( !m_aRect.IsInside( aRct ) ) + if( !m_aRect.Contains( aRct ) ) { if( aRct.Intersection( m_aRect ).IsEmpty() ) bPaint = false; @@ -280,7 +280,7 @@ void SwExtraPainter::PaintRedline( SwTwips nY, tools::Long nMax ) if( !IsClipChg() ) { SwRect aRct( aStart, aEnd ); - if( !m_aRect.IsInside( aRct ) ) + if( !m_aRect.Contains( aRct ) ) { if( aRct.Intersection( m_aRect ).IsEmpty() ) return; diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 287b32460ad6..1bcc68373890 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -1767,7 +1767,7 @@ TextFrameIndex SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, con if ( m_pFrame->IsVertical() ) m_pFrame->SwitchHorizontalToVertical( aTmpPoint ); - if( bChgNodeInner && pTmp->getFrameArea().IsInside( aTmpPoint ) && + if( bChgNodeInner && pTmp->getFrameArea().Contains( aTmpPoint ) && !( pTmp->IsProtected() ) ) { pFlyPor->GetFlyCursorOfst(aTmpPoint, *pPos, pCMS); @@ -1819,7 +1819,7 @@ bool SwTextFrame::FillSelection( SwSelectionList& rSelList, const SwRect& rRect bool bRet = false; // GetPaintArea() instead getFrameArea() for negative indents SwRect aTmpFrame( GetPaintArea() ); - if( !rRect.IsOver( aTmpFrame ) ) + if( !rRect.Overlaps( aTmpFrame ) ) return false; if( rSelList.checkContext( this ) ) { diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 99fb83aeaa23..728744276f22 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -2342,7 +2342,7 @@ bool SwTextFormatter::ChkFlyUnderflow( SwTextFormatInfo &rInf ) const // New flys from below? if( !pPos->IsFlyPortion() ) { - if( aInter.IsOver( aLine ) ) + if( aInter.Overlaps( aLine ) ) { aInter.Intersection_( aLine ); if( aInter.HasArea() ) @@ -2359,7 +2359,7 @@ bool SwTextFormatter::ChkFlyUnderflow( SwTextFormatInfo &rInf ) const else { // The fly portion is not intersected by a fly anymore - if ( ! aInter.IsOver( aLine ) ) + if ( ! aInter.Overlaps( aLine ) ) { rInf.SetLineHeight( nHeight ); rInf.SetLineNetHeight( m_pCurr->Height() ); @@ -2470,7 +2470,7 @@ void SwTextFormatter::CalcFlyWidth( SwTextFormatInfo &rInf ) aInter.Height(0); } - if( !aInter.IsOver( aLine ) ) + if( !aInter.Overlaps( aLine ) ) return; aLine.Left( rInf.X() + nLeftMar ); diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 5a62aa07d290..49ac25ac686d 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -935,7 +935,7 @@ void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) const SetId( reinterpret_cast<sal_IntPtr>( rInf.GetTextFrame() ) ); rInf.GetTextFrame()->SetAnimation(); } - if( aTmp.IsOver( rInf.GetPaintRect() ) && !bDraw ) + if( aTmp.Overlaps( rInf.GetPaintRect() ) && !bDraw ) { rInf.NoteAnimation(); const SwViewShell* pViewShell = rInf.GetVsh(); diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index de72a0ec6076..fc540731a975 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -213,7 +213,7 @@ void sw::FlyContentPortion::Paint(const SwTextPaintInfo& rInf) const rInf.GetTextFrame()->SwitchHorizontalToVertical(aRepaintRect); if(!((m_pFly->IsCompletePaint() || - m_pFly->getFrameArea().IsOver(aRepaintRect)) && + m_pFly->getFrameArea().Overlaps(aRepaintRect)) && SwFlyFrame::IsPaint(m_pFly->GetVirtDrawObj(), m_pFly->getRootFrame()->GetCurrShell()))) return; diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 92508cde9bc3..05ab2d873b86 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -181,7 +181,7 @@ SwRect SwContourCache::CalcBoundRect( const SwAnchoredObject* pAnchoredObj, static_cast<const SwFlyFrame*>(pAnchoredObj)->Lower()->IsNoTextFrame() ) ) ) { aRet = pAnchoredObj->GetObjRectWithSpaces(); - if( aRet.IsOver( rLine ) ) + if( aRet.Overlaps( rLine ) ) { if( !pContourCache ) pContourCache = new SwContourCache; @@ -428,7 +428,7 @@ bool SwTextFly::IsAnyObj( const SwRect &rRect ) const continue; // #i68520# - if( mpCurrAnchoredObj != pObj && aBound.IsOver( aRect ) ) + if( mpCurrAnchoredObj != pObj && aBound.Overlaps( aRect ) ) return true; } } @@ -496,7 +496,7 @@ void SwTextFly::DrawTextOpaque( SwDrawTextInfo &rInf ) if( pFly && mpCurrAnchoredObj != pTmpAnchoredObj ) { // #i68520# - if( aRegion.GetOrigin().IsOver( pFly->getFrameArea() ) ) + if( aRegion.GetOrigin().Overlaps( pFly->getFrameArea() ) ) { const SwFrameFormat *pFormat = pFly->GetFormat(); const SwFormatSurround &rSur = pFormat->GetSurround(); @@ -734,7 +734,7 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj, { // #i68520# const SwRect& aTmp( _pAnchoredObj->GetObjRectWithSpaces() ); - if ( !aTmp.IsOver( mpCurrAnchoredObj->GetObjRectWithSpaces() ) ) + if ( !aTmp.Overlaps( mpCurrAnchoredObj->GetObjRectWithSpaces() ) ) bEvade = false; } } @@ -1031,7 +1031,7 @@ bool SwTextFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const break; // #i68520# - if ( mpCurrAnchoredObj != pAnchoredObj && aRect.IsOver( rRect ) ) + if ( mpCurrAnchoredObj != pAnchoredObj && aRect.Overlaps( rRect ) ) { // #i68520# const SwFormat* pFormat( &(pAnchoredObj->GetFrameFormat()) ); @@ -1068,7 +1068,7 @@ bool SwTextFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const { // #i68520# SwRect aFly = AnchoredObjToRect( pAnchoredObj, rRect ); - if( aFly.IsEmpty() || !aFly.IsOver( rRect ) ) + if( aFly.IsEmpty() || !aFly.Overlaps( rRect ) ) continue; if( !bRet || ( (!m_pCurrFrame->IsRightToLeft() && @@ -1176,7 +1176,7 @@ void SwTextFly::CalcRightMargin( SwRect &rFly, aRectFnSet.GetTop(aLine) ) > 0 ) SetNextTop( 0 ); } - if( aTmp.IsOver( aLine ) && nTmpRight > nFlyRight ) + if( aTmp.Overlaps( aLine ) && nTmpRight > nFlyRight ) { nFlyRight = nTmpRight; if( css::text::WrapTextMode_RIGHT == eSurroundForTextWrap || @@ -1242,7 +1242,7 @@ void SwTextFly::CalcLeftMargin( SwRect &rFly, const SwRect aTmp( SwContourCache::CalcBoundRect (pNext, aLine, m_pCurrFrame, nFlyLeft, false) ); - if( aRectFnSet.GetLeft(aTmp) < nFlyLeft && aTmp.IsOver( aLine ) ) + if( aRectFnSet.GetLeft(aTmp) < nFlyLeft && aTmp.Overlaps( aLine ) ) { // #118796# - no '+1', because <..fnGetRight> // returns the correct value. diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 4a19062f4db6..1dac62197f13 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -879,7 +879,7 @@ struct PreviewPosInsidePagePred if ( _pPreviewPage->bVisible ) { tools::Rectangle aPreviewPageRect( _pPreviewPage->aPreviewWinPos, _pPreviewPage->aPageSize ); - return aPreviewPageRect.IsInside( mnPreviewPos ); + return aPreviewPageRect.Contains( mnPreviewPos ); } return false; } @@ -1058,7 +1058,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools: aMapMode.SetOrigin( rpPreviewPage->aMapOffset ); pOutputDev->SetMapMode( aMapMode ); tools::Rectangle aPxPaintRect = pOutputDev->LogicToPixel( aPageRect ); - if ( aPxOutRect.IsOver( aPxPaintRect) ) + if ( aPxOutRect.Overlaps( aPxPaintRect) ) { const SwPageFrame* pPage = rpPreviewPage->pPage; @@ -1182,7 +1182,7 @@ void SwPagePreviewLayout::Repaint( const tools::Rectangle& rInvalidCoreRect ) co continue; tools::Rectangle aPageRect( rpPreviewPage->aLogicPos, rpPreviewPage->aPageSize ); - if ( rInvalidCoreRect.IsOver( aPageRect ) ) + if ( rInvalidCoreRect.Overlaps( aPageRect ) ) { aPageRect.Intersection(rInvalidCoreRect); tools::Rectangle aInvalidPreviewRect = aPageRect; diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index ef739ec61768..37b6d67e58d6 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -188,7 +188,7 @@ bool SwViewShellImp::IsDragPossible( const Point &rPoint ) aRect.AddBottom( FUZZY_EDGE ); aRect.AddLeft (- FUZZY_EDGE ); aRect.AddRight ( FUZZY_EDGE ); - return aRect.IsInside( rPoint ); + return aRect.Contains( rPoint ); } void SwViewShellImp::NotifySizeChg( const Size &rNewSz ) @@ -257,7 +257,7 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz ) } const tools::Rectangle aObjBound( pObj->GetCurrentBoundRect() ); - if ( !aDocRect.IsInside( aObjBound ) ) + if ( !aDocRect.Contains( aObjBound ) ) { Size aSz; if ( aObjBound.Left() > aDocRect.Right() ) diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 50304b384020..6f9492df7f4d 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -122,7 +122,7 @@ void SwViewShellImp::DelRegion() bool SwViewShellImp::AddPaintRect( const SwRect &rRect ) { // In case of tiled rendering the visual area is the last painted tile -> not interesting. - if ( rRect.IsOver( m_pShell->VisArea() ) || comphelper::LibreOfficeKit::isActive() ) + if ( rRect.Overlaps( m_pShell->VisArea() ) || comphelper::LibreOfficeKit::isActive() ) { if ( !m_pRegion ) { @@ -177,7 +177,7 @@ void SwViewShellImp::SetFirstVisPage(OutputDevice const * pRenderContext) SwPageFrame *pPage = static_cast<SwPageFrame*>(m_pShell->GetLayout()->Lower()); SwRect aPageRect = pPage->GetBoundRect(pRenderContext); - while ( pPage && !aPageRect.IsOver( m_pShell->VisArea() ) ) + while ( pPage && !aPageRect.Overlaps( m_pShell->VisArea() ) ) { pPage = static_cast<SwPageFrame*>(pPage->GetNext()); if ( pPage ) diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index c78ea43516b1..e80d07769f09 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -559,7 +559,7 @@ void SwViewShell::InvalidateWindows( const SwRect &rRect ) ::RepaintPagePreview( &rSh, rRect ); // In case of tiled rendering, invalidation is wanted even if // the rectangle is outside the visual area. - else if ( rSh.VisArea().IsOver( rRect ) || comphelper::LibreOfficeKit::isActive() ) + else if ( rSh.VisArea().Overlaps( rRect ) || comphelper::LibreOfficeKit::isActive() ) rSh.GetWin()->Invalidate( rRect.SVRect() ); } } @@ -574,7 +574,7 @@ const SwRect& SwViewShell::VisArea() const void SwViewShell::MakeVisible( const SwRect &rRect ) { - if ( !(!VisArea().IsInside( rRect ) || IsScrollMDI( this, rRect ) || GetCareDialog(*this)) ) + if ( !(!VisArea().Contains( rRect ) || IsScrollMDI( this, rRect ) || GetCareDialog(*this)) ) return; if ( IsViewLocked() ) @@ -1138,7 +1138,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect) } // #i9719# - consider new border and shadow width - if ( aPageRect.IsOver( aBoth ) ) + if ( aPageRect.Overlaps( aBoth ) ) { SwTwips nPageLeft = 0; SwTwips nPageRight = 0; @@ -1184,7 +1184,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect) tools::Rectangle aRect( aPrevArea.SVRect() ); aRect.SetLeft( nMinLeft ); aRect.SetRight( nMaxRight ); - if( VisArea().IsOver( aPrevArea ) && !mnLockPaint ) + if( VisArea().Overlaps( aPrevArea ) && !mnLockPaint ) { bScrolled = true; maVisArea.Pos() = aPrevArea.Pos(); @@ -1197,7 +1197,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect) } else if ( !mnLockPaint ) //will be released in Unlock { - if( VisArea().IsOver( aPrevArea ) ) + if( VisArea().Overlaps( aPrevArea ) ) { bScrolled = true; maVisArea.Pos() = aPrevArea.Pos(); @@ -1491,7 +1491,7 @@ void SwViewShell::PaintDesktop(vcl::RenderContext& rRenderContext, const SwRect const SwFrame *pPg = pRoot->Lower(); while ( pPg && pPg->GetNext() ) pPg = pPg->GetNext(); - if ( !pPg || !pPg->getFrameArea().IsOver( VisArea() ) ) + if ( !pPg || !pPg->getFrameArea().Overlaps( VisArea() ) ) bBorderOnly = true; } @@ -1546,7 +1546,7 @@ void SwViewShell::PaintDesktop(vcl::RenderContext& rRenderContext, const SwRect aPageRect.Pos().AdjustX( -(bSidebarRight ? 0 : nSidebarWidth) ); aPageRect.AddWidth(nSidebarWidth ); - if ( aPageRect.IsOver( rRect ) ) + if ( aPageRect.Overlaps( rRect ) ) aRegion -= aPageRect; pPage = pPage->GetNext(); @@ -1652,7 +1652,7 @@ bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect ) for ( size_t i = 0; i < pRegion->size(); ++i ) { const SwRect &rTmp = (*pRegion)[i]; - bStop = rTmp.IsOver( VisArea() ); + bStop = rTmp.Overlaps( VisArea() ); if ( !bStop ) break; } @@ -1673,10 +1673,10 @@ bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect ) SwRegionRects aRegion( rRect ); for ( size_t i = 0; i < pRegion->size(); ++i ) { const SwRect &rTmp = (*pRegion)[i]; - if ( !rRect.IsInside( rTmp ) ) + if ( !rRect.Contains( rTmp ) ) { InvalidateWindows( rTmp ); - if ( rTmp.IsOver( VisArea() ) ) + if ( rTmp.Overlaps( VisArea() ) ) { aRegion -= rTmp; bRet = true; } @@ -1764,7 +1764,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang if ( Imp()->m_bSmoothUpdate ) { SwRect aTmp( rRect ); - if ( !Imp()->m_aSmoothRect.IsInside( aTmp ) ) + if ( !Imp()->m_aSmoothRect.Contains( aTmp ) ) Imp()->m_bStopSmooth = true; else { @@ -1811,7 +1811,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang if ( IsPreview() ) { //When useful, process or destroy the old InvalidRect. - if ( aRect.IsInside( maInvalidRect ) ) + if ( aRect.Contains( maInvalidRect ) ) ResetInvalidRect(); SwViewShell::sbLstAct = true; GetLayout()->PaintSwFrame( rRenderContext, aRect ); @@ -1832,7 +1832,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang PaintDesktop(rRenderContext, aRect); //When useful, process or destroy the old InvalidRect. - if ( aRect.IsInside( maInvalidRect ) ) + if ( aRect.Contains( maInvalidRect ) ) ResetInvalidRect(); SwViewShell::sbLstAct = true; GetLayout()->PaintSwFrame( rRenderContext, aRect ); @@ -2592,7 +2592,7 @@ void SwViewShell::OnGraphicArrived(const SwRect& rRect) if(rShell.GetWin()) ::RepaintPagePreview(&rShell, rRect); } - else if(rShell.VisArea().IsOver(rRect) && OUTDEV_WINDOW == rShell.GetOut()->GetOutDevType()) + else if(rShell.VisArea().Overlaps(rRect) && OUTDEV_WINDOW == rShell.GetOut()->GetOutDevType()) { // invalidate instead of painting rShell.GetWin()->Invalidate(rRect.SVRect()); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index a8c7dba32850..cd1ef329e70b 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1530,7 +1530,7 @@ void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const tools::R if (i == (nLines - 1)) aTextLine.SetSize(Size(aTextLine.GetWidth() / 2, aTextLine.GetHeight())); - if (aPage.IsInside(aTextLine)) + if (aPage.Contains(aTextLine)) drawRect(rRenderContext, aTextLine, m_aTextCol, m_aTransCol); aTextLine.Move(0, nStep); diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index aeb18ab29fe8..a736bd0291df 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -143,7 +143,7 @@ void SwAnnotationWin::PaintTile(vcl::RenderContext& rRenderContext, const tools: bool SwAnnotationWin::IsHitWindow(const Point& rPointLogic) { tools::Rectangle aRectangleLogic(EditWin().PixelToLogic(GetPosPixel()), EditWin().PixelToLogic(GetSizePixel())); - return aRectangleLogic.IsInside(rPointLogic); + return aRectangleLogic.Contains(rPointLogic); } void SwAnnotationWin::SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool bClearMark) diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 78ad35b28745..e7808576e380 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -283,11 +283,11 @@ void SwHeaderFooterWin::ShowAll(bool bShow) bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const { ::tools::Rectangle aRect(GetPosPixel(), GetSizePixel()); - if (aRect.IsInside(rDocPt)) + if (aRect.Contains(rDocPt)) return true; ::tools::Rectangle aLineRect(m_pLine->GetPosPixel(), m_pLine->GetSizePixel()); - return aLineRect.IsInside(rDocPt); + return aLineRect.Contains(rDocPt); } void SwHeaderFooterWin::PaintButton() diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx index 23e836a96a24..3375c6896325 100644 --- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx +++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx @@ -162,7 +162,7 @@ void SwOutlineContentVisibilityWin::ShowAll(bool bShow) bool SwOutlineContentVisibilityWin::Contains(const Point& rDocPt) const { ::tools::Rectangle aRect(GetPosPixel(), GetSizePixel()); - if (aRect.IsInside(rDocPt)) + if (aRect.Contains(rDocPt)) return true; return false; } diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index c4c4ed9b73ad..252651048fe9 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -426,11 +426,11 @@ void SwPageBreakWin::ShowAll( bool bShow ) bool SwPageBreakWin::Contains( const Point &rDocPt ) const { ::tools::Rectangle aRect( GetPosPixel(), GetSizePixel() ); - if ( aRect.IsInside( rDocPt ) ) + if ( aRect.Contains( rDocPt ) ) return true; ::tools::Rectangle aLineRect( m_pLine->GetPosPixel(), m_pLine->GetSizePixel() ); - return aLineRect.IsInside( rDocPt ); + return aLineRect.Contains( rDocPt ); } void SwPageBreakWin::SetReadonly( bool bReadonly ) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 1e6a2c801cbc..85e9fd91e5ff 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1939,7 +1939,7 @@ bool SwPostItMgr::IsHit(const Point &aPointPixel) aRect = mPages[nPageNum-1]->eSidebarPosition == sw::sidebarwindows::SidebarPosition::LEFT ? tools::Rectangle(Point(aPageFrame.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrame.Top()),Size(GetSidebarWidth(),aPageFrame.Height())) : tools::Rectangle( Point(aPageFrame.Right()+GetSidebarBorderWidth(),aPageFrame.Top()) , Size(GetSidebarWidth(),aPageFrame.Height())); - if (aRect.IsInside(aPoint)) + if (aRect.Contains(aPoint)) { // we hit the note's sidebar // lets now test for the arrow area @@ -2018,7 +2018,7 @@ bool SwPostItMgr::ScrollbarHit(const tools::ULong aPage,const Point &aPoint) tools::Rectangle aRectBottom(GetBottomScrollRect(aPage)); tools::Rectangle aRectTop(GetTopScrollRect(aPage)); - if (aRectBottom.IsInside(aPoint)) + if (aRectBottom.Contains(aPoint)) { if (aPoint.X() < tools::Long((aPointBottom.X() + GetSidebarWidth()/3))) Scroll( GetScrollSize(),aPage); @@ -2026,7 +2026,7 @@ bool SwPostItMgr::ScrollbarHit(const tools::ULong aPage,const Point &aPoint) Scroll( -1*GetScrollSize(), aPage); return true; } - else if (aRectTop.IsInside(aPoint)) + else if (aRectTop.Contains(aPoint)) { if (aPoint.X() < tools::Long((aPointTop.X() + GetSidebarWidth()/3*2))) Scroll(GetScrollSize(), aPage); diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx b/sw/source/uibase/docvw/UnfloatTableButton.cxx index e3169581c944..8abc5105f7d8 100644 --- a/sw/source/uibase/docvw/UnfloatTableButton.cxx +++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx @@ -242,7 +242,7 @@ void UnfloatTableButton::ShowAll(bool bShow) { Show(bShow); } bool UnfloatTableButton::Contains(const Point& rDocPt) const { ::tools::Rectangle aRect(GetPosPixel(), GetSizePixel()); - if (aRect.IsInside(rDocPt)) + if (aRect.Contains(rDocPt)) return true; return false; diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index c8984a32844b..c1641717ca40 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -207,7 +207,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) tools::Rectangle aRect( pOLV->GetOutputArea() ); aRect.Union( pObj->GetLogicRect() ); const Point aPos = pOLV->GetWindow()->PixelToLogic(rEvt.maPosPixel); - if ( aRect.IsInside(aPos) ) + if ( aRect.Contains(aPos) ) { rSh.StartAllAction(); rSh.EndAllAction(); @@ -267,7 +267,7 @@ SotExchangeDest SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject * tools::Rectangle aRect( pOLV->GetOutputArea() ); aRect.Union( pObj->GetLogicRect() ); const Point aPos = pOLV->GetWindow()->PixelToLogic( rPixPnt ); - if( aRect.IsInside( aPos ) ) + if( aRect.Contains( aPos ) ) return SotExchangeDest::NONE; } } @@ -346,7 +346,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) aWin.AdjustTop(nMargin ); aWin.AdjustRight( -nMargin ); aWin.AdjustBottom( -nMargin ); - if(!aWin.IsInside(aPixPt)) { + if(!aWin.Contains(aPixPt)) { static sal_uInt64 last_tick = 0; sal_uInt64 current_tick = tools::Time::GetSystemTicks(); if((current_tick-last_tick) > 500) { diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 3a3b64defb26..e93158eb17ba 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -637,7 +637,7 @@ IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void) const SwRect aOldVis( rSh.VisArea() ); bool bDone = false; - if ( !rSh.VisArea().IsInside( aModPt ) ) + if ( !rSh.VisArea().Contains( aModPt ) ) { if ( m_bInsDraw ) { @@ -3957,7 +3957,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) } const Point aOldPt( rSh.VisArea().Pos() ); - const bool bInsWin = rSh.VisArea().IsInside( aDocPt ) || comphelper::LibreOfficeKit::isActive(); + const bool bInsWin = rSh.VisArea().Contains( aDocPt ) || comphelper::LibreOfficeKit::isActive(); if (rSh.GetViewOptions()->IsShowOutlineContentVisibilityButton()) { @@ -3994,7 +3994,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) Point aDD( SwEditWin::m_nDDStartPosX, SwEditWin::m_nDDStartPosY ); aDD = LogicToPixel( aDD ); tools::Rectangle aRect( aDD.X()-3, aDD.Y()-3, aDD.X()+3, aDD.Y()+3 ); - if ( !aRect.IsInside( aPixPt ) ) + if ( !aRect.Contains( aPixPt ) ) StopDDTimer( &rSh, aDocPt ); } @@ -4831,7 +4831,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) MOUSE_LEFT == (rMEvt.GetModifier() + rMEvt.GetButtons()) && !rSh.HasSelection() && !GetOutDev()->GetConnectMetaFile() && - rSh.VisArea().IsInside( aDocPt )) + rSh.VisArea().Contains( aDocPt )) { SwUndoId nLastUndoId(SwUndoId::EMPTY); if (rSh.GetLastUndoInfo(nullptr, & nLastUndoId)) diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 4f98553cd38c..5b4f6ce4c5c6 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -431,12 +431,12 @@ void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle { tools::Rectangle aRect( m_pShadCursor->GetRect()); // fully resides inside? - if( rRect.IsInside( aRect ) ) + if( rRect.Contains( aRect ) ) { // then cancel m_pShadCursor.reset(); } - else if( rRect.IsOver( aRect )) + else if( rRect.Overlaps( aRect )) { // resides somewhat above, then everything is clipped outside // and we have to make the "inner part" at the end of the diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index e26e9aa41d5c..cfedd2ea011e 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -193,7 +193,7 @@ void SwCommentRuler::Command(const CommandEvent& rCEvt) Point aMousePos = rCEvt.GetMousePosPixel(); // Ignore command request if it is inside Comment Control if (!mpViewShell->GetPostItMgr() || !mpViewShell->GetPostItMgr()->HasNotes() - || !GetCommentControlRegion().IsInside(aMousePos)) + || !GetCommentControlRegion().Contains(aMousePos)) SvxRuler::Command(rCEvt); } @@ -207,7 +207,7 @@ void SwCommentRuler::MouseMove(const MouseEvent& rMEvt) Point aMousePos = rMEvt.GetPosPixel(); bool bWasHighlighted = mbIsHighlighted; - mbIsHighlighted = GetCommentControlRegion().IsInside(aMousePos); + mbIsHighlighted = GetCommentControlRegion().Contains(aMousePos); if (mbIsHighlighted != bWasHighlighted) // Do start fading maFadeTimer.Start(); @@ -216,7 +216,7 @@ void SwCommentRuler::MouseMove(const MouseEvent& rMEvt) void SwCommentRuler::MouseButtonDown(const MouseEvent& rMEvt) { Point aMousePos = rMEvt.GetPosPixel(); - if (!rMEvt.IsLeft() || IsTracking() || !GetCommentControlRegion().IsInside(aMousePos)) + if (!rMEvt.IsLeft() || IsTracking() || !GetCommentControlRegion().Contains(aMousePos)) { SvxRuler::MouseButtonDown(rMEvt); return; diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx index d076bb5f0ae5..b3d312b07e5c 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -88,7 +88,7 @@ void SwOleClient::ObjectAreaChanged() { SwWrtShell &rSh = static_cast<SwView*>(GetViewShell())->GetWrtShell(); SwRect aFrame( rSh.GetAnyCurRect( CurRectType::FlyEmbedded, nullptr, GetObject() )); - if ( !aFrame.IsOver( rSh.VisArea() ) ) + if ( !aFrame.Overlaps( rSh.VisArea() ) ) rSh.MakeVisible( aFrame ); } diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index c7b6a48a4179..1edfa5d52c26 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -387,7 +387,7 @@ void SwView::CalcPt( Point *pPt, const tools::Rectangle &rRect, bool SwView::IsScroll( const tools::Rectangle &rRect ) const { - return m_bCenterCursor || m_bTopCursor || !m_aVisArea.IsInside(rRect); + return m_bCenterCursor || m_bTopCursor || !m_aVisArea.Contains(rRect); } void SwView::Scroll( const tools::Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY ) @@ -416,7 +416,7 @@ void SwView::Scroll( const tools::Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt { // If we are not supposed to be centered, lying in the VisArea // and are not covered by the dialogue ... - if ( !m_bCenterCursor && aOldVisArea.IsInside( rRect ) + if ( !m_bCenterCursor && aOldVisArea.Contains( rRect ) && ( rRect.Left() > aDlgRect.Right() || rRect.Right() < aDlgRect.Left() || rRect.Top() > aDlgRect.Bottom() @@ -443,7 +443,7 @@ void SwView::Scroll( const tools::Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt } //s.o. !IsScroll() - if( !(m_bCenterCursor || m_bTopCursor) && m_aVisArea.IsInside( rRect ) ) + if( !(m_bCenterCursor || m_bTopCursor) && m_aVisArea.Contains( rRect ) ) { m_aVisArea = aOldVisArea; return; diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index 933bdba0f57b..95443ba16ca7 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -436,7 +436,7 @@ bool SwWrtShell::PushCursor(SwTwips lOffset, bool bSelect) //position is longer on the stack. //The new visible region is to be determined beforehand. aTmpArea.Pos().AdjustY(lOffset ); - if( aTmpArea.IsInside(m_aDest) ) + if( aTmpArea.Contains(m_aDest) ) { if( bSelect ) SttSelect(); @@ -494,7 +494,7 @@ bool SwWrtShell::PopCursor(bool bUpdate, bool bSelect) // use the flag for a valid position. SwRect aTmpArea(VisArea()); aTmpArea.Pos().AdjustY( -(m_pCursorStack->lOffset) ); - if( aTmpArea.IsInside( m_pCursorStack->aDocPos ) ) + if( aTmpArea.Contains( m_pCursorStack->aDocPos ) ) { if( bSelect ) SttSelect(); diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 101307bf1d96..b13eeb1ade52 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -667,7 +667,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi { tools::Rectangle aRect = VCLRectangle( xComp->getBounds() ); Point aPos = VCLPoint( rPoint ); - if ( aRect.IsInside( aPos ) ) + if ( aRect.Contains( aPos ) ) { xChild = xAcc; break; diff --git a/toolkit/source/hatchwindow/ipwin.cxx b/toolkit/source/hatchwindow/ipwin.cxx index b21a3271e3e5..227d0a661aa2 100644 --- a/toolkit/source/hatchwindow/ipwin.cxx +++ b/toolkit/source/hatchwindow/ipwin.cxx @@ -179,12 +179,12 @@ short SvResizeHelper::SelectMove( vcl::Window * pWin, const Point & rPos ) { std::array<tools::Rectangle,8> aRects = FillHandleRectsPixel(); for( sal_uInt16 i = 0; i < 8; i++ ) - if( aRects[ i ].IsInside( rPos ) ) + if( aRects[ i ].Contains( rPos ) ) return i; // Move-Rect overlaps Handles std::array<tools::Rectangle,4> aMoveRects = FillMoveRectsPixel(); for(const auto & rMoveRect : aMoveRects) - if( rMoveRect.IsInside( rPos ) ) + if( rMoveRect.Contains( rPos ) ) return 8; } else diff --git a/tools/qa/cppunit/test_rectangle.cxx b/tools/qa/cppunit/test_rectangle.cxx index e213ed28daf8..2b6518d797c4 100644 --- a/tools/qa/cppunit/test_rectangle.cxx +++ b/tools/qa/cppunit/test_rectangle.cxx @@ -92,6 +92,21 @@ void Test::test_rectangle() static_assert(aRectMm100.GetWidth() == 0); static_assert(aRectMm100.GetHeight() == 0); } + + { + constexpr tools::Rectangle rect(Point(0, 0), Size(20, 20)); + constexpr tools::Rectangle inside(Point(10, 10), Size(10, 10)); + constexpr tools::Rectangle overlap(Point(10, 10), Size(20, 20)); + constexpr tools::Rectangle outside(Point(20, 20), Size(10, 10)); + CPPUNIT_ASSERT(rect.Contains(inside)); + CPPUNIT_ASSERT(rect.Contains(rect)); + CPPUNIT_ASSERT(!rect.Contains(overlap)); + CPPUNIT_ASSERT(!rect.Contains(outside)); + CPPUNIT_ASSERT(rect.Overlaps(inside)); + CPPUNIT_ASSERT(rect.Overlaps(rect)); + CPPUNIT_ASSERT(rect.Overlaps(overlap)); + CPPUNIT_ASSERT(!rect.Overlaps(outside)); + } } CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index 9c9c04903f19..1fe47071d4ce 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -140,7 +140,7 @@ void tools::Rectangle::Justify() } } -bool tools::Rectangle::IsInside( const Point& rPoint ) const +bool tools::Rectangle::Contains( const Point& rPoint ) const { if ( IsEmpty() ) return false; @@ -168,12 +168,12 @@ bool tools::Rectangle::IsInside( const Point& rPoint ) const return true; } -bool tools::Rectangle::IsInside( const tools::Rectangle& rRect ) const +bool tools::Rectangle::Contains( const tools::Rectangle& rRect ) const { - return IsInside( rRect.TopLeft() ) && IsInside( rRect.BottomRight() ); + return Contains( rRect.TopLeft() ) && Contains( rRect.BottomRight() ); } -bool tools::Rectangle::IsOver( const tools::Rectangle& rRect ) const +bool tools::Rectangle::Overlaps( const tools::Rectangle& rRect ) const { // If there's no intersection, they don't overlap return !GetIntersection( rRect ).IsEmpty(); diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index ab33eb61021b..8128491ac8cd 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1494,7 +1494,7 @@ tools::Rectangle Polygon::GetBoundRect() const return tools::Rectangle( nXMin, nYMin, nXMax, nYMax ); } -bool Polygon::IsInside( const Point& rPoint ) const +bool Polygon::Contains( const Point& rPoint ) const { DBG_ASSERT( !mpImplPolygon->mxFlagAry, "IsInside could fail with beziers!" ); @@ -1503,7 +1503,7 @@ bool Polygon::IsInside( const Point& rPoint ) const sal_uInt16 nCount = mpImplPolygon->mnPoints; sal_uInt16 nPCounter = 0; - if ( ( nCount > 2 ) && aBound.IsInside( rPoint ) ) + if ( ( nCount > 2 ) && aBound.Contains( rPoint ) ) { Point aPt1( mpImplPolygon->mxPointAry[ 0 ] ); Point aIntersection; diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index 4f915da258a4..faa78f78144a 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -136,10 +136,10 @@ void MultiSelection::SelectAll( bool bSelect ) bool MultiSelection::Select( sal_Int32 nIndex, bool bSelect ) { - DBG_ASSERT( aTotRange.IsInside(nIndex), "selected index out of range" ); + DBG_ASSERT( aTotRange.Contains(nIndex), "selected index out of range" ); // out of range? - if ( !aTotRange.IsInside(nIndex) ) + if ( !aTotRange.Contains(nIndex) ) return false; // find the virtual target position @@ -148,7 +148,7 @@ bool MultiSelection::Select( sal_Int32 nIndex, bool bSelect ) if ( bSelect ) { // is it included in the found sub selection? - if ( nSubSelPos < sal_Int32(aSels.size()) && aSels[ nSubSelPos ].IsInside( nIndex ) ) + if ( nSubSelPos < sal_Int32(aSels.size()) && aSels[ nSubSelPos ].Contains( nIndex ) ) // already selected, nothing to do return false; @@ -187,7 +187,7 @@ bool MultiSelection::Select( sal_Int32 nIndex, bool bSelect ) { // is it excluded from the found sub selection? if ( nSubSelPos >= sal_Int32(aSels.size()) - || !aSels[ nSubSelPos ].IsInside( nIndex ) + || !aSels[ nSubSelPos ].Contains( nIndex ) ) { // not selected, nothing to do return false; @@ -234,8 +234,8 @@ void MultiSelection::Select( const Range& rIndexRange, bool bSelect ) sal_Int32 nTmpMax = rIndexRange.Max(); sal_Int32 nCurMin = FirstSelected(); sal_Int32 nCurMax = LastSelected(); - DBG_ASSERT(aTotRange.IsInside(nTmpMax), "selected index out of range" ); - DBG_ASSERT(aTotRange.IsInside(nTmpMin), "selected index out of range" ); + DBG_ASSERT(aTotRange.Contains(nTmpMax), "selected index out of range" ); + DBG_ASSERT(aTotRange.Contains(nTmpMin), "selected index out of range" ); // replace whole selection? if( aSels.empty() || (nTmpMin <= nCurMin && nTmpMax >= nCurMax ) ) @@ -306,7 +306,7 @@ bool MultiSelection::IsSelected( sal_Int32 nIndex ) const // find the virtual target position sal_Int32 nSubSelPos = ImplFindSubSelection( nIndex ); - return nSubSelPos < sal_Int32(aSels.size()) && aSels[ nSubSelPos ].IsInside(nIndex); + return nSubSelPos < sal_Int32(aSels.size()) && aSels[ nSubSelPos ].Contains(nIndex); } void MultiSelection::Insert( sal_Int32 nIndex, sal_Int32 nCount ) @@ -318,7 +318,7 @@ void MultiSelection::Insert( sal_Int32 nIndex, sal_Int32 nCount ) if ( nSubSelPos < sal_Int32(aSels.size()) ) { // did we insert an unselected into an existing sub selection? if ( aSels[ nSubSelPos ].Min() != nIndex - && aSels[ nSubSelPos ].IsInside(nIndex) + && aSels[ nSubSelPos ].Contains(nIndex) ) { // split the sub selection if ( nSubSelPos < sal_Int32(aSels.size()) ) { aSels.insert( aSels.begin() + nSubSelPos, Range( aSels[ nSubSelPos ].Min(), nIndex-1 ) ); @@ -348,7 +348,7 @@ void MultiSelection::Remove( sal_Int32 nIndex ) // did we remove from an existing sub selection? if ( nSubSelPos < sal_Int32(aSels.size()) - && aSels[ nSubSelPos ].IsInside(nIndex) + && aSels[ nSubSelPos ].Contains(nIndex) ) { // does this sub selection only contain the index to be deleted if ( aSels[ nSubSelPos ].Len() == 1 ) { diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx index f92976c8a569..b0135fa56086 100644 --- a/vcl/inc/regband.hxx +++ b/vcl/inc/regband.hxx @@ -106,7 +106,7 @@ public: void MoveX( tools::Long nHorzMove ); void ScaleX( double fHorzScale ); - bool IsInside( tools::Long nX ); + bool Contains( tools::Long nX ); bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx index b722be430e6a..c25b5dd648eb 100644 --- a/vcl/inc/regionband.hxx +++ b/vcl/inc/regionband.hxx @@ -72,7 +72,7 @@ public: bool Exclude(const RegionBand& rSource); void XOr(const RegionBand& rSource); tools::Rectangle GetBoundRect() const; - bool IsInside(const Point& rPoint) const; + bool Contains(const Point& rPoint) const; sal_uInt32 getRectangleCount() const; // only users are Region::Intersect, Region::IsRectangle and PSWriter::ImplBmp void GetRegionRectangles(RectangleVector& rTarget) const; diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 282a26ca0c60..328cf9c94eca 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -220,7 +220,7 @@ bool AquaSalGraphics::hitTestNativeControl(ControlType nType, ControlPart nPart, tools::Rectangle aRect; bool bValid = AquaGetScrollRect(/* TODO: int nScreen, */ nPart, rControlRegion, aRect); - rIsInside = bValid && aRect.IsInside(rPos); + rIsInside = bValid && aRect.Contains(rPos); return bValid; } return false; diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index c77bf57e1bd4..f1dddeb0e616 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -656,7 +656,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic // otherwise it would directly be closed due to a focus change... */ tools::Rectangle aHelpRect( aPos, aSz ); - if( aHelpRect.IsInside( aMousePos ) ) + if( aHelpRect.Contains( aMousePos ) ) { Point delta(2,2); Point aSize( aSz.Width(), aSz.Height() ); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index af0353043f51..66c030dd5501 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1302,7 +1302,7 @@ unsigned int Application::GetBestScreen( const tools::Rectangle& i_rRect ) { const tools::Rectangle aCurScreenRect( GetScreenPosSizePixel( i ) ); // if a screen contains the rectangle completely it is obviously the best screen - if( aCurScreenRect.IsInside( i_rRect ) ) + if( aCurScreenRect.Contains( i_rRect ) ) return i; // next the screen which contains most of the area of the rect is the best tools::Rectangle aIntersection( aCurScreenRect.GetIntersection( i_rRect ) ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index cb7581b35c76..87e128b819e2 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -744,7 +744,7 @@ bool PushButton::ImplHitTestPushButton( vcl::Window const * pDev, { tools::Rectangle aTestRect( Point(), pDev->GetOutputSizePixel() ); - return aTestRect.IsInside( rPos ); + return aTestRect.Contains( rPos ); } DrawTextFlags PushButton::ImplGetTextStyle( SystemTextColorFlags nSystemTextColorFlags ) const @@ -987,10 +987,10 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) if (Window::IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && aInRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && aInRect.Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; - if ( IsMouseOver() && aInRect.IsInside(GetPointerPosPixel()) && mbIsActive) + if ( IsMouseOver() && aInRect.Contains(GetPointerPosPixel()) && mbIsActive) { nState |= ControlState::ROLLOVER; nButtonStyle &= ~DrawButtonFlags::Pressed; @@ -1005,7 +1005,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) if (bNativeOK) return; - bool bRollOver = (IsMouseOver() && aInRect.IsInside(GetPointerPosPixel())); + bool bRollOver = (IsMouseOver() && aInRect.Contains(GetPointerPosPixel())); if (bRollOver) nButtonStyle |= DrawButtonFlags::Highlight; bool bDrawMenuSep = mnDDStyle == PushButtonDropdownStyle::SplitMenuButton; @@ -1932,7 +1932,7 @@ void RadioButton::ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext) if (IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && maMouseRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && maMouseRect.Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; bNativeOK = rRenderContext.DrawNativeControl(ControlType::Radiobutton, ControlPart::Entire, aCtrlRect, @@ -2346,7 +2346,7 @@ void RadioButton::dispose() void RadioButton::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( rMEvt.IsLeft() && maMouseRect.IsInside( rMEvt.GetPosPixel() ) ) + if ( rMEvt.IsLeft() && maMouseRect.Contains( rMEvt.GetPosPixel() ) ) { GetButtonState() |= DrawButtonFlags::Pressed; Invalidate(); @@ -2379,7 +2379,7 @@ void RadioButton::Tracking( const TrackingEvent& rTEvt ) } else { - if ( maMouseRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ) ) + if ( maMouseRect.Contains( rTEvt.GetMouseEvent().GetPosPixel() ) ) { if ( !(GetButtonState() & DrawButtonFlags::Pressed) ) { @@ -2612,7 +2612,7 @@ bool RadioButton::PreNotify( NotifyEvent& rNEvt ) // trigger redraw if mouse over state has changed if( IsNativeControlSupported(ControlType::Radiobutton, ControlPart::Entire) ) { - if (maMouseRect.IsInside(GetPointerPosPixel()) != maMouseRect.IsInside(GetLastPointerPosPixel()) || + if (maMouseRect.Contains(GetPointerPosPixel()) != maMouseRect.Contains(GetLastPointerPosPixel()) || pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) { Invalidate( maStateRect ); @@ -3061,7 +3061,7 @@ void CheckBox::ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) else if (meState == TRISTATE_INDET) aControlValue.setTristateVal(ButtonValue::Mixed); - if (IsMouseOver() && maMouseRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && maMouseRect.Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; bNativeOK = rRenderContext.DrawNativeControl(ControlType::Checkbox, ControlPart::Entire, aCtrlRegion, @@ -3172,7 +3172,7 @@ CheckBox::CheckBox( vcl::Window* pParent, WinBits nStyle ) : void CheckBox::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( rMEvt.IsLeft() && maMouseRect.IsInside( rMEvt.GetPosPixel() ) ) + if ( rMEvt.IsLeft() && maMouseRect.Contains( rMEvt.GetPosPixel() ) ) { GetButtonState() |= DrawButtonFlags::Pressed; Invalidate(); @@ -3205,7 +3205,7 @@ void CheckBox::Tracking( const TrackingEvent& rTEvt ) } else { - if ( maMouseRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ) ) + if ( maMouseRect.Contains( rTEvt.GetMouseEvent().GetPosPixel() ) ) { if ( !(GetButtonState() & DrawButtonFlags::Pressed) ) { @@ -3493,7 +3493,7 @@ bool CheckBox::PreNotify( NotifyEvent& rNEvt ) // trigger redraw if mouse over state has changed if( IsNativeControlSupported(ControlType::Checkbox, ControlPart::Entire) ) { - if (maMouseRect.IsInside(GetPointerPosPixel()) != maMouseRect.IsInside(GetLastPointerPosPixel()) || + if (maMouseRect.Contains(GetPointerPosPixel()) != maMouseRect.Contains(GetLastPointerPosPixel()) || pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) { Invalidate( maStateRect ); diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index ba69a780b6ea..4beea72b5e83 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -331,9 +331,9 @@ sal_uInt16 Calendar::ImplDoHitTest( const Point& rPos, Date& rDate ) const if ( mbFormat ) return 0; - if ( maPrevRect.IsInside( rPos ) ) + if ( maPrevRect.Contains( rPos ) ) return CALENDAR_HITTEST_PREV; - else if ( maNextRect.IsInside( rPos ) ) + else if ( maNextRect.Contains( rPos ) ) return CALENDAR_HITTEST_NEXT; tools::Long nY; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 05d898655c95..15ff238f32e8 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1343,7 +1343,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) ImplSetSelection( Selection( aBoundary.startPos, aBoundary.endPos ) ); ImplCopyToSelectionClipboard(); } - else if ( !rMEvt.IsShift() && HasFocus() && aSelection.IsInside( nCharPos ) ) + else if ( !rMEvt.IsShift() && HasFocus() && aSelection.Contains( nCharPos ) ) mbClickedInSelection = true; else if ( rMEvt.IsLeft() ) ImplSetCursorPos( nCharPos, rMEvt.IsShift() ); @@ -2872,7 +2872,7 @@ void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) aSel.Justify(); // Don't accept drop in selection or read-only field... - if ( IsReadOnly() || aSel.IsInside( mpDDInfo->nDropPos ) || ! mpDDInfo->bIsStringSupported ) + if ( IsReadOnly() || aSel.Contains( mpDDInfo->nDropPos ) || ! mpDDInfo->bIsStringSupported ) { ImplHideDDCursor(); rDTDE.Context->rejectDrag(); diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 0e828a941662..691278f73b9b 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -217,7 +217,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( std::unique_ptr<SvxIconChoiceCtrlEntry FindBoundingRect( pEntry ); tools::Rectangle aOutputArea( GetOutputRect() ); pGridMap->OccupyGrids( pEntry ); - if( !aOutputArea.IsOver( pEntry->aRect ) ) + if( !aOutputArea.Overlaps( pEntry->aRect ) ) return; // is invisible pView->Invalidate( pEntry->aRect ); } @@ -556,7 +556,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const too { SvxIconChoiceCtrlEntry* pEntry = maZOrderList[nPos]; const tools::Rectangle& rBoundRect = GetEntryBoundRect(pEntry); - if (rRect.IsOver(rBoundRect)) + if (rRect.Overlaps(rBoundRect)) { PaintEntry(pEntry, rBoundRect.TopLeft(), rRenderContext); // set entries to Top if they are being repainted @@ -587,7 +587,7 @@ void SvxIconChoiceCtrl_Impl::RepaintSelectedEntries() if (pEntry->GetFlags() & SvxIconViewFlags::SELECTED) { const tools::Rectangle& rBoundRect = GetEntryBoundRect(pEntry); - if (aOutRect.IsOver(rBoundRect)) + if (aOutRect.Overlaps(rBoundRect)) pView->Invalidate(rBoundRect); } } @@ -1438,7 +1438,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po if (!rRenderContext.IsClipRegion() && (aVerSBar->IsVisible() || aHorSBar->IsVisible())) { tools::Rectangle aOutputArea(GetOutputRect()); - if (aOutputArea.IsOver(aTextRect) || aOutputArea.IsOver(aBmpRect)) + if (aOutputArea.Overlaps(aTextRect) || aOutputArea.Overlaps(aBmpRect)) { rRenderContext.SetClipRegion(vcl::Region(aOutputArea)); bResetClipRegion = true; @@ -1526,7 +1526,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos, { nCount--; SvxIconChoiceCtrlEntry* pEntry = maZOrderList[ nCount ]; - if( pEntry->aRect.IsInside( rDocPos ) ) + if( pEntry->aRect.Contains( rDocPos ) ) { if( bHit ) { @@ -1535,10 +1535,10 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos, aRect.AdjustBottom(3 ); aRect.AdjustLeft( -3 ); aRect.AdjustRight(3 ); - if( aRect.IsInside( rDocPos ) ) + if( aRect.Contains( rDocPos ) ) return pEntry; aRect = CalcTextRect( pEntry ); - if( aRect.IsInside( rDocPos ) ) + if( aRect.Contains( rDocPos ) ) return pEntry; } else @@ -1816,7 +1816,7 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) { tools::Rectangle aDocRect( Point(), aVirtOutputSize ); tools::Rectangle aVisRect( GetOutputRect() ); - if( aVisRect.IsInside( aDocRect )) + if( aVisRect.Contains( aDocRect )) return false; Size aDocSize( aDocRect.GetSize() ); Size aVisSize( aVisRect.GetSize() ); @@ -1940,7 +1940,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const tools::Rectangle& rRect, bool bS // convert to document coordinate aOrigin *= -1; tools::Rectangle aOutputArea( GetOutputRect() ); - if( aOutputArea.IsInside( aVirtRect ) ) + if( aOutputArea.Contains( aVirtRect ) ) return; // is already visible tools::Long nDy; @@ -2280,7 +2280,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const tools::Rectangle& rRect, bool bAd bOverlaps = IsOver( pOtherRects, aBoundRect ); else bOverlaps = false; - bool bOver = aRect.IsOver( aBoundRect ); + bool bOver = aRect.Overlaps( aBoundRect ); if( bOver && !bOverlaps ) { @@ -2309,7 +2309,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const tools::Rectangle& rRect, bool bAd // the intersection. // Possible solution: remember a snapshot of the selection before // spanning the rectangle. - if( aBoundRect.IsOver( rRect)) + if( aBoundRect.Overlaps( rRect)) { // deselect intersection between old rectangles and current rectangle if( bSelected ) @@ -2389,7 +2389,7 @@ bool SvxIconChoiceCtrl_Impl::IsOver( std::vector<tools::Rectangle>* pRectList, c for( sal_uInt16 nCur = 0; nCur < nCount; nCur++ ) { tools::Rectangle& rRect = (*pRectList)[ nCur ]; - if( rBoundRect.IsOver( rRect )) + if( rBoundRect.Overlaps( rRect )) return true; } return false; @@ -2786,7 +2786,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) OUString sQuickHelpText = pEntry->GetQuickHelpText(); OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) ); tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, &aEntryText ) ); - if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() ) + if ( ( !aTextRect.Contains( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() ) return false; tools::Rectangle aOptTextRect( aTextRect ); diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index a607aa84a45f..a1bcceaf26cb 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -880,7 +880,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) return; tools::Rectangle aRect( Point(), GetOutputSizePixel() ); - if( !aRect.IsInside( rMEvt.GetPosPixel() ) ) + if( !aRect.Contains( rMEvt.GetPosPixel() ) ) return; if ( IsMouseMoveSelect() ) @@ -1121,7 +1121,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) { tools::Rectangle aRect( Point(), GetOutputSizePixel() ); - bool bInside = aRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ); + bool bInside = aRect.Contains( rTEvt.GetMouseEvent().GetPosPixel() ); if( rTEvt.IsTrackingCanceled() || rTEvt.IsTrackingEnded() ) // MouseButtonUp { diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index d929ec00ba9a..e1e92b236f21 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -731,7 +731,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonRight: ControlPart::ButtonLeft): ControlPart::ButtonUp, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn1Rect.IsInside( rMousePos ) ) + maBtn1Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_BTN1_DOWN; @@ -744,7 +744,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn2Rect.IsInside( rMousePos ) ) + maBtn2Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_BTN2_DOWN; @@ -758,7 +758,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::TrackHorzLeft: ControlPart::TrackVertUpper, maPage1Rect, rMousePos, bIsInside )? bIsInside: - maPage1Rect.IsInside( rMousePos ) ) + maPage1Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_PAGE1_DOWN; @@ -772,7 +772,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::TrackHorzRight: ControlPart::TrackVertLower, maPage2Rect, rMousePos, bIsInside )? bIsInside: - maPage2Rect.IsInside( rMousePos ) ) + maPage2Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_PAGE2_DOWN; @@ -863,7 +863,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonRight: ControlPart::ButtonLeft): ControlPart::ButtonUp, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn1Rect.IsInside( rMousePos ) ) + maBtn1Rect.Contains( rMousePos ) ) { if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN1_DISABLE) ) { @@ -874,7 +874,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) else if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn2Rect.IsInside( rMousePos ) ) + maBtn2Rect.Contains( rMousePos ) ) { if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN2_DISABLE) ) { @@ -886,7 +886,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) { bool bThumbHit = GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::ThumbHorz : ControlPart::ThumbVert, maThumbRect, rMousePos, bIsInside ) - ? bIsInside : maThumbRect.IsInside( rMousePos ); + ? bIsInside : maThumbRect.Contains( rMousePos ); bool bThumbAction = bWarp || bPage; @@ -939,7 +939,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::TrackHorzLeft : ControlPart::TrackVertUpper, maPage1Rect, rMousePos, bIsInside )? bIsInside: - maPage1Rect.IsInside( rMousePos ) ) + maPage1Rect.Contains( rMousePos ) ) { meScrollType = ScrollType::PageUp; } @@ -1220,30 +1220,30 @@ tools::Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt ) if( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonRight: ControlPart::ButtonLeft): ControlPart::ButtonUp, aControlRegion, rPt, bIsInside )? bIsInside: - maBtn1Rect.IsInside( rPt ) ) + maBtn1Rect.Contains( rPt ) ) return &maBtn1Rect; else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown, aControlRegion, rPt, bIsInside )? bIsInside: - maBtn2Rect.IsInside( rPt ) ) + maBtn2Rect.Contains( rPt ) ) return &maBtn2Rect; // HitTestNativeScrollbar, see remark at top of file else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal ? ControlPart::TrackHorzLeft : ControlPart::TrackVertUpper, maPage1Rect, rPt, bIsInside)? bIsInside: - maPage1Rect.IsInside( rPt ) ) + maPage1Rect.Contains( rPt ) ) return &maPage1Rect; // HitTestNativeScrollbar, see remark at top of file else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal ? ControlPart::TrackHorzRight : ControlPart::TrackVertLower, maPage2Rect, rPt, bIsInside)? bIsInside: - maPage2Rect.IsInside( rPt ) ) + maPage2Rect.Contains( rPt ) ) return &maPage2Rect; // HitTestNativeScrollbar, see remark at top of file else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal ? ControlPart::ThumbHorz : ControlPart::ThumbVert, maThumbRect, rPt, bIsInside)? bIsInside: - maThumbRect.IsInside( rPt ) ) + maThumbRect.Contains( rPt ) ) return &maThumbRect; else return nullptr; diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index af259cd184e7..3ec5bdb949ae 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -344,7 +344,7 @@ void Slider::ImplDraw(vcl::RenderContext& rRenderContext) if (IsMouseOver()) { - if (maThumbRect.IsInside(GetPointerPosPixel())) + if (maThumbRect.Contains(GetPointerPosPixel())) aSliderValue.mnThumbState |= ControlState::ROLLOVER; } @@ -475,7 +475,7 @@ bool Slider::ImplIsPageUp( const Point& rPos ) aRect.SetLeft( 0 ); aRect.SetRight( aSize.Width()-1 ); } - return aRect.IsInside( rPos ); + return aRect.Contains( rPos ); } bool Slider::ImplIsPageDown( const Point& rPos ) @@ -492,7 +492,7 @@ bool Slider::ImplIsPageDown( const Point& rPos ) aRect.SetLeft( 0 ); aRect.SetRight( aSize.Width()-1 ); } - return aRect.IsInside( rPos ); + return aRect.Contains( rPos ); } tools::Long Slider::ImplSlide( tools::Long nNewPos ) @@ -609,7 +609,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) const Point& rMousePos = rMEvt.GetPosPixel(); StartTrackingFlags nTrackFlags = StartTrackingFlags::NONE; - if ( maThumbRect.IsInside( rMousePos ) ) + if ( maThumbRect.Contains( rMousePos ) ) { meScrollType = ScrollType::Drag; diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index f99bf61393fb..084fc570a739 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -178,13 +178,13 @@ void SpinButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangl void SpinButton::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled() ) ) + if ( maUpperRect.Contains( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled() ) ) { mbUpperIn = true; mbInitialUp = true; Invalidate( maUpperRect ); } - else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsLowerEnabled() ) ) + else if ( maLowerRect.Contains( rMEvt.GetPosPixel() ) && ( ImplIsLowerEnabled() ) ) { mbLowerIn = true; mbInitialDown = true; @@ -229,21 +229,21 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) if ( !rMEvt.IsLeft() || (!mbInitialUp && !mbInitialDown) ) return; - if ( !maUpperRect.IsInside( rMEvt.GetPosPixel() ) && + if ( !maUpperRect.Contains( rMEvt.GetPosPixel() ) && mbUpperIn && mbInitialUp ) { mbUpperIn = false; maRepeatTimer.Stop(); Invalidate( maUpperRect ); } - else if ( !maLowerRect.IsInside( rMEvt.GetPosPixel() ) && + else if ( !maLowerRect.Contains( rMEvt.GetPosPixel() ) && mbLowerIn && mbInitialDown ) { mbLowerIn = false; maRepeatTimer.Stop(); Invalidate( maLowerRect ); } - else if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && + else if ( maUpperRect.Contains( rMEvt.GetPosPixel() ) && !mbUpperIn && mbInitialUp ) { mbUpperIn = true; @@ -251,7 +251,7 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) maRepeatTimer.Start(); Invalidate( maUpperRect ); } - else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && + else if ( maLowerRect.Contains( rMEvt.GetPosPixel() ) && !mbLowerIn && mbInitialDown ) { mbLowerIn = true; @@ -420,9 +420,9 @@ void SpinButton::ImplCalcFocusRect( bool _bUpper ) tools::Rectangle* SpinButton::ImplFindPartRect( const Point& rPt ) { - if( maUpperRect.IsInside( rPt ) ) + if( maUpperRect.Contains( rPt ) ) return &maUpperRect; - else if( maLowerRect.IsInside( rPt ) ) + else if( maLowerRect.Contains( rPt ) ) return &maLowerRect; else return nullptr; diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index c52ed79e7657..0abaae7a8981 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -49,7 +49,7 @@ void ImplGetSpinbuttonValue(vcl::Window* pWin, nState &= ~ControlState::ENABLED; if (pWin->HasFocus()) nState |= ControlState::FOCUSED; - if (pWin->IsMouseOver() && rUpperRect.IsInside(aPointerPos)) + if (pWin->IsMouseOver() && rUpperRect.Contains(aPointerPos)) nState |= ControlState::ROLLOVER; rValue.mnUpperState = nState; @@ -61,7 +61,7 @@ void ImplGetSpinbuttonValue(vcl::Window* pWin, if (pWin->HasFocus()) nState |= ControlState::FOCUSED; // for overlapping spins: highlight only one - if (pWin->IsMouseOver() && rLowerRect.IsInside(aPointerPos) && !rUpperRect.IsInside(aPointerPos)) + if (pWin->IsMouseOver() && rLowerRect.Contains(aPointerPos) && !rUpperRect.Contains(aPointerPos)) nState |= ControlState::ROLLOVER; rValue.mnLowerState = nState; @@ -383,19 +383,19 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) if (!IsReadOnly()) { - if (maUpperRect.IsInside(rMEvt.GetPosPixel())) + if (maUpperRect.Contains(rMEvt.GetPosPixel())) { mbUpperIn = true; mbInitialUp = true; Invalidate(maUpperRect); } - else if (maLowerRect.IsInside(rMEvt.GetPosPixel())) + else if (maLowerRect.Contains(rMEvt.GetPosPixel())) { mbLowerIn = true; mbInitialDown = true; Invalidate(maLowerRect); } - else if (maDropDownRect.IsInside(rMEvt.GetPosPixel())) + else if (maDropDownRect.Contains(rMEvt.GetPosPixel())) { // put DropDownButton to the right mbInDropDown = ShowDropDown( !mbInDropDown ); @@ -443,7 +443,7 @@ void SpinField::MouseMove(const MouseEvent& rMEvt) { if (mbInitialUp) { - bool bNewUpperIn = maUpperRect.IsInside(rMEvt.GetPosPixel()); + bool bNewUpperIn = maUpperRect.Contains(rMEvt.GetPosPixel()); if (bNewUpperIn != mbUpperIn) { if (bNewUpperIn) @@ -460,7 +460,7 @@ void SpinField::MouseMove(const MouseEvent& rMEvt) } else if (mbInitialDown) { - bool bNewLowerIn = maLowerRect.IsInside(rMEvt.GetPosPixel()); + bool bNewLowerIn = maLowerRect.Contains(rMEvt.GetPosPixel()); if (bNewLowerIn != mbLowerIn) { if (bNewLowerIn) @@ -820,9 +820,9 @@ void SpinField::DataChanged( const DataChangedEvent& rDCEvt ) tools::Rectangle* SpinField::ImplFindPartRect(const Point& rPt) { - if (maUpperRect.IsInside(rPt)) + if (maUpperRect.Contains(rPt)) return &maUpperRect; - else if (maLowerRect.IsInside(rPt)) + else if (maLowerRect.Contains(rPt)) return &maLowerRect; else return nullptr; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 2a5a46b52f70..a3e2264d3f8c 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -830,17 +830,17 @@ void TabControl::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem co if (aLeftTestPos.Y() == rCurRect.Bottom()) { aLeftTestPos.AdjustX( -2 ); - if (rCurRect.IsInside(aLeftTestPos)) + if (rCurRect.Contains(aLeftTestPos)) bLeftBorder = false; aRightTestPos.AdjustX(2 ); - if (rCurRect.IsInside(aRightTestPos)) + if (rCurRect.Contains(aRightTestPos)) bRightBorder = false; } else { - if (rCurRect.IsInside(aLeftTestPos)) + if (rCurRect.Contains(aLeftTestPos)) nLeftBottom -= 2; - if (rCurRect.IsInside(aRightTestPos)) + if (rCurRect.Contains(aRightTestPos)) nRightBottom -= 2; } } @@ -856,11 +856,11 @@ void TabControl::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem co } if (IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && pItem->maRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && pItem->maRect.Contains(GetPointerPosPixel())) { nState |= ControlState::ROLLOVER; for (auto const& item : mpTabCtrlData->maItemList) - if ((&item != pItem) && item.m_bVisible && item.maRect.IsInside(GetPointerPosPixel())) + if ((&item != pItem) && item.m_bVisible && item.maRect.Contains(GetPointerPosPixel())) { nState &= ~ControlState::ROLLOVER; // avoid multiple highlighted tabs break; @@ -1522,7 +1522,7 @@ ImplTabItem* TabControl::ImplGetItem(const Point& rPt) const int nFound = 0; for (auto & item : mpTabCtrlData->maItemList) { - if (item.m_bVisible && item.maRect.IsInside(rPt)) + if (item.m_bVisible && item.maRect.Contains(rPt)) { nFound++; pFoundItem = &item; @@ -1787,7 +1787,7 @@ sal_uInt16 TabControl::GetPageId( const Point& rPos ) const Size winSize = Control::GetOutputSizePixel(); const auto &rList = mpTabCtrlData->maItemList; const auto it = std::find_if(rList.begin(), rList.end(), [&rPos, &winSize, this](const auto &item) { - return const_cast<TabControl*>(this)->ImplGetTabRect(&item, winSize.Width(), winSize.Height()).IsInside(rPos); }); + return const_cast<TabControl*>(this)->ImplGetTabRect(&item, winSize.Width(), winSize.Height()).Contains(rPos); }); return (it != rList.end()) ? it->id() : 0; } diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 64637dfd4e7c..675d99bc0975 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -799,7 +799,7 @@ void ImplRegionBand::XOr( tools::Long nXLeft, tools::Long nXRight ) OptimizeBand(); } -bool ImplRegionBand::IsInside( tools::Long nX ) +bool ImplRegionBand::Contains( tools::Long nX ) { ImplRegionBandSep* pSep = mpFirstSep; while ( pSep ) diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 7acf33a53533..22f2c3acc885 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1336,7 +1336,7 @@ const RegionBand* vcl::Region::GetAsRegionBand() const return getRegionBand(); } -bool vcl::Region::IsInside( const Point& rPoint ) const +bool vcl::Region::Contains( const Point& rPoint ) const { if(IsEmpty()) { @@ -1353,7 +1353,7 @@ bool vcl::Region::IsInside( const Point& rPoint ) const // Too expensive (?) //if(mpImplRegion->getRegionPolyPoly()) //{ - // return mpImplRegion->getRegionPolyPoly()->IsInside( rPoint ); + // return mpImplRegion->getRegionPolyPoly()->Contains( rPoint ); //} // ensure RegionBand existence @@ -1361,13 +1361,13 @@ bool vcl::Region::IsInside( const Point& rPoint ) const if(pRegionBand) { - return pRegionBand->IsInside(rPoint); + return pRegionBand->Contains(rPoint); } return false; } -bool vcl::Region::IsOver( const tools::Rectangle& rRect ) const +bool vcl::Region::Overlaps( const tools::Rectangle& rRect ) const { if(IsEmpty()) { diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 31d942735d0b..e772d5b27c5b 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -1229,7 +1229,7 @@ void RegionBand::XOr(const RegionBand& rSource) } } -bool RegionBand::IsInside(const Point& rPoint) const +bool RegionBand::Contains(const Point& rPoint) const { // search band list @@ -1241,7 +1241,7 @@ bool RegionBand::IsInside(const Point& rPoint) const if((pBand->mnYTop <= rPoint.Y()) && (pBand->mnYBottom >= rPoint.Y())) { // is point within separation of the band? - return pBand->IsInside(rPoint.X()); + return pBand->Contains(rPoint.X()); } pBand = pBand->mpNextBand; diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx index c8230fd02555..d6c0963b6c61 100644 --- a/vcl/source/graphic/GraphicObject.cxx +++ b/vcl/source/graphic/GraphicObject.cxx @@ -764,7 +764,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo { AnimationBitmap aAnimationBitmap( aAnim.Get( nFrame ) ); - if( !aCropRect.IsInside( tools::Rectangle(aAnimationBitmap.maPositionPixel, aAnimationBitmap.maSizePixel) ) ) + if( !aCropRect.Contains( tools::Rectangle(aAnimationBitmap.maPositionPixel, aAnimationBitmap.maSizePixel) ) ) { // setup actual cropping (relative to frame position) tools::Rectangle aCropRectRel( aCropRect ); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index f1aa776629eb..38517d54a8d1 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -813,13 +813,13 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, { bool bAppend = false; - if( aClip.IsOver( *it ) ) + if( aClip.Overlaps( *it ) ) bAppend = true; else if( rStr[ nIndex ] == ' ' && bInserted ) { std::vector< tools::Rectangle >::const_iterator next = it; ++next; - if( next != aTmp.end() && aClip.IsOver( *next ) ) + if( next != aTmp.end() && aClip.Overlaps( *next ) ) bAppend = true; } diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index fa17063fa0dd..047723ff1a9c 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -775,7 +775,7 @@ bool doesRectCoverWithUniformColor( { // shape needs to fully cover previous content, and have uniform // color - return (rMapModeVDev.LogicToPixel(rCurrRect).IsInside(rPrevRect) && + return (rMapModeVDev.LogicToPixel(rCurrRect).Contains(rPrevRect) && rMapModeVDev.IsFillColor()); } @@ -1511,7 +1511,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, !aTotalComponents.bIsFullyTransparent ) { if( !aBackgroundComponent.aComponentList.empty() && - !aBackgroundComponent.aBounds.IsInside(aTotalBounds) ) + !aBackgroundComponent.aBounds.Contains(aTotalBounds) ) { // it seems the background is not large enough. to // be on the safe side, combine with this component. @@ -1553,7 +1553,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // component. if( !aCurrCC->aBounds.IsEmpty() && !aCurrCC->bIsFullyTransparent && - aCurrCC->aBounds.IsOver( aTotalBounds ) ) + aCurrCC->aBounds.Overlaps( aTotalBounds ) ) { // union the intersecting aCCList element into aTotalComponents diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx index ae0928231f96..aa1b8cf20dba 100644 --- a/vcl/source/treelist/headbar.cxx +++ b/vcl/source/treelist/headbar.cxx @@ -668,7 +668,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos ) bool bNewOutDrag; tools::Rectangle aItemRect = ImplGetItemRect( nPos ); - bNewOutDrag = !aItemRect.IsInside( rMousePos ); + bNewOutDrag = !aItemRect.Contains( rMousePos ); // if needed switch on ItemDrag if ( bNewOutDrag && mbDragable && !mbItemDrag ) @@ -1151,7 +1151,7 @@ sal_uInt16 HeaderBar::GetItemId( sal_uInt16 nPos ) const sal_uInt16 HeaderBar::GetItemId( const Point& rPos ) const { for ( size_t i = 0, n = mvItemList.size(); i < n; ++i ) { - if ( ImplGetItemRect( i ).IsInside( rPos ) ) { + if ( ImplGetItemRect( i ).Contains( rPos ) ) { return GetItemId( i ); } } diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx index eafcc4c19859..175fcbb8ff33 100644 --- a/vcl/source/treelist/imap.cxx +++ b/vcl/source/treelist/imap.cxx @@ -201,7 +201,7 @@ IMapObjectType IMapRectangleObject::GetType() const bool IMapRectangleObject::IsHit( const Point& rPoint ) const { - return aRect.IsInside( rPoint ); + return aRect.Contains( rPoint ); } tools::Rectangle IMapRectangleObject::GetRectangle( bool bPixelCoords ) const @@ -458,7 +458,7 @@ IMapObjectType IMapPolygonObject::GetType() const bool IMapPolygonObject::IsHit( const Point& rPoint ) const { - return aPoly.IsInside( rPoint ); + return aPoly.Contains( rPoint ); } tools::Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 835ee2eac949..077e897a46a2 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -764,7 +764,7 @@ bool SvImpLBox::EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPosPixel, Point aPos( rPosPixel ); aPos -= m_pView->GetMapMode().GetOrigin(); - bRet = aRect.IsInside( aPos ); + bRet = aRect.Contains( aPos ); return bRet; } @@ -2898,7 +2898,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HelpEventMode::QUICK ) { Point aPos( m_pView->ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - if( !GetVisibleArea().IsInside( aPos )) + if( !GetVisibleArea().Contains( aPos )) return false; SvTreeListEntry* pEntry = GetEntry( aPos ); @@ -2925,7 +2925,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) tools::Rectangle aViewRect( GetVisibleArea() ); - if( bItemClipped || !aViewRect.IsInside( aItemRect ) ) + if( bItemClipped || !aViewRect.Contains( aItemRect ) ) { // clip the right edge of the item at the edge of the view //if( aItemRect.Right() > aViewRect.Right() ) diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index fd7a68c5d598..57f1ce2f36df 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -1065,7 +1065,7 @@ sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nC sal_Int32 nPos = 0; for (auto const& rectangle : aRects) { - if( rectangle.IsInside(_rPoint) ) + if( rectangle.Contains(_rPoint) ) return nPos; ++nPos; } diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 84d2f4f8aab8..069b1d9c95ce 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -1918,13 +1918,13 @@ bool SvTreeListBox::PosOverBody(const Point& rPos) const if (pImpl->m_aVerSBar->IsVisible()) { tools::Rectangle aRect(pImpl->m_aVerSBar->GetPosPixel(), pImpl->m_aVerSBar->GetSizePixel()); - if (aRect.IsInside(rPos)) + if (aRect.Contains(rPos)) return false; } if (pImpl->m_aHorSBar->IsVisible()) { tools::Rectangle aRect(pImpl->m_aHorSBar->GetPosPixel(), pImpl->m_aHorSBar->GetSizePixel()); - if (aRect.IsInside(rPos)) + if (aRect.Contains(rPos)) return false; } return true; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 76b07edbe9a4..95d508ce3597 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -175,17 +175,17 @@ BorderWindowHitTest ImplBorderWindowView::ImplHitTest( ImplBorderFrameData const { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; - if ( pData->maTitleRect.IsInside( rPos ) ) + if ( pData->maTitleRect.Contains( rPos ) ) { - if ( pData->maCloseRect.IsInside( rPos ) ) + if ( pData->maCloseRect.Contains( rPos ) ) return BorderWindowHitTest::Close; - else if ( pData->maMenuRect.IsInside( rPos ) ) + else if ( pData->maMenuRect.Contains( rPos ) ) return BorderWindowHitTest::Menu; - else if ( pData->maDockRect.IsInside( rPos ) ) + else if ( pData->maDockRect.Contains( rPos ) ) return BorderWindowHitTest::Dock; - else if ( pData->maHideRect.IsInside( rPos ) ) + else if ( pData->maHideRect.Contains( rPos ) ) return BorderWindowHitTest::Hide; - else if ( pData->maHelpRect.IsInside( rPos ) ) + else if ( pData->maHelpRect.Contains( rPos ) ) return BorderWindowHitTest::Help; else return BorderWindowHitTest::Title; @@ -974,7 +974,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) if ( maFrameData.mnHitTest & BorderWindowHitTest::Close ) { - if ( maFrameData.maCloseRect.IsInside( aMousePos ) ) + if ( maFrameData.maCloseRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnCloseState & DrawButtonFlags::Pressed) ) { @@ -993,7 +993,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Dock ) { - if ( maFrameData.maDockRect.IsInside( aMousePos ) ) + if ( maFrameData.maDockRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnDockState & DrawButtonFlags::Pressed) ) { @@ -1012,7 +1012,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Menu ) { - if ( maFrameData.maMenuRect.IsInside( aMousePos ) ) + if ( maFrameData.maMenuRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnMenuState & DrawButtonFlags::Pressed) ) { @@ -1031,7 +1031,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Hide ) { - if ( maFrameData.maHideRect.IsInside( aMousePos ) ) + if ( maFrameData.maHideRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnHideState & DrawButtonFlags::Pressed) ) { @@ -1050,7 +1050,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Help ) { - if ( maFrameData.maHelpRect.IsInside( aMousePos ) ) + if ( maFrameData.maHelpRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnHelpState & DrawButtonFlags::Pressed) ) { diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index a03e2146d944..645aa8dc19e5 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -179,7 +179,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl, void*, void) aBorderRect.AdjustRight( -nRight ); PointerState aBorderState = pBorder->GetPointerState(); - bRealMove = aBorderRect.IsInside( aBorderState.maPos ); + bRealMove = aBorderRect.Contains( aBorderState.maPos ); } } diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 1c4106ba109b..bc6e2f0f8f42 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -118,7 +118,7 @@ bool Window::EventNotify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); + bool bHit = pWrapper->GetDragArea().Contains( pMEvt->GetPosPixel() ); if ( pMEvt->IsLeft() ) { if (!bDockingSupportCrippled && pMEvt->IsMod1() && (pMEvt->GetClicks() == 2)) @@ -138,7 +138,7 @@ bool Window::EventNotify( NotifyEvent& rNEvt ) else if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); + bool bHit = pWrapper->GetDragArea().Contains( pMEvt->GetPosPixel() ); if ( pMEvt->IsLeft() ) { // check if a single click initiated this sequence ( ImplStartDockingEnabled() ) diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 0b333f87df76..d218e243f862 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -563,7 +563,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const // the top-left corner in output coordinates ie (0,0) tools::Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( tools::Rectangle( Point(), pBorderWin->GetSizePixel()) ) ) ; - if ( devRect.IsInside( aAbsolute ) ) + if ( devRect.Contains( aAbsolute ) ) { // inside the window return pWin; @@ -573,7 +573,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const // toolbox item or similar) // note: maFloatRect is set in FloatingWindow::StartPopupMode() and // is already in absolute device coordinates - if ( pWin->maFloatRect.IsInside( aAbsolute ) ) + if ( pWin->maFloatRect.Contains( aAbsolute ) ) { rbHitTestInsideRect = true; return pWin; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 4c38928b37f0..4d25a0671836 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1569,7 +1569,7 @@ class DisclosureButton final : public CheckBox nState |= ControlState::DEFAULT; if (Window::IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && GetMouseRect().IsInside(GetPointerPosPixel())) + if (IsMouseOver() && GetMouseRect().Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; if (rRenderContext.DrawNativeControl(ControlType::ListNode, ControlPart::Entire, aCtrlRegion, diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index e77402ea600e..f443509af71d 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -61,14 +61,14 @@ WindowHitTest Window::ImplHitTest( const Point& rFramePos ) const OutputDevice *pOutDev = GetOutDev(); pOutDev->ReMirror( aFramePos ); } - if ( !GetOutputRectPixel().IsInside( aFramePos ) ) + if ( !GetOutputRectPixel().Contains( aFramePos ) ) return WindowHitTest::NONE; if ( mpWindowImpl->mbWinRegion ) { Point aTempPos = aFramePos; aTempPos.AdjustX( -GetOutDev()->mnOutOffX ); aTempPos.AdjustY( -GetOutDev()->mnOutOffY ); - if ( !mpWindowImpl->maWinRegion.IsInside( aTempPos ) ) + if ( !mpWindowImpl->maWinRegion.Contains( aTempPos ) ) return WindowHitTest::NONE; } @@ -86,7 +86,7 @@ bool Window::ImplTestMousePointerSet() // if the mouse is over the window, switch it tools::Rectangle aClientRect( Point( 0, 0 ), GetOutputSizePixel() ); - return aClientRect.IsInside( GetPointerPosPixel() ); + return aClientRect.Contains( GetPointerPosPixel() ); } PointerStyle Window::ImplGetMousePointer() const diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index ed4e68b23c73..88e1c1a5f6dd 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -55,7 +55,7 @@ SelectionEngine::~SelectionEngine() IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog, Timer *, void) { - if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) + if ( !aArea.Contains( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); } @@ -322,7 +322,7 @@ bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) aLastMove = rMEvt; // if the mouse is outside the area, the frequency of // SetCursorAtPoint() is only set by the Timer - if( aWTimer.IsActive() && !aArea.IsInside( rMEvt.GetPosPixel() )) + if( aWTimer.IsActive() && !aArea.Contains( rMEvt.GetPosPixel() )) return true; aWTimer.SetTimeout( nUpdateInterval ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index ed32ca8f44fd..fa3cada9ecfa 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -330,7 +330,7 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos, aRect.AdjustLeft( -(pSet->mnSplitSize) ); } - if ( aRect.IsInside( rPos ) ) + if ( aRect.Contains( rPos ) ) { if ( rItem.mpSet && !rItem.mpSet->mvItems.empty() ) { @@ -1468,7 +1468,7 @@ void SplitWindow::ImplDrawGrip(vcl::RenderContext& rRenderContext, const tools:: Color aColor; - if (rRect.IsInside(GetPointerPosPixel())) + if (rRect.Contains(GetPointerPosPixel())) { vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, 2, false, false, false); @@ -1813,7 +1813,7 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) mbFadeNoButtonMode = false; ImplGetFadeOutRect( aTestRect ); - if ( aTestRect.IsInside( aMousePosPixel ) ) + if ( aTestRect.Contains( aMousePosPixel ) ) { mbFadeOutDown = true; mbFadeOutPressed = true; @@ -1822,7 +1822,7 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) else { ImplGetFadeInRect( aTestRect, true ); - if ( aTestRect.IsInside( aMousePosPixel ) ) + if ( aTestRect.Contains( aMousePosPixel ) ) { mbFadeInDown = true; mbFadeInPressed = true; @@ -1858,8 +1858,8 @@ void SplitWindow::MouseMove( const MouseEvent& rMEvt ) ImplGetFadeInRect( aFadeInRect ); ImplGetFadeOutRect( aFadeOutRect ); - if ( !aFadeInRect.IsInside( aPos ) && - !aFadeOutRect.IsInside( aPos ) ) + if ( !aFadeInRect.Contains( aPos ) && + !aFadeOutRect.Contains( aPos ) ) { if ( nSplitTest && !(nSplitTest & SPLIT_NOSPLIT) ) { @@ -1895,7 +1895,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { tools::Rectangle aTestRect; ImplGetFadeInRect( aTestRect, true ); - bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); + bool bNewPressed = aTestRect.Contains( aMousePosPixel ); if ( bNewPressed != mbFadeInPressed ) { mbFadeInPressed = bNewPressed; @@ -1921,7 +1921,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { tools::Rectangle aTestRect; ImplGetFadeOutRect( aTestRect ); - bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); + bool bNewPressed = aTestRect.Contains( aMousePosPixel ); if ( !bNewPressed ) { mbFadeOutPressed = bNewPressed; @@ -2035,9 +2035,9 @@ bool SplitWindow::PreNotify( NotifyEvent& rNEvt ) ImplGetFadeInRect( aFadeInRect ); ImplGetFadeOutRect( aFadeOutRect ); - if ( aFadeInRect.IsInside( GetPointerPosPixel() ) != aFadeInRect.IsInside( GetLastPointerPosPixel() ) ) + if ( aFadeInRect.Contains( GetPointerPosPixel() ) != aFadeInRect.Contains( GetLastPointerPosPixel() ) ) Invalidate( aFadeInRect ); - if ( aFadeOutRect.IsInside( GetPointerPosPixel() ) != aFadeOutRect.IsInside( GetLastPointerPosPixel() ) ) + if ( aFadeOutRect.Contains( GetPointerPosPixel() ) != aFadeOutRect.Contains( GetLastPointerPosPixel() ) ) Invalidate( aFadeOutRect ); if( pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow() ) @@ -2086,12 +2086,12 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) TranslateId pHelpResId; ImplGetFadeInRect( aHelpRect, true ); - if ( aHelpRect.IsInside( aMousePosPixel ) ) + if ( aHelpRect.Contains( aMousePosPixel ) ) pHelpResId = SV_HELPTEXT_FADEIN; else { ImplGetFadeOutRect( aHelpRect ); - if ( aHelpRect.IsInside( aMousePosPixel ) ) + if ( aHelpRect.Contains( aMousePosPixel ) ) pHelpResId = SV_HELPTEXT_FADEOUT; } diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 3a04e3c8f8d1..928c456eee93 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -569,7 +569,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags ) if ( pWindow == this ) break; tools::Rectangle aCompRect = pWindow->GetOutputRectPixel(); - if ( aWinRect.IsOver( aCompRect ) ) + if ( aWinRect.Overlaps( aCompRect ) ) pWindow->Invalidate( InvalidateFlags::Children | InvalidateFlags::NoTransparent ); pWindow = pWindow->mpWindowImpl->mpNext; } @@ -581,7 +581,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags ) if ( pWindow != this ) { tools::Rectangle aCompRect = pWindow->GetOutputRectPixel(); - if ( aWinRect.IsOver( aCompRect ) ) + if ( aWinRect.Overlaps( aCompRect ) ) { Invalidate( InvalidateFlags::Children | InvalidateFlags::NoTransparent ); break; diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 4be4b722111d..48694de7b777 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -665,7 +665,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) { ImplStatusItem* pItem = mvItemList[ i ].get(); // check item for being clicked - if ( ImplGetItemRectPos( sal_uInt16(i) ).IsInside( aMousePos ) ) + if ( ImplGetItemRectPos( sal_uInt16(i) ).Contains( aMousePos ) ) { mnCurItemId = pItem->mnId; if ( rMEvt.GetClicks() == 2 ) @@ -1030,7 +1030,7 @@ sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const { // get rectangle tools::Rectangle aRect = ImplGetItemRectPos( nPos ); - if ( aRect.IsInside( rPos ) ) + if ( aRect.Contains( rPos ) ) return mvItemList[ nPos ]->mnId; } } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index ee1359ca0491..ea731d784a7d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2882,7 +2882,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) { // is the cursor over the item? ImplToolItem* pItem = &mpData->m_aItems[mnCurPos]; - if ( pItem->maRect.IsInside( aMousePos ) ) + if ( pItem->maRect.Contains( aMousePos ) ) { if ( !mnCurItemId ) { @@ -2910,7 +2910,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) if ( mbUpper ) { - bool bNewIn = maUpperRect.IsInside( aMousePos ); + bool bNewIn = maUpperRect.Contains( aMousePos ); if ( bNewIn != mbIn ) { mbIn = bNewIn; @@ -2921,7 +2921,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) if ( mbLower ) { - bool bNewIn = maLowerRect.IsInside( aMousePos ); + bool bNewIn = maLowerRect.Contains( aMousePos ); if ( bNewIn != mbIn ) { mbIn = bNewIn; @@ -2961,7 +2961,7 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) if( mnCurPos < mpData->m_aItems.size() ) { ImplToolItem* pItem = &mpData->m_aItems[mnCurPos]; - if ( pItem->maRect.IsInside( rMEvt.GetPosPixel() ) ) + if ( pItem->maRect.Contains( rMEvt.GetPosPixel() ) ) { mnCurItemId = pItem->mnId; if ( !bCancel ) @@ -3080,7 +3080,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) // change mouse cursor over drag area ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); - if( pWrapper && pWrapper->GetDragArea().IsInside( rMEvt.GetPosPixel() ) ) + if( pWrapper && pWrapper->GetDragArea().Contains( rMEvt.GetPosPixel() ) ) eStyle = PointerStyle::Move; if ( (mnWinStyle & TB_WBLINESIZING) == TB_WBLINESIZING ) @@ -3113,7 +3113,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) ImplToolItems::size_type nTempPos = 0; for (auto const& item : mpData->m_aItems) { - if ( item.maRect.IsInside( aMousePos ) ) + if ( item.maRect.Contains( aMousePos ) ) { if ( (item.meType == ToolBoxItemType::BUTTON) && item.mbEnabled ) { @@ -3145,7 +3145,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) } // only clear highlight when focus is not in toolbar - bool bMenuButtonHit = mpData->maMenubuttonItem.maRect.IsInside( aMousePos ) && ImplHasClippedItems(); + bool bMenuButtonHit = mpData->maMenubuttonItem.maRect.Contains( aMousePos ) && ImplHasClippedItems(); if ( !HasFocus() && (bClearHigh || bMenuButtonHit) ) { if ( !bMenuButtonHit && mpData->mbMenubuttonSelected ) @@ -3208,7 +3208,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) for (auto const& item : mpData->m_aItems) { // is this the item? - if ( item.maRect.IsInside( aMousePos ) ) + if ( item.maRect.Contains( aMousePos ) ) { // do nothing if it is a separator or // if the item has been disabled @@ -3259,7 +3259,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) if( mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWN ) { if( ( (mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWNONLY) == ToolBoxItemBits::DROPDOWNONLY) - || mpData->m_aItems[nNewPos].GetDropDownRect( mbHorz ).IsInside( aMousePos )) + || mpData->m_aItems[nNewPos].GetDropDownRect( mbHorz ).Contains( aMousePos )) { // dropdownonly always triggers the dropdown handler, over the whole button area @@ -3307,7 +3307,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) Deactivate(); // menu button hit ? - if( mpData->maMenubuttonItem.maRect.IsInside( aMousePos ) && ImplHasClippedItems() ) + if( mpData->maMenubuttonItem.maRect.Contains( aMousePos ) && ImplHasClippedItems() ) { if ( maMenuButtonHdl.IsSet() ) maMenuButtonHdl.Call( this ); @@ -3317,7 +3317,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) } // check scroll- and next-buttons here - if ( maUpperRect.IsInside( aMousePos ) ) + if ( maUpperRect.Contains( aMousePos ) ) { if ( mnCurLine > 1 ) { @@ -3328,7 +3328,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) } return; } - if ( maLowerRect.IsInside( aMousePos ) ) + if ( maLowerRect.Contains( aMousePos ) ) { if ( mnCurLine+mnVisLines-1 < mnCurLines ) { @@ -3468,7 +3468,7 @@ void ToolBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& ImplToolItem* pItem = &mpData->m_aItems[i]; // only draw when the rectangle is in the draw rectangle - if ( !pItem->maRect.IsEmpty() && rPaintRect.IsOver( pItem->maRect ) ) + if ( !pItem->maRect.IsEmpty() && rPaintRect.Overlaps( pItem->maRect ) ) { sal_uInt16 nHighlight = 0; if ( i == mnCurPos ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 5b3cb621a28a..ad4668e6ce86 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -732,7 +732,7 @@ ToolBox::ImplToolItems::size_type ToolBox::GetItemPos( const Point& rPos ) const { // search the item position on the given point auto it = std::find_if(mpData->m_aItems.begin(), mpData->m_aItems.end(), - [&rPos](const ImplToolItem& rItem) { return rItem.maRect.IsInside( rPos ); }); + [&rPos](const ImplToolItem& rItem) { return rItem.maRect.Contains( rPos ); }); if( it != mpData->m_aItems.end() ) return std::distance(mpData->m_aItems.begin(), it); @@ -749,7 +749,7 @@ ToolBoxItemId ToolBox::GetItemId( const Point& rPos ) const { // find item that was clicked auto it = std::find_if(mpData->m_aItems.begin(), mpData->m_aItems.end(), - [&rPos](const ImplToolItem& rItem) { return rItem.maRect.IsInside( rPos ); }); + [&rPos](const ImplToolItem& rItem) { return rItem.maRect.Contains( rPos ); }); if( (it != mpData->m_aItems.end()) && (it->meType == ToolBoxItemType::BUTTON) ) return it->mnId; @@ -1316,7 +1316,7 @@ bool ToolBox::IsItemReallyVisible( ToolBoxItemId nItemId ) const ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem && pItem->mbVisible && - !pItem->maRect.IsEmpty() && aRect.IsOver( pItem->maRect ) ) + !pItem->maRect.IsEmpty() && aRect.Overlaps( pItem->maRect ) ) { bRet = true; } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index fe6f465b90b6..c81272434136 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -1446,7 +1446,7 @@ void WMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool bVert Point aMed( aTL.X() + rGeom.nWidth/2, aTL.Y() + rGeom.nHeight/2 ); const std::vector< tools::Rectangle >& rScreens = m_pSalDisplay->GetXineramaScreens(); for(const auto & rScreen : rScreens) - if( rScreen.IsInside( aMed ) ) + if( rScreen.Contains( aMed ) ) { aTL += rScreen.TopLeft(); aScreenSize = rScreen.GetSize(); @@ -1960,7 +1960,7 @@ void NetWMAdaptor::showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const Point aMousePoint( root_x, root_y ); for(const auto & rScreen : rScreens) { - if( rScreen.IsInside( aMousePoint ) ) + if( rScreen.Contains( aMousePoint ) ) { pFrame->maGeometry.nX = rScreen.Left(); pFrame->maGeometry.nY = rScreen.Top(); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a47ed1c645fa..d08bd9dbe2c3 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -542,7 +542,7 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen &root_x, &root_y, &lx, &ly, &mask ); const std::vector< tools::Rectangle >& rScreens = GetDisplay()->GetXineramaScreens(); for(const auto & rScreen : rScreens) - if( rScreen.IsInside( Point( root_x, root_y ) ) ) + if( rScreen.Contains( Point( root_x, root_y ) ) ) { x = rScreen.Left(); y = rScreen.Top(); @@ -1463,7 +1463,7 @@ void X11SalFrame::Center( ) &mask ); const std::vector< tools::Rectangle >& rScreens = GetDisplay()->GetXineramaScreens(); for(const auto & rScreen : rScreens) - if( rScreen.IsInside( Point( root_x, root_y ) ) ) + if( rScreen.Contains( Point( root_x, root_y ) ) ) { nScreenX = rScreen.Left(); nScreenY = rScreen.Top(); @@ -1553,7 +1553,7 @@ void X11SalFrame::updateScreenNumber() size_t nScreens = rScreenRects.size(); for( size_t i = 0; i < nScreens; i++ ) { - if( rScreenRects[i].IsInside( aPoint ) ) + if( rScreenRects[i].Contains( aPoint ) ) { maGeometry.nDisplayScreenNumber = static_cast<unsigned int>(i); break; diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 259a1395a3b2..89d1d10c6961 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -897,7 +897,7 @@ void WinSalFrame::updateScreenNumber() size_t nMon = rMonitors.size(); for( size_t i = 0; i < nMon; i++ ) { - if( rMonitors[i].m_aArea.IsInside( aPoint ) ) + if( rMonitors[i].m_aArea.Contains( aPoint ) ) { mnDisplay = static_cast<sal_Int32>(i); maGeometry.nDisplayScreenNumber = static_cast<unsigned int>(i); @@ -1769,7 +1769,7 @@ void WinSalFrame::SetScreenNumber( unsigned int nNewScreen ) Point aCurPos( maGeometry.nX, maGeometry.nY ); for( size_t i = 0; i < nMon; i++ ) { - if( rMonitors[i].m_aArea.IsInside( aCurPos ) ) + if( rMonitors[i].m_aArea.Contains( aCurPos ) ) { aOldMonPos = rMonitors[i].m_aArea.TopLeft(); break; @@ -3096,7 +3096,7 @@ static bool ImplHandleMouseMsg( HWND hWnd, UINT nMsg, if (const auto& pHelpWin = ImplGetSVHelpData().mpHelpWin) { const tools::Rectangle& rHelpRect = pHelpWin->GetHelpArea(); - if (rHelpRect.IsInside(Point(aPt.x, aPt.y))) + if (rHelpRect.Contains(Point(aPt.x, aPt.y))) { // We have entered a tooltip (help window). Don't call the handler here; it // would launch the sequence "Mouse leaves the Control->Control redraws-> diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 691ef192858f..27a91e91973f 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1577,7 +1577,7 @@ bool DemoRenderer::MouseButtonDown(const MouseEvent& rMEvt) std::vector<tools::Rectangle> aRegions(partition(GetSizePixel(), mnSegmentsX, mnSegmentsY)); for (size_t i = 0; i < aRegions.size(); i++) { - if (aRegions[i].IsInside(rMEvt.GetPosPixel())) + if (aRegions[i].Contains(rMEvt.GetPosPixel())) { mnSelectedRenderer = i; Invalidate(); |