diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-09-21 08:53:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-21 11:19:07 +0200 |
| commit | 061c7e3994eb5288e95d7fb0ce7a1bc0f54205ed (patch) | |
| tree | bb0ccd81ccdaf4997ef890e03b4dd7ffa694e109 | |
| parent | 51375b48378915b6e95c1ac26b2ccf8e39880f7e (diff) | |
fix !HAVE_FEATURE_DESKTOP build, IsOver->Overlaps
and change some commented out cases
Change-Id: Icc60b19de7d12a78e7d40e7aa94dae40dc8b60a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122378
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/contact/objectcontactofpageview.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/txtfly.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index b5e806e379dd..e2d0d011092d 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -693,7 +693,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint Rectangle aNewPos(aNewVisCells); - if (aNewVisCells.IsOver(maVisCells)) + if (aNewVisCells.Overlaps(maVisCells)) aNewPos.Union(maVisCells); else CommitTableModelChange(maVisCells.Top(), maVisCells.Left(), maVisCells.Bottom(), maVisCells.Right(), AccessibleTableModelChangeType::UPDATE); diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 1e8a95448d78..fca0d7c85a03 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -258,7 +258,7 @@ namespace sdr::contact for (sal_Int32 i = 0; i < nObjCount; ++i) { SdrObject* pObject = GetSdrPage()->GetObj(i); - if (rRedrawArea.IsOver(pObject->GetCurrentBoundRect())) + if (rRedrawArea.Overlaps(pObject->GetCurrentBoundRect())) { bGetHierarchy = true; break; diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 05ab2d873b86..f1b9886906e0 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -1123,7 +1123,7 @@ void SwTextFly::CalcRightMargin( SwRect &rFly, // and protrudes into the same line. // Flys with run-through are invisible for those below, i.e., they // are ignored for computing the margins of other Flys. - // 3301: pNext->getFrameArea().IsOver( rLine ) is necessary + // 3301: pNext->getFrameArea().Overlaps( rLine ) is necessary // #i68520# css::text::WrapTextMode eSurroundForTextWrap; @@ -1214,7 +1214,7 @@ void SwTextFly::CalcLeftMargin( SwRect &rFly, // and protrudes into the same line. // Flys with run-through are invisible for those below, i.e., they // are ignored for computing the margins of other Flys. - // 3301: pNext->getFrameArea().IsOver( rLine ) is necessary + // 3301: pNext->getFrameArea().Overlaps( rLine ) is necessary // #i68520# SwAnchoredObjList::size_type nMyPos = nFlyPos; |