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 /drawinglayer/source/attribute | |
| 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 'drawinglayer/source/attribute')
| -rw-r--r-- | drawinglayer/source/attribute/fillgraphicattribute.cxx | 5 | ||||
| -rw-r--r-- | drawinglayer/source/attribute/sdrfillgraphicattribute.cxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx index 867fecd79b52..406486ce794b 100644 --- a/drawinglayer/source/attribute/fillgraphicattribute.cxx +++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx @@ -18,6 +18,7 @@ */ #include <drawinglayer/attribute/fillgraphicattribute.hxx> +#include <o3tl/clamp.hxx> #include <vcl/graph.hxx> namespace drawinglayer @@ -98,8 +99,8 @@ namespace drawinglayer double fOffsetY) : mpFillGraphicAttribute(ImpFillGraphicAttribute( rGraphic, rGraphicRange, bTiling, - basegfx::clamp(fOffsetX, 0.0, 1.0), - basegfx::clamp(fOffsetY, 0.0, 1.0))) + o3tl::clamp(fOffsetX, 0.0, 1.0), + o3tl::clamp(fOffsetY, 0.0, 1.0))) { } diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx index f1bce0064dd8..84fbaea1d998 100644 --- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx @@ -19,6 +19,7 @@ #include <drawinglayer/attribute/sdrfillgraphicattribute.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx> +#include <o3tl/clamp.hxx> #include <rtl/instance.hxx> #include <vcl/graph.hxx> @@ -289,8 +290,8 @@ namespace drawinglayer } // get offset in percent - const double fOffsetX(basegfx::clamp(getOffset().getX() * 0.01, 0.0, 1.0)); - const double fOffsetY(basegfx::clamp(getOffset().getY() * 0.01, 0.0, 1.0)); + const double fOffsetX(o3tl::clamp(getOffset().getX() * 0.01, 0.0, 1.0)); + const double fOffsetY(o3tl::clamp(getOffset().getY() * 0.01, 0.0, 1.0)); // create FillGraphicAttribute return FillGraphicAttribute( |