include/svx/frmsel.hxx | 6 ++---- svx/source/dialog/frmsel.cxx | 19 +++++++++---------- svx/source/inc/frmselimpl.hxx | 11 ----------- 3 files changed, 11 insertions(+), 25 deletions(-)
New commits: commit 9f8bb3225285cd0a1a0ddadb74d37599e5d69725 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jul 3 13:39:21 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jul 4 06:36:34 2025 +0200 svx: Drop FrameBorderCIter, use range-based for instead See also previous commit Change-Id: I2314879f3d117723f0940708f1ba6cf0548d8e54 Author: Michael Weghorn <[email protected]> Date: Thu Jul 3 13:16:44 2025 +0200 svx: Drop FrameBorderIter, use range-based for instead that did likewise for FrameBorderIter. Change-Id: I4799f02cfbd7000f063903452c932ac392326067 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187323 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index f8fbff305d5e..4a7cdf7ea012 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -565,8 +565,8 @@ void FrameSelectorImpl::DrawBackground() // draw the white space for enabled frame borders tools::PolyPolygon aPPoly; - for( FrameBorderCIter aIt( maEnabBorders ); aIt.Is(); ++aIt ) - (*aIt)->MergeFocusToPolyPolygon( aPPoly ); + for (const FrameBorder* pBorder : maEnabBorders) + pBorder->MergeFocusToPolyPolygon(aPPoly); aPPoly.Optimize( PolyOptimizeFlags::CLOSE ); mpVirDev->SetLineColor( maBackCol ); mpVirDev->SetFillColor( maBackCol ); @@ -709,8 +709,8 @@ void FrameSelectorImpl::DrawAllFrameBorders() void FrameSelectorImpl::DrawVirtualDevice() { DrawBackground(); - for(FrameBorderCIter aIt(maEnabBorders); aIt.Is(); ++aIt) - DrawArrows(**aIt); + for (const FrameBorder* pBorder : maEnabBorders) + DrawArrows(*pBorder); DrawAllFrameBorders(); mbFullRepaint = false; } diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index a1b768ad6a4b..ac63dba8fbf0 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -213,13 +213,6 @@ struct FrameSelectorImpl bool SelectedBordersEqual() const; }; - -/** Dummy predicate for frame border iterators to use all borders in a container. */ -struct FrameBorderDummy_Pred -{ - bool operator()( const FrameBorder* ) const { return true; } -}; - /** Predicate for frame border iterators to use only visible borders in a container. */ struct FrameBorderVisible_Pred { @@ -253,10 +246,6 @@ private: Pred maPred; }; -/** Iterator for constant svx::FrameBorder containers, iterates over all borders. */ -typedef FrameBorderIterBase< const FrameBorderPtrVec, FrameBorderPtrVec::const_iterator, FrameBorderDummy_Pred > - FrameBorderCIter; - /** Iterator for constant svx::FrameBorder containers, iterates over visible borders. */ typedef FrameBorderIterBase< const FrameBorderPtrVec, FrameBorderPtrVec::const_iterator, FrameBorderVisible_Pred > VisFrameBorderCIter; commit ed4ac8b825939dca6cb56e55b030ace476f5005b Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jul 3 13:37:23 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jul 4 06:36:28 2025 +0200 svx: Use std::any_of instead of FrameBorderCIter Change-Id: I96df7d8ae7fede2cab2351f168f478ff3532d390 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187322 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 3f273cbaefa1..f8fbff305d5e 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -916,10 +916,9 @@ void FrameSelector::SetBorderDontCare( FrameBorderType eBorder ) bool FrameSelector::IsAnyBorderVisible() const { - bool bIsSet = false; - for( FrameBorderCIter aIt( mxImpl->maEnabBorders ); !bIsSet && aIt.Is(); ++aIt ) - bIsSet = ((*aIt)->GetState() == FrameBorderState::Show); - return bIsSet; + return std::any_of(mxImpl->maEnabBorders.begin(), mxImpl->maEnabBorders.end(), + [](const FrameBorder* pBorder) + { return pBorder->GetState() == FrameBorderState::Show; }); } void FrameSelector::HideAllBorders() commit a005eb68644620d487c9f17c340d6d9b6505cb96 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jul 3 13:32:41 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jul 4 06:36:23 2025 +0200 svx a11y: Return OAccessible in FrameSelector::GetChildAccessible ... instead of the abstract XAccessible interface. Change-Id: Iad9cfe44c4af0e6387bdfffd3245c10c1198ea7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187321 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index efd1c3b7b0e6..1778942fb7d0 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -165,11 +165,9 @@ public: rtl::Reference< a11y::AccFrameSelectorChild > GetChildAccessible( FrameBorderType eBorder ); /** Returns the accessibility child object with specified index (counts enabled frame borders only). */ - css::uno::Reference< css::accessibility::XAccessible > - GetChildAccessible( sal_Int32 nIndex ); + rtl::Reference<comphelper::OAccessible> GetChildAccessible(sal_Int32 nIndex); /** Returns the accessibility child object at the specified position (relative to control). */ - css::uno::Reference< css::accessibility::XAccessible > - GetChildAccessible( const Point& rPos ); + rtl::Reference<comphelper::OAccessible> GetChildAccessible(const Point& rPos); /** Returns the bounding rectangle of the specified frame border (if enabled). */ tools::Rectangle GetClickBoundRect( FrameBorderType eBorder ) const; diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 16cc40c3c838..3f273cbaefa1 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1065,12 +1065,12 @@ rtl::Reference< a11y::AccFrameSelectorChild > FrameSelector::GetChildAccessible( return xRet; } -Reference< XAccessible > FrameSelector::GetChildAccessible( sal_Int32 nIndex ) +rtl::Reference<comphelper::OAccessible> FrameSelector::GetChildAccessible(sal_Int32 nIndex) { return GetChildAccessible( GetEnabledBorderType( nIndex ) ); } -Reference< XAccessible > FrameSelector::GetChildAccessible( const Point& rPos ) +rtl::Reference<comphelper::OAccessible> FrameSelector::GetChildAccessible(const Point& rPos) { for (const FrameBorder* pBorder : mxImpl->maEnabBorders) {
