diff options
Diffstat (limited to 'slideshow/source/engine/transitions/slidetransitionfactory.cxx')
| -rw-r--r-- | slideshow/source/engine/transitions/slidetransitionfactory.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 6c12603836f1..e28aa070d46c 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -108,7 +108,7 @@ public: */ PluginSlideChange( sal_Int16 nTransitionType, sal_Int16 nTransitionSubType, - o3tl::optional<SlideSharedPtr> const& leavingSlide_, + std::optional<SlideSharedPtr> const& leavingSlide_, const SlideSharedPtr& pEnteringSlide, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, @@ -270,7 +270,7 @@ public: SlideChangeBase( // leaving bitmap is empty, we're leveraging the fact that the // old slide is still displayed in the background: - o3tl::optional<SlideSharedPtr>(), + std::optional<SlideSharedPtr>(), pEnteringSlide, pSoundPlayer, rViewContainer, @@ -331,9 +331,9 @@ public: entering slides, which applies a fade effect. */ FadingSlideChange( - o3tl::optional<SlideSharedPtr> const & leavingSlide, + std::optional<SlideSharedPtr> const & leavingSlide, const SlideSharedPtr& pEnteringSlide, - o3tl::optional<RGBColor> const& rFadeColor, + std::optional<RGBColor> const& rFadeColor, const SoundPlayerSharedPtr& pSoundPlayer, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, @@ -364,7 +364,7 @@ public: double t ) override; private: - const o3tl::optional< RGBColor > maFadeColor; + const std::optional< RGBColor > maFadeColor; }; void FadingSlideChange::prepareForRun( @@ -429,7 +429,7 @@ public: entering slides, which applies a cut effect. */ CutSlideChange( - o3tl::optional<SlideSharedPtr> const & leavingSlide, + std::optional<SlideSharedPtr> const & leavingSlide, const SlideSharedPtr& pEnteringSlide, const RGBColor& rFadeColor, const SoundPlayerSharedPtr& pSoundPlayer, @@ -533,7 +533,7 @@ public: final slide position. The vector must have unit length. */ MovingSlideChange( - const o3tl::optional<SlideSharedPtr>& leavingSlide, + const std::optional<SlideSharedPtr>& leavingSlide, const SlideSharedPtr& pEnteringSlide, const SoundPlayerSharedPtr& pSoundPlayer, const UnoViewContainer& rViewContainer, @@ -651,7 +651,7 @@ void MovingSlideChange::performOut( NumberAnimationSharedPtr createPushWipeTransition( - o3tl::optional<SlideSharedPtr> const & leavingSlide_, + std::optional<SlideSharedPtr> const & leavingSlide_, const SlideSharedPtr& pEnteringSlide, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, @@ -661,7 +661,7 @@ NumberAnimationSharedPtr createPushWipeTransition( bool /*bTransitionDirection*/, const SoundPlayerSharedPtr& pSoundPlayer ) { - o3tl::optional<SlideSharedPtr> leavingSlide; // no bitmap + std::optional<SlideSharedPtr> leavingSlide; // no bitmap if (leavingSlide_ && *leavingSlide_ != nullptr) { // opt: only page, if we've an @@ -752,7 +752,7 @@ NumberAnimationSharedPtr createPushWipeTransition( } NumberAnimationSharedPtr createSlideWipeTransition( - o3tl::optional<SlideSharedPtr> const & leavingSlide, + std::optional<SlideSharedPtr> const & leavingSlide, const SlideSharedPtr& pEnteringSlide, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, @@ -814,7 +814,7 @@ NumberAnimationSharedPtr createSlideWipeTransition( return std::make_shared<MovingSlideChange>( - o3tl::optional<SlideSharedPtr>() /* no slide */, + std::optional<SlideSharedPtr>() /* no slide */, pEnteringSlide, pSoundPlayer, rViewContainer, @@ -844,7 +844,7 @@ NumberAnimationSharedPtr createSlideWipeTransition( NumberAnimationSharedPtr createPluginTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubType, - o3tl::optional<SlideSharedPtr> const& pLeavingSlide, + std::optional<SlideSharedPtr> const& pLeavingSlide, const SlideSharedPtr& pEnteringSlide, const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, @@ -912,7 +912,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( createPluginTransition( nTransitionType, nTransitionSubType, - o3tl::make_optional(pLeavingSlide), + std::make_optional(pLeavingSlide), pEnteringSlide, rViewContainer, rScreenUpdater, @@ -1006,7 +1006,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( case animations::TransitionType::PUSHWIPE: { return createPushWipeTransition( - o3tl::make_optional(pLeavingSlide), + std::make_optional(pLeavingSlide), pEnteringSlide, rViewContainer, rScreenUpdater, @@ -1020,7 +1020,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( case animations::TransitionType::SLIDEWIPE: { return createSlideWipeTransition( - o3tl::make_optional(pLeavingSlide), + std::make_optional(pLeavingSlide), pEnteringSlide, rViewContainer, rScreenUpdater, @@ -1035,8 +1035,8 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( case animations::TransitionType::FADE: { // black page: - o3tl::optional<SlideSharedPtr> leavingSlide; - o3tl::optional<RGBColor> aFadeColor; + std::optional<SlideSharedPtr> leavingSlide; + std::optional<RGBColor> aFadeColor; switch( nTransitionSubType ) { |