summaryrefslogtreecommitdiff
path: root/cppcanvas/source/mtfrenderer/implrenderer.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-09-22 14:12:07 +0300
committerTor Lillqvist <tml@collabora.com>2017-09-26 14:18:41 +0200
commit8e7897588d7185ef1964e8120669c1de3d1ce734 (patch)
tree8f48598670a5dc22703371943c05789d60b9a07d /cppcanvas/source/mtfrenderer/implrenderer.cxx
parent0b4135ec9945ea627318ecf5fccc4b7d0940ff0d (diff)
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>
Diffstat (limited to 'cppcanvas/source/mtfrenderer/implrenderer.cxx')
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 418bd5e2478d..f5e59ed6359c 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -36,8 +36,8 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/PathCapType.hpp>
#include <com/sun/star/rendering/PathJoinType.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -573,7 +573,7 @@ namespace cppcanvas
}
const ::basegfx::B2DRectangle aBounds(
- ::basegfx::tools::getRange(aDevicePoly) );
+ ::basegfx::utils::getRange(aDevicePoly) );
const ::basegfx::B2DVector aOffset(
rGradient.GetOfsX() / 100.0,
rGradient.GetOfsY() / 100.0);
@@ -588,7 +588,7 @@ namespace cppcanvas
switch( rGradient.GetStyle() )
{
case GradientStyle::Linear:
- aGradInfo = basegfx::tools::createLinearODFGradientInfo(
+ aGradInfo = basegfx::utils::createLinearODFGradientInfo(
aBounds,
nSteps,
fBorder,
@@ -614,7 +614,7 @@ namespace cppcanvas
// border value, hence the second (left
// most 1-...
const double fAxialBorder (1-2*(1-fBorder));
- aGradInfo = basegfx::tools::createAxialODFGradientInfo(
+ aGradInfo = basegfx::utils::createAxialODFGradientInfo(
aBounds,
nSteps,
fAxialBorder,
@@ -634,7 +634,7 @@ namespace cppcanvas
}
case GradientStyle::Radial:
- aGradInfo = basegfx::tools::createRadialODFGradientInfo(
+ aGradInfo = basegfx::utils::createRadialODFGradientInfo(
aBounds,
aOffset,
nSteps,
@@ -643,7 +643,7 @@ namespace cppcanvas
break;
case GradientStyle::Elliptical:
- aGradInfo = basegfx::tools::createEllipticalODFGradientInfo(
+ aGradInfo = basegfx::utils::createEllipticalODFGradientInfo(
aBounds,
aOffset,
nSteps,
@@ -653,7 +653,7 @@ namespace cppcanvas
break;
case GradientStyle::Square:
- aGradInfo = basegfx::tools::createSquareODFGradientInfo(
+ aGradInfo = basegfx::utils::createSquareODFGradientInfo(
aBounds,
aOffset,
nSteps,
@@ -663,7 +663,7 @@ namespace cppcanvas
break;
case GradientStyle::Rect:
- aGradInfo = basegfx::tools::createRectangularODFGradientInfo(
+ aGradInfo = basegfx::utils::createRectangularODFGradientInfo(
aBounds,
aOffset,
nSteps,
@@ -1058,7 +1058,7 @@ namespace cppcanvas
// convert rect to polygon beforehand, must revert
// to general polygon clipping here.
rState.clip = ::basegfx::B2DPolyPolygon(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
// #121100# VCL rectangular clips always
// include one more pixel to the right
// and the bottom
@@ -1069,7 +1069,7 @@ namespace cppcanvas
}
// AW: Simplified
- rState.clip = basegfx::tools::clipPolyPolygonOnPolyPolygon(
+ rState.clip = basegfx::utils::clipPolyPolygonOnPolyPolygon(
rClipPoly, rState.clip, true, false);
}
@@ -1088,7 +1088,7 @@ namespace cppcanvas
rState.xClipPoly = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
rParms.mrCanvas->getUNOCanvas()->getDevice(),
::basegfx::B2DPolyPolygon(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
// #121100# VCL rectangular clips
// always include one more pixel to
// the right and the bottom
@@ -1141,7 +1141,7 @@ namespace cppcanvas
// convert rect to polygon beforehand, must revert
// to general polygon clipping here.
::basegfx::B2DPolyPolygon aClipPoly(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRectangle( rClipRect.Left(),
rClipRect.Top(),
rClipRect.Right(),
@@ -1150,7 +1150,7 @@ namespace cppcanvas
rState.clipRect.SetEmpty();
// AW: Simplified
- rState.clip = basegfx::tools::clipPolyPolygonOnPolyPolygon(
+ rState.clip = basegfx::utils::clipPolyPolygonOnPolyPolygon(
aClipPoly, rState.clip, true, false);
}
@@ -1165,7 +1165,7 @@ namespace cppcanvas
rState.xClipPoly = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
rParms.mrCanvas->getUNOCanvas()->getDevice(),
::basegfx::B2DPolyPolygon(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
// #121100# VCL rectangular clips
// always include one more pixel to
// the right and the bottom
@@ -1924,7 +1924,7 @@ namespace cppcanvas
// additional pixel to the right and bottom.
::basegfx::B2DPoint(1,1) );
- createFillAndStroke( ::basegfx::tools::createPolygonFromRect(
+ createFillAndStroke( ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRange( aTopLeftPixel,
aBottomRightPixel )),
rFactoryParms );
@@ -1940,7 +1940,7 @@ namespace cppcanvas
break;
::basegfx::B2DPolygon aPoly(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRange(
vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
@@ -1968,7 +1968,7 @@ namespace cppcanvas
::basegfx::B2DPoint(1,1) );
::basegfx::B2DPolygon aPoly(
- ::basegfx::tools::createPolygonFromEllipse(
+ ::basegfx::utils::createPolygonFromEllipse(
aRange.getCenter(),
aRange.getWidth() / 2, // divide by 2 since createPolygonFromEllipse
aRange.getHeight() / 2 )); // expects the radius and NOT the diameter!