diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-06-01 17:19:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-06-01 17:19:49 +0200 |
| commit | 5d78d488fd16fc7403c68cb42330e561ea30046c (patch) | |
| tree | 2235867c52f3f9969a3f17b3da6c5ac8a0456930 /slideshow | |
| parent | bb8040595c9b6f0ccde39e6833f27a50abb891d8 (diff) | |
Can use boost::make_optional
...reportedly available since Boost 1.34, and configure.ac checks for at least
Boost 1.47.
Change-Id: I07952de220f1eee5f91ad83a1965420eb6b09ada
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/transitions/slidetransitionfactory.cxx | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index ff273727af14..7357054bba35 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -30,7 +30,6 @@ #include <comphelper/anytostring.hxx> #include <comphelper/make_shared_from_uno.hxx> #include <comphelper/scopeguard.hxx> -#include <comphelper/optional.hxx> #include <comphelper/servicedecl.hxx> #include <comphelper/namecontainer.hxx> diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 9b6493dcf4a4..fa95a7ed0b94 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -26,7 +26,6 @@ #include <cppcanvas/basegfxfactory.hxx> -#include <comphelper/optional.hxx> #include <comphelper/make_shared_from_uno.hxx> #include <com/sun/star/rendering/XIntegerBitmap.hpp> @@ -941,7 +940,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( createPluginTransition( nTransitionType, nTransitionSubType, - comphelper::make_optional(pLeavingSlide), + boost::make_optional(pLeavingSlide), pEnteringSlide, rViewContainer, rScreenUpdater, @@ -1037,7 +1036,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( case animations::TransitionType::PUSHWIPE: { return createPushWipeTransition( - comphelper::make_optional(pLeavingSlide), + boost::make_optional(pLeavingSlide), pEnteringSlide, rViewContainer, rScreenUpdater, @@ -1051,7 +1050,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( case animations::TransitionType::SLIDEWIPE: { return createSlideWipeTransition( - comphelper::make_optional(pLeavingSlide), + boost::make_optional(pLeavingSlide), pEnteringSlide, rViewContainer, rScreenUpdater, |