[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source

Tomaž Vajngerl (via logerrit) logerrit at kemper.freedesktop.org
Mon Mar 9 16:18:18 UTC 2020


 drawinglayer/inc/converters.hxx                        |    3 ---
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx |    6 ------
 drawinglayer/source/texture/texture.cxx                |   10 +++++++++-
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 60b041f1a0bb5312dd4147698bb1a829dc25227b
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Mar 8 17:54:32 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Mar 9 17:17:38 2020 +0100

    drawinglayer: move getRandomColorRange to be private to GeoTexSvx
    
    Change-Id: I9b306277a67b793ffd065d40446909ac59da0641
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90190
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/drawinglayer/inc/converters.hxx b/drawinglayer/inc/converters.hxx
index acc00f3c4b3c..4f585d5d08db 100644
--- a/drawinglayer/inc/converters.hxx
+++ b/drawinglayer/inc/converters.hxx
@@ -24,7 +24,6 @@
 
 namespace drawinglayer
 {
-
     BitmapEx convertToBitmapEx(
         const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
         const geometry::ViewInformation2D& rViewInformation2D,
@@ -32,8 +31,6 @@ namespace drawinglayer
         sal_uInt32 nDiscreteHeight,
         sal_uInt32 nMaxQuadratPixels);
 
-    double getRandomColorRange();
-
 } // end of namespace drawinglayer
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index cdcc843a8b17..a93deae3817f 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -24,7 +24,6 @@
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <basegfx/polygon/b2dlinegeometry.hxx>
 #include <com/sun/star/drawing/LineCap.hpp>
-#include <comphelper/random.hxx>
 
 #include <converters.hxx>
 
@@ -196,11 +195,6 @@ namespace drawinglayer::primitive2d
 
 namespace drawinglayer
 {
-    double getRandomColorRange()
-    {
-        return comphelper::rng::uniform_real_distribution(0.0, nextafter(1.0, DBL_MAX));
-    }
-
     namespace primitive2d
     {
         void PolygonStrokePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx
index 8aa121462465..7ca4a4f1b164 100644
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
@@ -26,10 +26,18 @@
 #include <basegfx/utils/gradienttools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-#include <converters.hxx>
+#include <comphelper/random.hxx>
 
 namespace drawinglayer::texture
 {
+        namespace
+        {
+            double getRandomColorRange()
+            {
+                return comphelper::rng::uniform_real_distribution(0.0, nextafter(1.0, DBL_MAX));
+            }
+        }
+
         GeoTexSvx::GeoTexSvx()
         {
         }


More information about the Libreoffice-commits mailing list