From 632edfabe8065cd59a237d975ee03468ce4d868b Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Fri, 22 Sep 2017 10:21:50 +0300
Subject: <drawinglayer/tools/converters.hxx> can be internal to drawinglayer

And while moving it, get rid of the 'drawinglyer::tools' subnamespace.
Less potential confusion with the global 'tools' namespace.

Change-Id: Iab3c25be0cec7f3d182228d122837e9f2ac9a529
Reviewed-on: https://gerrit.libreoffice.org/42619
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
---
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx | 5 +++--
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx     | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'drawinglayer/source/primitive2d')

diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 6d6ef225d022..ed26d32470b9 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -26,9 +26,10 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/texture/texture.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
-#include <drawinglayer/tools/converters.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 
+#include "converters.hxx"
+
 using namespace com::sun::star;
 
 #define MAXIMUM_SQUARE_LENGTH (186.0)
@@ -109,7 +110,7 @@ namespace drawinglayer
                 const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef };
 
                 const BitmapEx aBitmapEx(
-                    tools::convertToBitmapEx(
+                    convertToBitmapEx(
                         xEmbedSeq,
                         aViewInformation2D,
                         mnDiscreteWidth,
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 2f6deba32bfe..0511d3602fd4 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -206,12 +206,9 @@ namespace drawinglayer
 
 namespace drawinglayer
 {
-    namespace tools
+    double getRandomColorRange()
     {
-        double getRandomColorRange()
-        {
-            return comphelper::rng::uniform_real_distribution(0.0, nextafter(1.0, DBL_MAX));
-        }
+        return comphelper::rng::uniform_real_distribution(0.0, nextafter(1.0, DBL_MAX));
     }
 
     namespace primitive2d
@@ -270,7 +267,7 @@ namespace drawinglayer
                         const basegfx::B2DPolyPolygon aNewPolyPolygon(aAreaPolyPolygon.getB2DPolygon(b));
                         static bool bTestByUsingRandomColor(false);
                         const basegfx::BColor aColor(bTestByUsingRandomColor
-                            ? basegfx::BColor(tools::getRandomColorRange(), tools::getRandomColorRange(), tools::getRandomColorRange())
+                            ? basegfx::BColor(getRandomColorRange(), getRandomColorRange(), getRandomColorRange())
                             : getLineAttribute().getColor());
                         rContainer.push_back(new PolyPolygonColorPrimitive2D(aNewPolyPolygon, aColor));
                     }
-- 
cgit