Rename the basegfx::tools namespace to basegfx::utils

Reduce potential confusion with the global tools namespace. Will
hopefully make it possible to remove the annoying initial :: when
referring to the global tools namespace. Unless we have even more
tools subnamespaces somewhere.

Thorsten said it was OK.

Change-Id: Id088dfe8f4244cb79df9aa988995b31a1758c996
Reviewed-on: https://gerrit.libreoffice.org/42644
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>

5 files changed, 136 insertions, 136 deletions

diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index f5cc617ddbc2..9b9fec5a6d66 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -41,7 +41,7 @@
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolortools.hxx>
 
-#include <basegfx/tools/rectcliptools.hxx>
+#include <basegfx/utils/rectcliptools.hxx>
 
 #include <iostream>
 #include <fstream>
@@ -138,20 +138,20 @@ public:
         OUString aExport;
 
         CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D",
-                               tools::importFromSvgD( aPoly, aPath0, false, nullptr ));
-        aExport = tools::exportToSvgD( aPoly, true, true, false );
+                               utils::importFromSvgD( aPoly, aPath0, false, nullptr ));
+        aExport = utils::exportToSvgD( aPoly, true, true, false );
         const char sExportString[] = "m10 10h-20v-20h20z";
         CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting rectangle to SVG-D",
                                OUString(sExportString), aExport );
         CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D (round-trip",
-                               tools::importFromSvgD( aPoly, aExport, false, nullptr ));
-        aExport = tools::exportToSvgD( aPoly, true, true, false );
+                               utils::importFromSvgD( aPoly, aExport, false, nullptr ));
+        aExport = utils::exportToSvgD( aPoly, true, true, false );
         CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting rectangle to SVG-D (round-trip)",
                                OUString(sExportString), aExport);
 
         CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D",
-                               tools::importFromSvgD( aPoly, aPath1, false, nullptr ));
-        aExport = tools::exportToSvgD( aPoly, true, true, false );
+                               utils::importFromSvgD( aPoly, aPath1, false, nullptr ));
+        aExport = utils::exportToSvgD( aPoly, true, true, false );
 
         // Adaptions for B2DPolygon bezier change (see #i77162#):
 
@@ -178,11 +178,11 @@ public:
         // a 2nd good test is that re-importing of aExport has to create the same
         // B2DPolPolygon again:
         B2DPolyPolygon aReImport;
-        CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D", tools::importFromSvgD( aReImport, aExport, false, nullptr));
+        CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D", utils::importFromSvgD( aReImport, aExport, false, nullptr));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("re-imported polygon needs to be identical", aPoly, aReImport);
 
-        CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D", tools::importFromSvgD( aPoly, aPath2, false, nullptr));
-        aExport = tools::exportToSvgD( aPoly, true, true, false );
+        CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D", utils::importFromSvgD( aPoly, aPath2, false, nullptr));
+        aExport = utils::exportToSvgD( aPoly, true, true, false );
 
         // Adaptions for B2DPolygon bezier change (see #i77162#):
 
@@ -198,19 +198,19 @@ public:
             "8 752-224 1128-21 101-31 183-31 245 0 39 9 70 26 93 17 24 39 36 67 36 145 0 279-80 400-240s182-365 182-615c0-2"
             "88-107-533-322-734s-487-301-816-301c-395 0-715 124-960 373s-368 569-368 958q0 577.5 357 900c237 216 557 324 95"
             "8 325 189-1 389-27 600-77 211-52 378-110 503-174q40.5 105 81 210z";
-        CPPUNIT_ASSERT_MESSAGE("re-importing '@' from SVG-D", tools::importFromSvgD( aReImport, aExport, false, nullptr));
+        CPPUNIT_ASSERT_MESSAGE("re-importing '@' from SVG-D", utils::importFromSvgD( aReImport, aExport, false, nullptr));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("re-imported '@' needs to be identical", aPoly, aReImport);
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting '@' to SVG-D", OUString(sExportString1), aExport);
         CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D (round-trip",
-                               tools::importFromSvgD( aPoly, aExport, false, nullptr ));
-        aExport = tools::exportToSvgD( aPoly, true, true, false );
+                               utils::importFromSvgD( aPoly, aExport, false, nullptr ));
+        aExport = utils::exportToSvgD( aPoly, true, true, false );
         CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting '@' to SVG-D (round-trip)",
                                OUString(sExportString1), aExport);
 
         CPPUNIT_ASSERT_MESSAGE("importing complex polygon from SVG-D",
-                               tools::importFromSvgD( aPoly, aPath3, false, nullptr ));
-        aExport = tools::exportToSvgD( aPoly, true, true, false );
+                               utils::importFromSvgD( aPoly, aPath3, false, nullptr ));
+        aExport = utils::exportToSvgD( aPoly, true, true, false );
         const char sExportString2[] =
             "m1598 125h306v2334h-306v-1105h-1293v1105h-305v-2334h305v973h1293"
             "zm2159 1015 78-44 85 235-91 47-91 40-90 34-90 29-89 21-88 16-88 10-88 3-102-4-97"
@@ -235,14 +235,14 @@ public:
         CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting complex polygon to SVG-D",
                                OUString(sExportString2), aExport);
         CPPUNIT_ASSERT_MESSAGE("importing complex polygon from SVG-D (round-trip",
-                               tools::importFromSvgD( aPoly, aExport, false, nullptr ));
-        aExport = tools::exportToSvgD( aPoly, true, true, false );
+                               utils::importFromSvgD( aPoly, aExport, false, nullptr ));
+        aExport = utils::exportToSvgD( aPoly, true, true, false );
         CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting complex polygon to SVG-D (round-trip)",
                                OUString(sExportString2), aExport);
 
         const B2DPolygon aRect(
-            tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));
-        aExport = tools::exportToSvgD( B2DPolyPolygon(aRect), false, false, false );
+            utils::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));
+        aExport = utils::exportToSvgD( B2DPolyPolygon(aRect), false, false, false );
 
         const char sExportStringRect[] = "M0 0H4000V4000H0Z";
         CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting to rectangle svg-d string",
@@ -297,7 +297,7 @@ public:
         // B2DPolyRange relies on correctly orientated rects
         const B2DRange aRect(0,0,1,1);
         CPPUNIT_ASSERT_EQUAL_MESSAGE("createPolygonFromRect - correct orientation",
-                               B2VectorOrientation::Positive, tools::getOrientation(tools::createPolygonFromRect(aRect)));
+                               B2VectorOrientation::Positive, utils::getOrientation(utils::createPolygonFromRect(aRect)));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -669,7 +669,7 @@ public:
         CPPUNIT_ASSERT_MESSAGE("decompose: error test I4", impDecomposeComposeTest(-fSX, -fSY, tan(-fS), -fR));
 
         // cover special case of 180 degree rotation
-        B2DHomMatrix aTest=tools::createScaleShearXRotateTranslateB2DHomMatrix(
+        B2DHomMatrix aTest=utils::createScaleShearXRotateTranslateB2DHomMatrix(
             6425,3938,
             0,
             180*F_PI180,
@@ -795,7 +795,7 @@ public:
     void testIsRectangle()
     {
         B2DPolygon aRect1(
-            tools::createPolygonFromRect(
+            utils::createPolygonFromRect(
                 B2DRange(0,0,1,1) ) );
 
         B2DPolygon aRect2 {
@@ -847,19 +847,19 @@ public:
         aNonRect5.setClosed(true);
 
         CPPUNIT_ASSERT_MESSAGE("checking rectangle-ness of rectangle 1",
-                               tools::isRectangle( aRect1 ));
+                               utils::isRectangle( aRect1 ));
         CPPUNIT_ASSERT_MESSAGE("checking rectangle-ness of rectangle 2",
-                               tools::isRectangle( aRect2 ));
+                               utils::isRectangle( aRect2 ));
         CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 1",
-                               !tools::isRectangle( aNonRect1 ));
+                               !utils::isRectangle( aNonRect1 ));
         CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 2",
-                               !tools::isRectangle( aNonRect2 ));
+                               !utils::isRectangle( aNonRect2 ));
         CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 3",
-                               !tools::isRectangle( aNonRect3 ));
+                               !utils::isRectangle( aNonRect3 ));
         CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 4",
-                               !tools::isRectangle( aNonRect4 ));
+                               !utils::isRectangle( aNonRect4 ));
         CPPUNIT_ASSERT_MESSAGE("checking non-rectangle-ness of polygon 5",
-                               !tools::isRectangle( aNonRect5 ));
+                               !utils::isRectangle( aNonRect5 ));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -901,7 +901,7 @@ public:
         aPolyPolygon.append(aPolygon);
         aPolyPolygon.append(aPolygonOffset);
         B2DTrapezoidVector aVector;
-        basegfx::tools::trapezoidSubdivide(aVector, aPolyPolygon);
+        basegfx::utils::trapezoidSubdivide(aVector, aPolyPolygon);
         CPPUNIT_ASSERT_MESSAGE("more than zero sub-divided trapezoids",
                                aVector.size() > 0);
     }
@@ -984,15 +984,15 @@ public:
         Type aRange(0,0,10,10);
 
         CPPUNIT_ASSERT_MESSAGE("(0,0) is outside range!",
-                               tools::getCohenSutherlandClipFlags(B2IPoint(0,0),aRange) == 0);
+                               utils::getCohenSutherlandClipFlags(B2IPoint(0,0),aRange) == 0);
         CPPUNIT_ASSERT_MESSAGE("(-1,-1) is inside range!",
-                               tools::getCohenSutherlandClipFlags(B2IPoint(-1,-1),aRange) ==
-                               (tools::RectClipFlags::LEFT|tools::RectClipFlags::TOP));
+                               utils::getCohenSutherlandClipFlags(B2IPoint(-1,-1),aRange) ==
+                               (utils::RectClipFlags::LEFT|utils::RectClipFlags::TOP));
         CPPUNIT_ASSERT_MESSAGE("(10,10) is outside range!",
-                               tools::getCohenSutherlandClipFlags(B2IPoint(10,10),aRange) == 0);
+                               utils::getCohenSutherlandClipFlags(B2IPoint(10,10),aRange) == 0);
         CPPUNIT_ASSERT_MESSAGE("(11,11) is inside range!",
-                               tools::getCohenSutherlandClipFlags(B2IPoint(11,11),aRange) ==
-                               (tools::RectClipFlags::RIGHT|tools::RectClipFlags::BOTTOM));
+                               utils::getCohenSutherlandClipFlags(B2IPoint(11,11),aRange) ==
+                               (utils::RectClipFlags::RIGHT|utils::RectClipFlags::BOTTOM));
     }
 
     void check()
@@ -1019,15 +1019,15 @@ public:
         B2IBox aBox(0,0,10,10);
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("(0,0) is outside range!",
-                               sal_uInt32(0), tools::getCohenSutherlandClipFlags(B2IPoint(0,0),aBox));
+                               sal_uInt32(0), utils::getCohenSutherlandClipFlags(B2IPoint(0,0),aBox));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("(-1,-1) is inside range!",
-                               tools::RectClipFlags::LEFT|tools::RectClipFlags::TOP,
-                               tools::getCohenSutherlandClipFlags(B2IPoint(-1,-1),aBox));
+                               utils::RectClipFlags::LEFT|utils::RectClipFlags::TOP,
+                               utils::getCohenSutherlandClipFlags(B2IPoint(-1,-1),aBox));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("(9,9) is outside range!",
-                               sal_uInt32(0), tools::getCohenSutherlandClipFlags(B2IPoint(9,9),aBox));
+                               sal_uInt32(0), utils::getCohenSutherlandClipFlags(B2IPoint(9,9),aBox));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("(10,10) is inside range!",
-                               tools::RectClipFlags::RIGHT|tools::RectClipFlags::BOTTOM,
-                               tools::getCohenSutherlandClipFlags(B2IPoint(10,10),aBox));
+                               utils::RectClipFlags::RIGHT|utils::RectClipFlags::BOTTOM,
+                               utils::getCohenSutherlandClipFlags(B2IPoint(10,10),aBox));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -1084,118 +1084,118 @@ public:
     void hslTest()
     {
         CPPUNIT_ASSERT_EQUAL_MESSAGE("white",
-                               BColor(0,0,1), tools::rgb2hsl(maWhite));
+                               BColor(0,0,1), utils::rgb2hsl(maWhite));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("black",
-                               BColor(0,0,0), tools::rgb2hsl(maBlack));
+                               BColor(0,0,0), utils::rgb2hsl(maBlack));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("red",
-                               BColor(0,1,0.5), tools::rgb2hsl(maRed));
+                               BColor(0,1,0.5), utils::rgb2hsl(maRed));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("green",
-                               BColor(120,1,0.5), tools::rgb2hsl(maGreen));
+                               BColor(120,1,0.5), utils::rgb2hsl(maGreen));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("blue",
-                               BColor(240,1,0.5), tools::rgb2hsl(maBlue));
+                               BColor(240,1,0.5), utils::rgb2hsl(maBlue));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("yellow",
-                               BColor(60,1,0.5), tools::rgb2hsl(maYellow));
+                               BColor(60,1,0.5), utils::rgb2hsl(maYellow));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("magenta",
-                               BColor(300,1,0.5), tools::rgb2hsl(maMagenta));
+                               BColor(300,1,0.5), utils::rgb2hsl(maMagenta));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("cyan",
-                               BColor(180,1,0.5), tools::rgb2hsl(maCyan));
+                               BColor(180,1,0.5), utils::rgb2hsl(maCyan));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("third hue case",
-                               BColor(210,1,0.5), tools::rgb2hsl(BColor(0,0.5,1)));
+                               BColor(210,1,0.5), utils::rgb2hsl(BColor(0,0.5,1)));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip white",
-                               maWhite, tools::hsl2rgb(tools::rgb2hsl(maWhite)));
+                               maWhite, utils::hsl2rgb(utils::rgb2hsl(maWhite)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip black",
-                               maBlack, tools::hsl2rgb(tools::rgb2hsl(maBlack)));
+                               maBlack, utils::hsl2rgb(utils::rgb2hsl(maBlack)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip red",
-                               maRed, tools::hsl2rgb(tools::rgb2hsl(maRed)));
+                               maRed, utils::hsl2rgb(utils::rgb2hsl(maRed)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip green",
-                               maGreen, tools::hsl2rgb(tools::rgb2hsl(maGreen)));
+                               maGreen, utils::hsl2rgb(utils::rgb2hsl(maGreen)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip blue",
-                               maBlue, tools::hsl2rgb(tools::rgb2hsl(maBlue)));
+                               maBlue, utils::hsl2rgb(utils::rgb2hsl(maBlue)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip yellow",
-                               maYellow, tools::hsl2rgb(tools::rgb2hsl(maYellow)));
+                               maYellow, utils::hsl2rgb(utils::rgb2hsl(maYellow)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip magenta",
-                               maMagenta, tools::hsl2rgb(tools::rgb2hsl(maMagenta)));
+                               maMagenta, utils::hsl2rgb(utils::rgb2hsl(maMagenta)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip cyan",
-                               maCyan, tools::hsl2rgb(tools::rgb2hsl(maCyan)));
+                               maCyan, utils::hsl2rgb(utils::rgb2hsl(maCyan)));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("grey10",
-                               BColor(0,0,.1), tools::rgb2hsl(maWhite*.1));
+                               BColor(0,0,.1), utils::rgb2hsl(maWhite*.1));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("grey90",
-                               BColor(0,0,.9), tools::rgb2hsl(maWhite*.9));
+                               BColor(0,0,.9), utils::rgb2hsl(maWhite*.9));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("red/2",
-                               BColor(0,1,0.25), tools::rgb2hsl(maRed*.5));
+                               BColor(0,1,0.25), utils::rgb2hsl(maRed*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("green/2",
-                               BColor(120,1,0.25), tools::rgb2hsl(maGreen*.5));
+                               BColor(120,1,0.25), utils::rgb2hsl(maGreen*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("blue/2",
-                               BColor(240,1,0.25), tools::rgb2hsl(maBlue*.5));
+                               BColor(240,1,0.25), utils::rgb2hsl(maBlue*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("yellow/2",
-                               BColor(60,1,0.25), tools::rgb2hsl(maYellow*.5));
+                               BColor(60,1,0.25), utils::rgb2hsl(maYellow*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("magenta/2",
-                               BColor(300,1,0.25), tools::rgb2hsl(maMagenta*.5));
+                               BColor(300,1,0.25), utils::rgb2hsl(maMagenta*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("cyan/2",
-                               BColor(180,1,0.25), tools::rgb2hsl(maCyan*.5));
+                               BColor(180,1,0.25), utils::rgb2hsl(maCyan*.5));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("pastel",
-                               BColor(0,.5,.5), tools::rgb2hsl(BColor(.75,.25,.25)));
+                               BColor(0,.5,.5), utils::rgb2hsl(BColor(.75,.25,.25)));
     }
 
     // insert your test code here.
     void hsvTest()
     {
         CPPUNIT_ASSERT_EQUAL_MESSAGE("white",
-                               BColor(0,0,1), tools::rgb2hsv(maWhite));
+                               BColor(0,0,1), utils::rgb2hsv(maWhite));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("black",
-                               BColor(0,0,0), tools::rgb2hsv(maBlack));
+                               BColor(0,0,0), utils::rgb2hsv(maBlack));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("red",
-                               BColor(0,1,1), tools::rgb2hsv(maRed));
+                               BColor(0,1,1), utils::rgb2hsv(maRed));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("green",
-                               BColor(120,1,1), tools::rgb2hsv(maGreen));
+                               BColor(120,1,1), utils::rgb2hsv(maGreen));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("blue",
-                               BColor(240,1,1), tools::rgb2hsv(maBlue));
+                               BColor(240,1,1), utils::rgb2hsv(maBlue));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("yellow",
-                               BColor(60,1,1), tools::rgb2hsv(maYellow));
+                               BColor(60,1,1), utils::rgb2hsv(maYellow));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("magenta",
-                               BColor(300,1,1), tools::rgb2hsv(maMagenta));
+                               BColor(300,1,1), utils::rgb2hsv(maMagenta));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("cyan",
-                               BColor(180,1,1), tools::rgb2hsv(maCyan));
+                               BColor(180,1,1), utils::rgb2hsv(maCyan));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip white",
-                               maWhite, tools::hsv2rgb(tools::rgb2hsv(maWhite)));
+                               maWhite, utils::hsv2rgb(utils::rgb2hsv(maWhite)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip black",
-                               maBlack, tools::hsv2rgb(tools::rgb2hsv(maBlack)));
+                               maBlack, utils::hsv2rgb(utils::rgb2hsv(maBlack)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip red",
-                               maRed, tools::hsv2rgb(tools::rgb2hsv(maRed)));
+                               maRed, utils::hsv2rgb(utils::rgb2hsv(maRed)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip green",
-                               maGreen, tools::hsv2rgb(tools::rgb2hsv(maGreen)));
+                               maGreen, utils::hsv2rgb(utils::rgb2hsv(maGreen)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip blue",
-                               maBlue, tools::hsv2rgb(tools::rgb2hsv(maBlue)));
+                               maBlue, utils::hsv2rgb(utils::rgb2hsv(maBlue)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip yellow",
-                               maYellow, tools::hsv2rgb(tools::rgb2hsv(maYellow)));
+                               maYellow, utils::hsv2rgb(utils::rgb2hsv(maYellow)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip magenta",
-                               maMagenta, tools::hsv2rgb(tools::rgb2hsv(maMagenta)));
+                               maMagenta, utils::hsv2rgb(utils::rgb2hsv(maMagenta)));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("roundtrip cyan",
-                               maCyan, tools::hsv2rgb(tools::rgb2hsv(maCyan)));
+                               maCyan, utils::hsv2rgb(utils::rgb2hsv(maCyan)));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("grey10",
-                               BColor(0,0,.1), tools::rgb2hsv(maWhite*.1));
+                               BColor(0,0,.1), utils::rgb2hsv(maWhite*.1));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("grey90",
-                               BColor(0,0,.9), tools::rgb2hsv(maWhite*.9));
+                               BColor(0,0,.9), utils::rgb2hsv(maWhite*.9));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("red/2",
-                               BColor(0,1,0.5), tools::rgb2hsv(maRed*.5));
+                               BColor(0,1,0.5), utils::rgb2hsv(maRed*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("green/2",
-                               BColor(120,1,0.5), tools::rgb2hsv(maGreen*.5));
+                               BColor(120,1,0.5), utils::rgb2hsv(maGreen*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("blue/2",
-                               BColor(240,1,0.5), tools::rgb2hsv(maBlue*.5));
+                               BColor(240,1,0.5), utils::rgb2hsv(maBlue*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("yellow/2",
-                               BColor(60,1,0.5), tools::rgb2hsv(maYellow*.5));
+                               BColor(60,1,0.5), utils::rgb2hsv(maYellow*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("magenta/2",
-                               BColor(300,1,0.5), tools::rgb2hsv(maMagenta*.5));
+                               BColor(300,1,0.5), utils::rgb2hsv(maMagenta*.5));
         CPPUNIT_ASSERT_EQUAL_MESSAGE("cyan/2",
-                               BColor(180,1,0.5), tools::rgb2hsv(maCyan*.5));
+                               BColor(180,1,0.5), utils::rgb2hsv(maCyan*.5));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE("pastel",
-                               BColor(0,.5,.5), tools::rgb2hsv(BColor(.5,.25,.25)));
+                               BColor(0,.5,.5), utils::rgb2hsv(BColor(.5,.25,.25)));
     }
 
     // Change the following lines only, if you add, remove or rename
diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx
index e06ee194cf00..5a443358f39b 100644
--- a/basegfx/test/basegfxtools.cxx
+++ b/basegfx/test/basegfxtools.cxx
@@ -22,7 +22,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <basegfx/tools/keystoplerp.hxx>
+#include <basegfx/utils/keystoplerp.hxx>
 #include <basegfx/numeric/ftools.hxx>
 
 using namespace ::basegfx;
@@ -32,7 +32,7 @@ namespace basegfxtools
 
 class KeyStopLerpTest : public CppUnit::TestFixture
 {
-    tools::KeyStopLerp maKeyStops;
+    utils::KeyStopLerp maKeyStops;
 
     static std::vector<double> getTestVector()
     {
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 5be8ebb1660d..5f9794a2235a 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -161,7 +161,7 @@ public:
 #else
         const char randomSvg[]="m394 783h404v57h-404zm-197-505h571v576h-571zm356-634h75v200h-75zm-40-113h403v588h-403zm93-811h111v494h-111zm-364-619h562v121h-562zm-134-8h292v27h-292zm110 356h621v486h-621zm78-386h228v25h-228zm475-345h201v201h-201zm-2-93h122v126h-122zm-417-243h567v524h-567zm-266-738h863v456h-863zm262-333h315v698h-315zm-328-826h43v393h-43zm830-219h120v664h-120zm-311-636h221v109h-221zm-500 137h628v19h-628zm681-94h211v493h-211zm-366-646h384v355h-384zm-189-199h715v247h-715zm165-459h563v601h-563zm258-479h98v606h-98zm270-517h65v218h-65zm-44-259h96v286h-96zm-599-202h705v468h-705zm216-803h450v494h-450zm-150-22h26v167h-26zm-55-599h50v260h-50zm190-278h490v387h-490zm-290-453h634v392h-634zm257 189h552v300h-552zm-151-690h136v455h-136zm12-597h488v432h-488zm501-459h48v39h-48zm-224-112h429v22h-429zm-281 102h492v621h-492zm519-158h208v17h-208zm-681-563h56v427h-56zm126-451h615v392h-615zm-47-410h598v522h-598zm-32 316h79v110h-79zm-71-129h18v127h-18zm126-993h743v589h-743zm211-430h428v750h-428zm61-554h100v220h-100zm-353-49h658v157h-658zm778-383h115v272h-115zm-249-541h119v712h-119zm203 86h94v40h-94z";
         B2DPolyPolygon randomPoly;
-        tools::importFromSvgD(randomPoly, randomSvg, false, nullptr);
+        utils::importFromSvgD(randomPoly, randomSvg, false, nullptr);
         for (auto const& aPolygon : randomPoly)
             aRandomIntersections.appendElement(aPolygon.getB2DRange(), B2VectorOrientation::Negative);
 #endif
@@ -173,10 +173,10 @@ public:
         for( sal_uInt32 i=0; i<rPoly.count(); ++i )
         {
             B2DPolygon aTmp=rPoly.getB2DPolygon(i);
-            if( tools::getOrientation(aTmp) == B2VectorOrientation::Negative )
+            if( utils::getOrientation(aTmp) == B2VectorOrientation::Negative )
                 aTmp.flip();
 
-            aTmp=tools::removeNeutralPoints(aTmp);
+            aTmp=utils::removeNeutralPoints(aTmp);
             std::vector<B2DPoint> aTmp2(aTmp.count());
             for(sal_uInt32 j=0; j<aTmp.count(); ++j)
                 aTmp2[j] = aTmp.getB2DPoint(j);
@@ -202,7 +202,7 @@ public:
 
         // boxclipper & generic clipper disagree slightly on area-less
         // polygons (one or two points only)
-        aRes = tools::stripNeutralPolygons(aRes);
+        aRes = utils::stripNeutralPolygons(aRes);
 
         // now, sort all polygons with increasing 0th point
         std::sort(aRes.begin(),
@@ -218,14 +218,14 @@ public:
     {
         B2DPolyPolygon aTmp1;
         CPPUNIT_ASSERT_MESSAGE(sName,
-                               tools::importFromSvgD(
+                               utils::importFromSvgD(
                                    aTmp1, OUString::createFromAscii(sSvg), false, nullptr));
 
         const OUString aSvg=
-            tools::exportToSvgD(toTest.solveCrossovers(), true, true, false);
+            utils::exportToSvgD(toTest.solveCrossovers(), true, true, false);
         B2DPolyPolygon aTmp2;
         CPPUNIT_ASSERT_MESSAGE(sName,
-                               tools::importFromSvgD(
+                               utils::importFromSvgD(
                                    aTmp2, aSvg, false, nullptr));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
@@ -299,7 +299,7 @@ public:
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s - svg:d=\"%s\"\n",
                 pName, OUStringToOString(
-                    basegfx::tools::exportToSvgD(rPoly, , true, true, false),
+                    basegfx::utils::exportToSvgD(rPoly, , true, true, false),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
     }
@@ -331,7 +331,7 @@ public:
         const sal_uInt32 nCount=rRange.count();
         for( sal_uInt32 i=0; i<nCount; ++i )
         {
-            B2DPolygon aRect=tools::createPolygonFromRect(std::get<0>(rRange.getElement(i)));
+            B2DPolygon aRect=utils::createPolygonFromRect(std::get<0>(rRange.getElement(i)));
             if( std::get<1>(rRange.getElement(i)) == B2VectorOrientation::Negative )
                 aRect.flip();
 
@@ -341,14 +341,14 @@ public:
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s input      - svg:d=\"%s\"\n",
                 pName, OUStringToOString(
-                    basegfx::tools::exportToSvgD(
+                    basegfx::utils::exportToSvgD(
                         genericClip, , true, true, false),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
         const B2DPolyPolygon boxClipResult=rRange.solveCrossovers();
         const OUString boxClipSvg(
-            basegfx::tools::exportToSvgD(
+            basegfx::utils::exportToSvgD(
                 normalizePoly(boxClipResult), true, true, false));
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s boxclipper - svg:d=\"%s\"\n",
@@ -357,9 +357,9 @@ public:
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
-        genericClip = tools::solveCrossovers(genericClip);
+        genericClip = utils::solveCrossovers(genericClip);
         const OUString genericClipSvg(
-            basegfx::tools::exportToSvgD(
+            basegfx::utils::exportToSvgD(
                 normalizePoly(genericClip), true, true, false));
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s genclipper - svg:d=\"%s\"\n",
diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx
index 02618d61034c..898b616c57a5 100644
--- a/basegfx/test/clipstate.cxx
+++ b/basegfx/test/clipstate.cxx
@@ -22,7 +22,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <basegfx/tools/b2dclipstate.hxx>
+#include <basegfx/utils/b2dclipstate.hxx>
 #include <basegfx/range/b2dpolyrange.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -38,11 +38,11 @@ namespace basegfx2d
 class clipstate : public CppUnit::TestFixture
 {
 private:
-    tools::B2DClipState aUnion1;
-    tools::B2DClipState aUnion2;
-    tools::B2DClipState aIntersect;
-    tools::B2DClipState aXor;
-    tools::B2DClipState aSubtract;
+    utils::B2DClipState aUnion1;
+    utils::B2DClipState aUnion2;
+    utils::B2DClipState aIntersect;
+    utils::B2DClipState aXor;
+    utils::B2DClipState aSubtract;
 
 public:
     void setUp() override
@@ -86,25 +86,25 @@ public:
         aSubtract.subtractRange(aEast);
     }
 
-    void verifyPoly(const char* sName, const char* sSvg, const tools::B2DClipState& toTest)
+    void verifyPoly(const char* sName, const char* sSvg, const utils::B2DClipState& toTest)
     {
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s - svg:d=\"%s\"\n",
                 sName, OUStringToOString(
-                    basegfx::tools::exportToSvgD(toTest.getClipPoly(), true, true, false),
+                    basegfx::utils::exportToSvgD(toTest.getClipPoly(), true, true, false),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
         B2DPolyPolygon aTmp1;
         CPPUNIT_ASSERT_MESSAGE(sName,
-                               tools::importFromSvgD(
+                               utils::importFromSvgD(
                                    aTmp1, OUString::createFromAscii(sSvg), false, nullptr));
 
         const OUString aSvg=
-            tools::exportToSvgD(toTest.getClipPoly(), true, true, false);
+            utils::exportToSvgD(toTest.getClipPoly(), true, true, false);
         B2DPolyPolygon aTmp2;
         CPPUNIT_ASSERT_MESSAGE(sName,
-                               tools::importFromSvgD(
+                               utils::importFromSvgD(
                                    aTmp2, aSvg, false, nullptr));
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
@@ -130,12 +130,12 @@ public:
 
     void verifyMixedClips()
     {
-        tools::B2DClipState aMixedClip;
+        utils::B2DClipState aMixedClip;
 
         const char unionSvg[]="m100 10v90h-90v10h-20v-10h-90v-90h-10v-20h10v-90h90v-10h20v10h90v90h10v20z";
 
         B2DPolyPolygon aTmp1;
-        tools::importFromSvgD(aTmp1, unionSvg, false, nullptr);
+        utils::importFromSvgD(aTmp1, unionSvg, false, nullptr);
 
         aMixedClip.intersectPolyPolygon(aTmp1);
         aMixedClip.subtractRange(B2DRange(-20,-150,20,0));
diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index a345b0eb3f0c..44aad203390b 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.cxx
@@ -59,7 +59,7 @@ public:
         aSelfIntersecting.append(B2DPoint(100,0));
         aSelfIntersecting.setClosed(true);
 
-        aShiftedRectangle = tools::createPolygonFromRect(
+        aShiftedRectangle = utils::createPolygonFromRect(
             B2DRange(0,90,20,150));
     }
 
@@ -69,18 +69,18 @@ public:
                   B2DPolyPolygon (*pFunc)(const B2DPolyPolygon&, const B2DPolyPolygon&))
     {
         const B2DPolyPolygon aSelfIntersect(
-            tools::prepareForPolygonOperation(aSelfIntersecting));
+            utils::prepareForPolygonOperation(aSelfIntersecting));
         const B2DPolyPolygon aRect(
-            tools::prepareForPolygonOperation(aShiftedRectangle));
+            utils::prepareForPolygonOperation(aShiftedRectangle));
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s input LHS - svg:d=\"%s\"\n",
                 pName, OUStringToOString(
-                    basegfx::tools::exportToSvgD(
+                    basegfx::utils::exportToSvgD(
                         aSelfIntersect, true, true, false),
                     RTL_TEXTENCODING_UTF8).getStr() );
         fprintf(stderr, "%s input RHS - svg:d=\"%s\"\n",
                 pName, OUStringToOString(
-                    basegfx::tools::exportToSvgD(
+                    basegfx::utils::exportToSvgD(
                         aRect, true, true, false),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
@@ -91,38 +91,38 @@ public:
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s - svg:d=\"%s\"\n",
                 pName, OUStringToOString(
-                    basegfx::tools::exportToSvgD(aRes, true, true, false),
+                    basegfx::utils::exportToSvgD(aRes, true, true, false),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
         OUString aValid=OUString::createFromAscii(pValidSvgD);
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE(pName,
-                               aValid, basegfx::tools::exportToSvgD(aRes, true, true, false));
+                               aValid, basegfx::utils::exportToSvgD(aRes, true, true, false));
     }
 
     void validateOr()
     {
         const char* const pValid="m0 0h100v150h-75v-50h-5v50h-20v-50-10zm75 100v-50h-50v50z";
-        validate("validateOr", pValid, &tools::solvePolygonOperationOr);
+        validate("validateOr", pValid, &utils::solvePolygonOperationOr);
     }
 
     void validateXor()
     {
         const char* const pValid="m0 0h100v150h-75v-50h-5v50h-20v-50-10zm0 100h20v-10h-20zm75 0v-50h-50v50z";
-        validate("validateXor", pValid, &tools::solvePolygonOperationXor);
+        validate("validateXor", pValid, &utils::solvePolygonOperationXor);
     }
 
     void validateAnd()
     {
         const char* const pValid="m0 100v-10h20v10z";
-        validate("validateAnd", pValid, &tools::solvePolygonOperationAnd);
+        validate("validateAnd", pValid, &utils::solvePolygonOperationAnd);
     }
 
     void validateDiff()
     {
         const char* const pValid="m0 90v-90h100v150h-75v-50h-5v-10zm75 10v-50h-50v50z";
-        validate("validateDiff", pValid, &tools::solvePolygonOperationDiff);
+        validate("validateDiff", pValid, &utils::solvePolygonOperationDiff);
     }
 
     void validateCrossover(const char* pName,
@@ -133,14 +133,14 @@ public:
         OUString aValid=OUString::createFromAscii(pValidSvgD);
         B2DPolyPolygon aInputPoly, aValidPoly;
 
-        tools::importFromSvgD(aInputPoly, aInput, false, nullptr);
-        tools::importFromSvgD(aValidPoly, aValid, false, nullptr);
+        utils::importFromSvgD(aInputPoly, aInput, false, nullptr);
+        utils::importFromSvgD(aValidPoly, aValid, false, nullptr);
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE(
             pName,
             aValid,
-            basegfx::tools::exportToSvgD(
-                tools::solveCrossovers(aInputPoly), true, true, false));
+            basegfx::utils::exportToSvgD(
+                utils::solveCrossovers(aInputPoly), true, true, false));
     }
 
     void checkCrossoverSolver()