summaryrefslogtreecommitdiff
path: root/filter/source/msfilter/escherex.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-01-11 15:26:59 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-01-11 20:25:08 +0100
commit27cd397b1a1a8a39843c093eff68c5ea6cb249e7 (patch)
treeecf63804421b12987ae070a24a6ed967f29de1d8 /filter/source/msfilter/escherex.cxx
parent5b19be032c51e0f7489b29c2c98e484587ed0865 (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 'filter/source/msfilter/escherex.cxx')
-rw-r--r--filter/source/msfilter/escherex.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 9cf10f14acbf..52f83f00f8ab 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -19,7 +19,6 @@
#include "eschesdo.hxx"
#include <o3tl/any.hxx>
-#include <o3tl/clamp.hxx>
#include <o3tl/make_unique.hxx>
#include <svx/svdxcgv.hxx>
#include <svx/svdomedia.hxx>
@@ -98,6 +97,8 @@
#include <sal/log.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
+
+#include <algorithm>
#include <memory>
using namespace css;
@@ -2929,12 +2930,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
aMemStrm.WriteUInt16( equation.nOperation )
.WriteInt16(
- o3tl::clamp(
+ std::clamp(
equation.nPara[ 0 ], sal_Int32(SAL_MIN_INT16),
sal_Int32(SAL_MAX_INT16)) )
.WriteInt16( equation.nPara[ 1 ] )
.WriteInt16(
- o3tl::clamp(
+ std::clamp(
equation.nPara[ 2 ], sal_Int32(SAL_MIN_INT16),
sal_Int32(SAL_MAX_INT16)) );
}