This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch compilers-101 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4e4b0871be93eb9b1b3228a91dd98955ef071d30 Author: Pedro F. Giffuni <[email protected]> AuthorDate: Fri Nov 6 00:32:18 2026 -0500 Boost modernization Phase 3 continued: boost::bind to C++14 lambdas (~20 more files) - Replace boost::bind with C++14 lambdas in: - sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx (Layer::Validate, RepaintRectangle, Repaint, Resize, Dispose, ValidateRectangle, ILayerPainter::Paint) - sd/source/ui/slidesorter/view/SlsButtonBar.cxx (AnimationFunction::Blend, ApplyButtonAlphaChange, SetButtonAlphaAnimationId) - Remove #include <boost/bind.hpp> where no longer needed --- .../sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 81 +++++++++++----------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 3bb2aa0867..2e42c7973c 100644 --- a/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -49,7 +49,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/numeric/ftools.hxx> #include <com/sun/star/presentation/XPresentation2.hpp> -#include <boost/bind.hpp> +#include <memory> using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; @@ -66,7 +66,7 @@ class ButtonBar::BackgroundTheme { public: BackgroundTheme( - const ::boost::shared_ptr<Theme>& rpTheme, + const ::std::shared_ptr<Theme>& rpTheme, const ::std::vector<SharedButton>& rButtons); /** Set the preview bounding box, the maximal area in which to display buttons. A call to this method triggers a call to Layout(). @@ -81,7 +81,7 @@ public: virtual Rectangle GetButtonArea (void) = 0; protected: - ::boost::shared_ptr<Theme> mpTheme; + ::std::shared_ptr<Theme> mpTheme; Rectangle maPreviewBoundingBox; Size maMinimumLargeButtonAreaSize; Size maMinimumMediumButtonAreaSize; @@ -102,7 +102,7 @@ namespace { { public: RectangleBackgroundTheme( - const ::boost::shared_ptr<Theme>& rpTheme, + const ::std::shared_ptr<Theme>& rpTheme, const ::std::vector<SharedButton>& rButtons); virtual BitmapEx CreateBackground ( const OutputDevice& rTemplateDevice, @@ -123,7 +123,7 @@ namespace { { public: BitmapBackgroundTheme( - const ::boost::shared_ptr<Theme>& rpTheme, + const ::std::shared_ptr<Theme>& rpTheme, const ::std::vector<SharedButton>& rButtons); virtual BitmapEx CreateBackground ( const OutputDevice& rTemplateDevice, @@ -359,18 +359,18 @@ sal_Int32 ButtonBar::GetButtonCount (const bool bIsExcluded) const -::boost::shared_ptr<Button> ButtonBar::GetButton ( +::std::shared_ptr<Button> ButtonBar::GetButton ( const bool bIsExcluded, const sal_Int32 nIndex) const { - const ::std::vector<boost::shared_ptr<Button> >& rButtons (bIsExcluded + const ::std::vector<std::shared_ptr<Button> >& rButtons (bIsExcluded ? maExcludedButtons : maRegularButtons); if (nIndex<0 || sal_uInt32(nIndex)>=rButtons.size()) { OSL_ASSERT(nIndex<0 || sal_uInt32(nIndex)>=rButtons.size()); - return ::boost::shared_ptr<Button>(); + return ::std::shared_ptr<Button>(); } else return rButtons[sal_uInt32(nIndex)]; @@ -688,12 +688,12 @@ bool ButtonBar::IsVisible (const model::SharedPageDescriptor& rpDescriptor) void ButtonBar::HandleDataChangeEvent (void) { maExcludedButtons.clear(); - maExcludedButtons.push_back(::boost::shared_ptr<Button>(new UnhideButton(mrSlideSorter))); + maExcludedButtons.push_back(::std::shared_ptr<Button>(new UnhideButton(mrSlideSorter))); maRegularButtons.clear(); - maRegularButtons.push_back(::boost::shared_ptr<Button>(new StartShowButton(mrSlideSorter))); - maRegularButtons.push_back(::boost::shared_ptr<Button>(new HideButton(mrSlideSorter))); - maRegularButtons.push_back(::boost::shared_ptr<Button>(new DuplicateButton(mrSlideSorter))); + maRegularButtons.push_back(::std::shared_ptr<Button>(new StartShowButton(mrSlideSorter))); + maRegularButtons.push_back(::std::shared_ptr<Button>(new HideButton(mrSlideSorter))); + maRegularButtons.push_back(::std::shared_ptr<Button>(new DuplicateButton(mrSlideSorter))); mpBackgroundTheme.reset( new BitmapBackgroundTheme( @@ -725,18 +725,18 @@ void ButtonBar::StartFadeAnimation ( // Prepare the blending functors that translate [0,1] animation // times into alpha values of buttons and button bar. - const ::boost::function<double(double)> aButtonBlendFunctor ( - ::boost::bind( - controller::AnimationFunction::Blend, - nCurrentButtonAlpha, - nTargetAlpha, - ::boost::bind(controller::AnimationFunction::Linear, _1))); - const ::boost::function<double(double)> aButtonBarBlendFunctor ( - ::boost::bind( - controller::AnimationFunction::Blend, - nCurrentButtonBarAlpha, - nTargetAlpha, - ::boost::bind(controller::AnimationFunction::Linear, _1))); + const std::function<double(double)> aButtonBlendFunctor ( + [nCurrentButtonAlpha, nTargetAlpha](double t) { + return controller::AnimationFunction::Blend( + nCurrentButtonAlpha, nTargetAlpha, + controller::AnimationFunction::Linear( t )); + }); + const std::function<double(double)> aButtonBarBlendFunctor ( + [nCurrentButtonBarAlpha, nTargetAlpha](double t) { + return controller::AnimationFunction::Blend( + nCurrentButtonBarAlpha, nTargetAlpha, + controller::AnimationFunction::Linear( t )); + }); // Delay the fade in a little bit when the buttons are not visible at // all so that we do not leave a trail of half-visible buttons when the @@ -752,19 +752,20 @@ void ButtonBar::StartFadeAnimation ( : Theme::Integer_ButtonFadeOutDuration)); pDescriptor->GetVisualState().SetButtonAlphaAnimationId( mrSlideSorter.GetController().GetAnimator()->AddAnimation( - ::boost::bind( - controller::AnimationFunction::ApplyButtonAlphaChange, - pDescriptor, - ::boost::ref(mrSlideSorter.GetView()), - ::boost::bind(aButtonBlendFunctor, _1), - ::boost::bind(aButtonBarBlendFunctor, _1)), + [pDescriptor, &mrSlideSorter, &aButtonBlendFunctor, &aButtonBarBlendFunctor](double t) { + return controller::AnimationFunction::ApplyButtonAlphaChange( + pDescriptor, + mrSlideSorter.GetView(), + aButtonBlendFunctor( t ), + aButtonBarBlendFunctor( t )); + }, nDelay, nDuration, - ::boost::bind( - &model::VisualState::SetButtonAlphaAnimationId, - ::boost::ref(pDescriptor->GetVisualState()), - controller::Animator::NotAnAnimationId) - )); + [&pDescriptor]() { + pDescriptor->GetVisualState().SetButtonAlphaAnimationId( + controller::Animator::NotAnAnimationId); + } + )); } @@ -795,7 +796,7 @@ void ButtonBar::ReleaseLock (void) //===== BackgroundTheme ===================================================== ButtonBar::BackgroundTheme::BackgroundTheme ( - const ::boost::shared_ptr<Theme>& rpTheme, + const ::std::shared_ptr<Theme>& rpTheme, const ::std::vector<SharedButton>& rButtons) : mpTheme(rpTheme) { @@ -866,7 +867,7 @@ Button::IconSize ButtonBar::BackgroundTheme::GetIconSize (void) const //===== RectangleBackgroundTheme ============================================ RectangleBackgroundTheme::RectangleBackgroundTheme ( - const ::boost::shared_ptr<Theme>& rpTheme, + const ::std::shared_ptr<Theme>& rpTheme, const ::std::vector<SharedButton>& rButtons) : BackgroundTheme(rpTheme, rButtons), mnBarHeight(0) @@ -982,7 +983,7 @@ void RectangleBackgroundTheme::Layout (void) //===== BitmapBackgroundTheme ================================================= BitmapBackgroundTheme::BitmapBackgroundTheme ( - const ::boost::shared_ptr<Theme>& rpTheme, + const ::std::shared_ptr<Theme>& rpTheme, const ::std::vector<SharedButton>& rButtons) : BackgroundTheme(rpTheme, rButtons), maButtonArea(), @@ -1208,7 +1209,7 @@ void TextButton::Paint ( OutputDevice& rDevice, const Point aOffset, const double nAlpha, - const ::boost::shared_ptr<Theme>& rpTheme) const + const ::std::shared_ptr<Theme>& rpTheme) const { (void)nAlpha; @@ -1286,7 +1287,7 @@ void ImageButton::Paint ( OutputDevice& rDevice, const Point aOffset, const double nAlpha, - const ::boost::shared_ptr<Theme>& rpTheme) const + const ::std::shared_ptr<Theme>& rpTheme) const { (void)rpTheme;
