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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index fca398968320..1cc8230f6c7c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -8,6 +8,7 @@ */ #include "rtfdocumentimpl.hxx" +#include <algorithm> #include <memory> #include <string_view> #include <com/sun/star/embed/XEmbeddedObject.hpp> @@ -16,7 +17,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> -#include <o3tl/clamp.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> @@ -893,11 +893,11 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS WmfExternal aExtHeader; aExtHeader.mapMode = m_aStates.top().aPicture.eWMetafile; aExtHeader.xExt = sal_uInt16( - o3tl::clamp<sal_Int32>(m_aStates.top().aPicture.nWidth, 0, - SAL_MAX_UINT16)); //TODO: better way to handle out-of-bounds values? + std::clamp<sal_Int32>(m_aStates.top().aPicture.nWidth, 0, + SAL_MAX_UINT16)); //TODO: better way to handle out-of-bounds values? aExtHeader.yExt = sal_uInt16( - o3tl::clamp<sal_Int32>(m_aStates.top().aPicture.nHeight, 0, - SAL_MAX_UINT16)); //TODO: better way to handle out-of-bounds values? + std::clamp<sal_Int32>(m_aStates.top().aPicture.nHeight, 0, + SAL_MAX_UINT16)); //TODO: better way to handle out-of-bounds values? WmfExternal* pExtHeader = &aExtHeader; uno::Reference<lang::XServiceInfo> xServiceInfo(m_aStates.top().aDrawingObject.xShape, uno::UNO_QUERY); |