diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-17 16:32:17 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-17 20:13:21 +0200 |
commit | f4351535f3bf10b94cccc721ab395e2c7f5010a4 (patch) | |
tree | 19c18c568867d47918fad11b5c2bd70459cf74cc /cui | |
parent | 13db6e8671c36e1a028d6a8ad63f518e60f84870 (diff) |
Consolidate: basegfx::clamp -> o3tl::clamp
Change-Id: Iffd8b0a19d4479b6c70dc834c6f64499e87e01b1
Reviewed-on: https://gerrit.libreoffice.org/59265
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/tabpages/transfrm.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index bfc5017e3705..d3c9479ab748 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <o3tl/clamp.hxx> #include <sfx2/app.hxx> #include <svx/EnhancedCustomShape2d.hxx> #include <svx/svdundo.hxx> @@ -1309,10 +1312,10 @@ void SvxPositionSizeTabPage::SetMinMaxPosition() } const double fMaxLong(static_cast<double>(MetricField::ConvertValue( LONG_MAX, 0, MapUnit::Map100thMM, meDlgUnit ) - 1)); - fLeft = basegfx::clamp(fLeft, -fMaxLong, fMaxLong); - fRight = basegfx::clamp(fRight, -fMaxLong, fMaxLong); - fTop = basegfx::clamp(fTop, - fMaxLong, fMaxLong); - fBottom = basegfx::clamp(fBottom, -fMaxLong, fMaxLong); + fLeft = o3tl::clamp(fLeft, -fMaxLong, fMaxLong); + fRight = o3tl::clamp(fRight, -fMaxLong, fMaxLong); + fTop = o3tl::clamp(fTop, - fMaxLong, fMaxLong); + fBottom = o3tl::clamp(fBottom, -fMaxLong, fMaxLong); // #i75273# normalizing when setting the min/max values was wrong, removed m_xMtrPosX->set_range(basegfx::fround64(fLeft), basegfx::fround64(fRight), FUNIT_NONE); |