diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 15:26:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 20:25:08 +0100 |
| commit | 27cd397b1a1a8a39843c093eff68c5ea6cb249e7 (patch) | |
| tree | ecf63804421b12987ae070a24a6ed967f29de1d8 /sd | |
| parent | 5b19be032c51e0f7489b29c2c98e484587ed0865 (diff) | |
Drop o3tl/clamp.hxx, use C++17 std::clamp instead
Change-Id: I5043c787dcc3b78bc7fdff130564801194e39f46
Reviewed-on: https://gerrit.libreoffice.org/66177
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 128909f2c6c4..5504729659b5 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <algorithm> + #include <config_features.h> #include <com/sun/star/frame/theAutoRecovery.hpp> @@ -33,7 +37,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/presentation/SlideShow.hpp> -#include <o3tl/clamp.hxx> #include <svl/aeitem.hxx> #include <svl/urihelper.hxx> @@ -1679,7 +1682,7 @@ void SlideshowImpl::updateSlideShow() const static sal_Int32 nMaximumFrameCount (60); const static double nMinimumTimeout (1.0 / nMaximumFrameCount); const static double nMaximumTimeout (4.0); - fUpdate = o3tl::clamp(fUpdate, nMinimumTimeout, nMaximumTimeout); + fUpdate = std::clamp(fUpdate, nMinimumTimeout, nMaximumTimeout); // Make sure that the maximum frame count has not been set // too high (only then conversion to milliseconds and long |