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>

9 files changed, 39 insertions, 39 deletions

diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 490a5238e9b2..291befdaabe5 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -438,12 +438,12 @@ void XMLImageMapPolygonContext::Prepare(Reference<XPropertySet> & rPropertySet)
     // get polygon sequence
     basegfx::B2DPolygon aPolygon;
 
-    if(basegfx::tools::importFromSvgPoints(aPolygon, sPointsString))
+    if(basegfx::utils::importFromSvgPoints(aPolygon, sPointsString))
     {
         if(aPolygon.count())
         {
             css::drawing::PointSequence aPointSequence;
-            basegfx::tools::B2DPolygonToUnoPointSequence(aPolygon, aPointSequence);
+            basegfx::utils::B2DPolygonToUnoPointSequence(aPolygon, aPointSequence);
             rPropertySet->setPropertyValue("Polygon", Any(aPointSequence));
         }
     }
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 34c3515ca27d..bc1f66c0d609 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -315,7 +315,7 @@ void XMLImageMapExport::ExportPolygon(const Reference<XPropertySet> & rPropertyS
     aAny >>= aPoly;
 
     const basegfx::B2DPolygon aPolygon(
-        basegfx::tools::UnoPointSequenceToB2DPolygon(
+        basegfx::utils::UnoPointSequenceToB2DPolygon(
             aPoly));
     const basegfx::B2DRange aPolygonRange(aPolygon.getB2DRange());
 
@@ -337,7 +337,7 @@ void XMLImageMapExport::ExportPolygon(const Reference<XPropertySet> & rPropertyS
 
     // export point sequence
     const OUString aPointString(
-        basegfx::tools::exportToSvgPoints(
+        basegfx::utils::exportToSvgPoints(
             aPolygon));
 
     mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_POINTS, aPointString);
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 9aee2b5e8e9b..96f38e27c788 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2189,13 +2189,13 @@ void XMLShapeExport::ImpExportPolygonShape(
             // get PolygonBezier
             uno::Any aAny( xPropSet->getPropertyValue("Geometry") );
             const basegfx::B2DPolyPolygon aPolyPolygon(
-                basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(*o3tl::doAccess<drawing::PolyPolygonBezierCoords>(aAny)));
+                basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(*o3tl::doAccess<drawing::PolyPolygonBezierCoords>(aAny)));
 
             if(aPolyPolygon.count())
             {
                 // complex polygon shape, write as svg:d
                 const OUString aPolygonString(
-                    basegfx::tools::exportToSvgD(
+                    basegfx::utils::exportToSvgD(
                         aPolyPolygon,
                         true,       // bUseRelativeCoordinates
                         false,      // bDetectQuadraticBeziers: not used in old, but maybe activated now
@@ -2210,13 +2210,13 @@ void XMLShapeExport::ImpExportPolygonShape(
             // get non-bezier polygon
             uno::Any aAny( xPropSet->getPropertyValue("Geometry") );
             const basegfx::B2DPolyPolygon aPolyPolygon(
-                basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon(*o3tl::doAccess<drawing::PointSequenceSequence>(aAny)));
+                basegfx::utils::UnoPointSequenceSequenceToB2DPolyPolygon(*o3tl::doAccess<drawing::PointSequenceSequence>(aAny)));
 
             if(!aPolyPolygon.areControlPointsUsed() && 1 == aPolyPolygon.count())
             {
                 // simple polygon shape, can be written as svg:points sequence
                 const basegfx::B2DPolygon aPolygon(aPolyPolygon.getB2DPolygon(0));
-                const OUString aPointString(basegfx::tools::exportToSvgPoints(aPolygon));
+                const OUString aPointString(basegfx::utils::exportToSvgPoints(aPolygon));
 
                 // write point array
                 mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_POINTS, aPointString);
@@ -2228,7 +2228,7 @@ void XMLShapeExport::ImpExportPolygonShape(
             {
                 // complex polygon shape, write as svg:d
                 const OUString aPolygonString(
-                    basegfx::tools::exportToSvgD(
+                    basegfx::utils::exportToSvgD(
                         aPolyPolygon,
                         true,       // bUseRelativeCoordinates
                         false,      // bDetectQuadraticBeziers: not used in old, but maybe activated now
@@ -2605,10 +2605,10 @@ void XMLShapeExport::ImpExportConnectorShape(
     if(pSourcePolyPolygon && pSourcePolyPolygon->Coordinates.getLength())
     {
         const basegfx::B2DPolyPolygon aPolyPolygon(
-            basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
+            basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
                 *pSourcePolyPolygon));
         const OUString aPolygonString(
-            basegfx::tools::exportToSvgD(
+            basegfx::utils::exportToSvgD(
                 aPolyPolygon,
                 true,           // bUseRelativeCoordinates
                 false,          // bDetectQuadraticBeziers: not used in old, but maybe activated now
@@ -3567,13 +3567,13 @@ void XMLShapeExport::ImpExport3DShape(
 
                 // convert to 3D PolyPolygon
                 const basegfx::B3DPolyPolygon aPolyPolygon3D(
-                    basegfx::tools::UnoPolyPolygonShape3DToB3DPolyPolygon(
+                    basegfx::utils::UnoPolyPolygonShape3DToB3DPolyPolygon(
                         aUnoPolyPolygon3D));
 
                 // convert to 2D tools::PolyPolygon using identity 3D transformation (just grep X and Y)
                 const basegfx::B3DHomMatrix aB3DHomMatrixFor2DConversion;
                 const basegfx::B2DPolyPolygon aPolyPolygon(
-                    basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(
+                    basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(
                         aPolyPolygon3D,
                         aB3DHomMatrixFor2DConversion));
 
@@ -3591,7 +3591,7 @@ void XMLShapeExport::ImpExport3DShape(
 
                 // prepare svg:d string
                 const OUString aPolygonString(
-                    basegfx::tools::exportToSvgD(
+                    basegfx::utils::exportToSvgD(
                         aPolyPolygon,
                         true,           // bUseRelativeCoordinates
                         false,          // bDetectQuadraticBeziers TTTT: not used in old, but maybe activated now
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 1c2c9a7f5e27..084e4db1f2b4 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -32,7 +32,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/tools/unotools.hxx>
+#include <basegfx/utils/unotools.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index ebc182936ac4..51949d72ba98 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -305,16 +305,16 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa
             // import 2d tools::PolyPolygon from svg:d
             basegfx::B2DPolyPolygon aPolyPolygon;
 
-            if(basegfx::tools::importFromSvgD(aPolyPolygon, maPoints, GetImport().needFixPositionAfterZ(), nullptr))
+            if(basegfx::utils::importFromSvgD(aPolyPolygon, maPoints, GetImport().needFixPositionAfterZ(), nullptr))
             {
                 // convert to 3D PolyPolygon
                 const basegfx::B3DPolyPolygon aB3DPolyPolygon(
-                    basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(
+                    basegfx::utils::createB3DPolyPolygonFromB2DPolyPolygon(
                         aPolyPolygon));
 
                 // convert to UNO API class PolyPolygonShape3D
                 drawing::PolyPolygonShape3D aPolyPolygon3D;
-                basegfx::tools::B3DPolyPolygonToUnoPolyPolygonShape3D(
+                basegfx::utils::B3DPolyPolygonToUnoPolyPolygonShape3D(
                     aB3DPolyPolygon,
                     aPolyPolygon3D);
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a267d57a56f6..eb2a523b5463 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1296,7 +1296,7 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
 
                 basegfx::B2DPolygon aPolygon;
 
-                if(basegfx::tools::importFromSvgPoints(aPolygon, maPoints))
+                if(basegfx::utils::importFromSvgPoints(aPolygon, maPoints))
                 {
                     if(aPolygon.count())
                     {
@@ -1310,13 +1310,13 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
                         if(!aSourceRange.equal(aTargetRange))
                         {
                             aPolygon.transform(
-                                basegfx::tools::createSourceRangeTargetRangeTransform(
+                                basegfx::utils::createSourceRangeTargetRangeTransform(
                                     aSourceRange,
                                     aTargetRange));
                         }
 
                         css::drawing::PointSequenceSequence aPointSequenceSequence;
-                        basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(basegfx::B2DPolyPolygon(aPolygon), aPointSequenceSequence);
+                        basegfx::utils::B2DPolyPolygonToUnoPointSequenceSequence(basegfx::B2DPolyPolygon(aPolygon), aPointSequenceSequence);
                         xPropSet->setPropertyValue("Geometry", Any(aPointSequenceSequence));
                     }
                 }
@@ -1383,7 +1383,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
 
         basegfx::B2DPolyPolygon aPolyPolygon;
 
-        if(basegfx::tools::importFromSvgD(aPolyPolygon, maD, GetImport().needFixPositionAfterZ(), nullptr))
+        if(basegfx::utils::importFromSvgD(aPolyPolygon, maD, GetImport().needFixPositionAfterZ(), nullptr))
         {
             if(aPolyPolygon.count())
             {
@@ -1397,7 +1397,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
                 if(!aSourceRange.equal(aTargetRange))
                 {
                     aPolyPolygon.transform(
-                        basegfx::tools::createSourceRangeTargetRangeTransform(
+                        basegfx::utils::createSourceRangeTargetRangeTransform(
                             aSourceRange,
                             aTargetRange));
                 }
@@ -1451,7 +1451,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
                         {
                             drawing::PolyPolygonBezierCoords aSourcePolyPolygon;
 
-                            basegfx::tools::B2DPolyPolygonToUnoPolyPolygonBezierCoords(
+                            basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords(
                                 aPolyPolygon,
                                 aSourcePolyPolygon);
                             aAny <<= aSourcePolyPolygon;
@@ -1460,7 +1460,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
                         {
                             drawing::PointSequenceSequence aSourcePolyPolygon;
 
-                            basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(
+                            basegfx::utils::B2DPolyPolygonToUnoPointSequenceSequence(
                                 aPolyPolygon,
                                 aSourcePolyPolygon);
                             aAny <<= aSourcePolyPolygon;
@@ -1864,13 +1864,13 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS
         {
             basegfx::B2DPolyPolygon aPolyPolygon;
 
-            if(basegfx::tools::importFromSvgD(aPolyPolygon, rValue, GetImport().needFixPositionAfterZ(), nullptr))
+            if(basegfx::utils::importFromSvgD(aPolyPolygon, rValue, GetImport().needFixPositionAfterZ(), nullptr))
             {
                 if(aPolyPolygon.count())
                 {
                     drawing::PolyPolygonBezierCoords aSourcePolyPolygon;
 
-                    basegfx::tools::B2DPolyPolygonToUnoPolyPolygonBezierCoords(
+                    basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords(
                         aPolyPolygon,
                         aSourcePolyPolygon);
                     maPath <<= aSourcePolyPolygon;
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index d6eba2a483e5..580c5505efd9 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -98,7 +98,7 @@ void XMLMarkerStyleImport::importXML(
     {
         basegfx::B2DPolyPolygon aPolyPolygon;
 
-        if(basegfx::tools::importFromSvgD(aPolyPolygon, strPathData, rImport.needFixPositionAfterZ(), nullptr))
+        if(basegfx::utils::importFromSvgD(aPolyPolygon, strPathData, rImport.needFixPositionAfterZ(), nullptr))
         {
             if(aPolyPolygon.count())
             {
@@ -115,7 +115,7 @@ void XMLMarkerStyleImport::importXML(
                 if(!aSourceRange.equal(aTargetRange))
                 {
                     aPolyPolygon.transform(
-                        basegfx::tools::createSourceRangeTargetRangeTransform(
+                        basegfx::utils::createSourceRangeTargetRangeTransform(
                             aSourceRange,
                             aTargetRange));
                 }
@@ -123,7 +123,7 @@ void XMLMarkerStyleImport::importXML(
                 // always use PolyPolygonBezierCoords here
                 drawing::PolyPolygonBezierCoords aSourcePolyPolygon;
 
-                basegfx::tools::B2DPolyPolygonToUnoPolyPolygonBezierCoords(
+                basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords(
                     aPolyPolygon,
                     aSourcePolyPolygon);
                 rValue <<= aSourcePolyPolygon;
@@ -173,7 +173,7 @@ void XMLMarkerStyleExport::exportXML(
             }
 
             const basegfx::B2DPolyPolygon aPolyPolygon(
-                basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
+                basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
                     aBezier));
             const basegfx::B2DRange aPolyPolygonRange(aPolyPolygon.getB2DRange());
 
@@ -189,7 +189,7 @@ void XMLMarkerStyleExport::exportXML(
 
             // Pathdata
             const OUString aPolygonString(
-                basegfx::tools::exportToSvgD(
+                basegfx::utils::exportToSvgD(
                     aPolyPolygon,
                     true,           // bUseRelativeCoordinates
                     false,          // bDetectQuadraticBeziers: not used in old, but maybe activated now
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 9a843675371d..7e3131ba634b 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -271,13 +271,13 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
 
         if( bPath )
         {
-            basegfx::tools::importFromSvgD(aPolyPolygon, sD, GetImport().needFixPositionAfterZ(), nullptr);
+            basegfx::utils::importFromSvgD(aPolyPolygon, sD, GetImport().needFixPositionAfterZ(), nullptr);
         }
         else
         {
             basegfx::B2DPolygon aPolygon;
 
-            if(basegfx::tools::importFromSvgPoints(aPolygon, sPoints))
+            if(basegfx::utils::importFromSvgPoints(aPolygon, sPoints))
             {
                 aPolyPolygon = basegfx::B2DPolyPolygon(aPolygon);
             }
@@ -295,13 +295,13 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
             if(!aSourceRange.equal(aTargetRange))
             {
                 aPolyPolygon.transform(
-                    basegfx::tools::createSourceRangeTargetRangeTransform(
+                    basegfx::utils::createSourceRangeTargetRangeTransform(
                         aSourceRange,
                         aTargetRange));
             }
 
             css::drawing::PointSequenceSequence aPointSequenceSequence;
-            basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(aPolyPolygon, aPointSequenceSequence);
+            basegfx::utils::B2DPolyPolygonToUnoPointSequenceSequence(aPolyPolygon, aPointSequenceSequence);
             xPropSet->setPropertyValue( sContourPolyPolygon, Any(aPointSequenceSequence) );
         }
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 481dfe23a3c2..0d6b36403358 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2927,7 +2927,7 @@ void XMLTextParagraphExport::exportContour(
     PointSequenceSequence aSourcePolyPolygon;
     rPropSet->getPropertyValue( sContourPolyPolygon ) >>= aSourcePolyPolygon;
     const basegfx::B2DPolyPolygon aPolyPolygon(
-        basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon(
+        basegfx::utils::UnoPointSequenceSequenceToB2DPolyPolygon(
             aSourcePolyPolygon));
     const sal_uInt32 nPolygonCount(aPolyPolygon.count());
 
@@ -2979,7 +2979,7 @@ void XMLTextParagraphExport::exportContour(
     {
         // simple polygon shape, can be written as svg:points sequence
         const OUString aPointString(
-            basegfx::tools::exportToSvgPoints(
+            basegfx::utils::exportToSvgPoints(
                 aPolyPolygon.getB2DPolygon(0)));
 
         // write point array
@@ -2990,7 +2990,7 @@ void XMLTextParagraphExport::exportContour(
     {
         // polypolygon, needs to be written as a svg:path sequence
         const OUString aPolygonString(
-            basegfx::tools::exportToSvgD(
+            basegfx::utils::exportToSvgD(
                 aPolyPolygon,
                 true,           // bUseRelativeCoordinates
                 false,          // bDetectQuadraticBeziers: not used in old, but maybe activated now