summaryrefslogtreecommitdiff
path: root/cppcanvas/source
diff options
context:
space:
mode:
Diffstat (limited to 'cppcanvas/source')
-rw-r--r--cppcanvas/source/mtfrenderer/bitmapaction.cxx6
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfpbrush.cxx10
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx6
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfpfont.cxx6
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfpimage.cxx6
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx22
-rw-r--r--cppcanvas/source/mtfrenderer/emfppath.cxx8
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfppen.cxx6
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfpregion.cxx6
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx36
-rw-r--r--cppcanvas/source/mtfrenderer/lineaction.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/mtftools.cxx14
-rw-r--r--cppcanvas/source/mtfrenderer/pointaction.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/polypolyaction.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx14
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.cxx4
-rw-r--r--cppcanvas/source/tools/canvasgraphichelper.cxx2
-rw-r--r--cppcanvas/source/wrapper/basegfxfactory.cxx2
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.cxx2
-rw-r--r--cppcanvas/source/wrapper/implcanvas.cxx2
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.cxx2
-rw-r--r--cppcanvas/source/wrapper/implsprite.cxx2
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.cxx2
23 files changed, 86 insertions, 86 deletions
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 34513fd0528e..fd27bb62dd15 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -29,7 +29,7 @@
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include "cachedprimitivebase.hxx"
#include "bitmapaction.hxx"
#include "outdevstate.hxx"
@@ -92,7 +92,7 @@ namespace cppcanvas
// Setup transformation such that the next render call is
// moved rPoint away.
- const basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createTranslateB2DHomMatrix(rDstPoint));
+ const basegfx::B2DHomMatrix aLocalTransformation(basegfx::utils::createTranslateB2DHomMatrix(rDstPoint));
::canvas::tools::appendToRenderState( maState,
aLocalTransformation );
@@ -124,7 +124,7 @@ namespace cppcanvas
const ::basegfx::B2DVector aScale( rDstSize.getX() / aBmpSize.Width(),
rDstSize.getY() / aBmpSize.Height() );
- const basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createScaleTranslateB2DHomMatrix(
+ const basegfx::B2DHomMatrix aLocalTransformation(basegfx::utils::createScaleTranslateB2DHomMatrix(
aScale, rDstPoint));
::canvas::tools::appendToRenderState( maState, aLocalTransformation );
diff --git a/cppcanvas/source/mtfrenderer/emfpbrush.cxx b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
index 051859d33549..927c89c1c2fa 100755
--- a/cppcanvas/source/mtfrenderer/emfpbrush.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
@@ -21,9 +21,9 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
@@ -178,7 +178,7 @@ namespace cppcanvas
s.Seek(pos + pathLength);
- const ::basegfx::B2DRectangle aBounds(::basegfx::tools::getRange(path->GetPolygon(rR, false)));
+ const ::basegfx::B2DRectangle aBounds(::basegfx::utils::getRange(path->GetPolygon(rR, false)));
areaWidth = aBounds.getWidth();
areaHeight = aBounds.getHeight();
SAL_INFO("cppcanvas.emf", "EMF+\t polygon bounding box: " << aBounds.getMinX() << "," << aBounds.getMinY() << " " << aBounds.getWidth() << "x" << aBounds.getHeight());
@@ -195,7 +195,7 @@ namespace cppcanvas
s.Seek(pos + 8 * boundaryPointCount);
- const ::basegfx::B2DRectangle aBounds(::basegfx::tools::getRange(path->GetPolygon(rR, false)));
+ const ::basegfx::B2DRectangle aBounds(::basegfx::utils::getRange(path->GetPolygon(rR, false)));
areaWidth = aBounds.getWidth();
areaHeight = aBounds.getHeight();
SAL_INFO("cppcanvas.emf", "EMF+\t polygon bounding box: " << aBounds.getMinX() << "," << aBounds.getMinY() << " " << aBounds.getWidth() << "x" << aBounds.getHeight());
diff --git a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
index 9ef47171ebea..d5baafc862f9 100755
--- a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
@@ -21,9 +21,9 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
diff --git a/cppcanvas/source/mtfrenderer/emfpfont.cxx b/cppcanvas/source/mtfrenderer/emfpfont.cxx
index 71ce93cdf4d1..ade72e8ac380 100755
--- a/cppcanvas/source/mtfrenderer/emfpfont.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpfont.cxx
@@ -21,9 +21,9 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
diff --git a/cppcanvas/source/mtfrenderer/emfpimage.cxx b/cppcanvas/source/mtfrenderer/emfpimage.cxx
index c9c5176ef853..0cb54cb58a23 100755
--- a/cppcanvas/source/mtfrenderer/emfpimage.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpimage.cxx
@@ -21,9 +21,9 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 7c2312954917..acc0b3f58573 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -22,9 +22,9 @@
#include <vcl/metaact.hxx>
#include <vcl/graphicfilter.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
@@ -491,7 +491,7 @@ namespace cppcanvas
basegfx::B2DRange aBoundsRectangle (0, 0, 1, 1);
if (brush->type == BrushTypeLinearGradient) {
aGradientService = "LinearGradient";
- aGradInfo = basegfx::tools::createLinearODFGradientInfo(
+ aGradInfo = basegfx::utils::createLinearODFGradientInfo(
aBoundsRectangle,
aStops.getLength(),
0,
@@ -499,7 +499,7 @@ namespace cppcanvas
} else {
aGradientService = "EllipticalGradient";
- aGradInfo = basegfx::tools::createEllipticalODFGradientInfo(
+ aGradInfo = basegfx::utils::createEllipticalODFGradientInfo(
aBoundsRectangle,
::basegfx::B2DVector( 0, 0 ),
aStops.getLength(),
@@ -564,7 +564,7 @@ namespace cppcanvas
// of the polygon.
const double fShift = bIsFilled ? 0 : rAttributes.StrokeWidth;
double fConsumed = 0;
- basegfx::B2DPolyPolygon aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
+ basegfx::B2DPolyPolygon aArrow(basegfx::utils::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
fWidth, fPolyLength, 0, &fConsumed, fShift));
@@ -650,7 +650,7 @@ namespace cppcanvas
{
double fStart = 0.0;
double fEnd = 0.0;
- double fPolyLength = basegfx::tools::getLength(aPolygon);
+ double fPolyLength = basegfx::utils::getLength(aPolygon);
// line start
if (pen->customStartCap)
@@ -676,7 +676,7 @@ namespace cppcanvas
// build new poly, consume something from the old poly
if (fStart != 0.0 || fEnd != 0.0)
- aPolygon = basegfx::tools::getSnippetAbsolute(aPolygon, fStart, fPolyLength - fEnd, fPolyLength);
+ aPolygon = basegfx::utils::getSnippetAbsolute(aPolygon, fStart, fPolyLength - fEnd, fPolyLength);
}
aFinalPolyPolygon.append(aPolygon);
@@ -968,7 +968,7 @@ namespace cppcanvas
(360.0*startAngle/M_PI) << ", end: " << (360.0*endAngle/M_PI) <<
" startAngle: " << startAngle << " sweepAngle: " << sweepAngle);
- B2DPolygon polygon = basegfx::tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle);
+ B2DPolygon polygon = basegfx::utils::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle);
if ( type != EmfPlusRecordTypeDrawArc )
{
polygon.append (mappedCenter);
@@ -1018,7 +1018,7 @@ namespace cppcanvas
B2DPoint mappedCenter (Map (dx + dw/2, dy + dh/2));
B2DSize mappedSize( MapSize (dw/2, dh/2));
- ::basegfx::B2DPolyPolygon polyPolygon( ::basegfx::B2DPolygon( ::basegfx::tools::createPolygonFromEllipse( mappedCenter, mappedSize.getX (), mappedSize.getY () ) ) );
+ ::basegfx::B2DPolyPolygon polyPolygon( ::basegfx::B2DPolygon( ::basegfx::utils::createPolygonFromEllipse( mappedCenter, mappedSize.getX (), mappedSize.getY () ) ) );
if ( type == EmfPlusRecordTypeFillEllipse )
EMFPPlusFillPolygon( polyPolygon,
@@ -1518,7 +1518,7 @@ namespace cppcanvas
B2DPoint mappedPoint (Map (dx, dy));
B2DSize mappedSize( MapSize (dw, dh));
- ::basegfx::B2DPolyPolygon polyPolygon( ::basegfx::B2DPolygon( ::basegfx::tools::createPolygonFromRect( ::basegfx::B2DRectangle( mappedPoint.getX(), mappedPoint.getY(),
+ ::basegfx::B2DPolyPolygon polyPolygon( ::basegfx::B2DPolygon( ::basegfx::utils::createPolygonFromRect( ::basegfx::B2DRectangle( mappedPoint.getX(), mappedPoint.getY(),
mappedPoint.getX() + mappedSize.getX(),
mappedPoint.getY() + mappedSize.getY() ) ) ) );
polyPolygon.transform(rState.mapModeTransform);
diff --git a/cppcanvas/source/mtfrenderer/emfppath.cxx b/cppcanvas/source/mtfrenderer/emfppath.cxx
index 4a90f1e9c4c6..45d68f1313a6 100644
--- a/cppcanvas/source/mtfrenderer/emfppath.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppath.cxx
@@ -21,9 +21,9 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
@@ -93,7 +93,7 @@ namespace cppcanvas
aPolygon.clear ();
#if OSL_DEBUG_LEVEL > 1
- const ::basegfx::B2DRectangle aBounds (::basegfx::tools::getRange (GetPolygon (rR)));
+ const ::basegfx::B2DRectangle aBounds (::basegfx::utils::getRange (GetPolygon (rR)));
SAL_INFO ("cppcanvas.emf",
"EMF+\tpolygon bounding box: " << aBounds.getMinX () << "," << aBounds.getMinY () << aBounds.getWidth () << "x" << aBounds.getHeight () << " (mapped)");
diff --git a/cppcanvas/source/mtfrenderer/emfppen.cxx b/cppcanvas/source/mtfrenderer/emfppen.cxx
index 36cf63acdf72..14f91b73a7a5 100755
--- a/cppcanvas/source/mtfrenderer/emfppen.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppen.cxx
@@ -21,9 +21,9 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
diff --git a/cppcanvas/source/mtfrenderer/emfpregion.cxx b/cppcanvas/source/mtfrenderer/emfpregion.cxx
index 99db436fb5aa..58844b2478ad 100755
--- a/cppcanvas/source/mtfrenderer/emfpregion.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpregion.cxx
@@ -21,9 +21,9 @@
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/tools/gradienttools.hxx>
-#include <basegfx/tools/tools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/gradienttools.hxx>
+#include <basegfx/utils/tools.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dsize.hxx>
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!
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index 148ee26fd4e8..44fe93ca6d13 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -28,7 +28,7 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <canvas/canvastools.hxx>
#include <cppcanvas/canvas.hxx>
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 4432e7196386..adeb30c1af24 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -22,7 +22,7 @@
#include <com/sun/star/rendering/RenderState.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/range/b2drectangle.hxx>
@@ -92,7 +92,7 @@ namespace cppcanvas
const ::Size aSizePixel( rVDev.LogicToPixel( aSizeLogic ) );
- o_rMatrix = basegfx::tools::createScaleB2DHomMatrix(
+ o_rMatrix = basegfx::utils::createScaleB2DHomMatrix(
aSizePixel.Width() / (double)aSizeLogic.Width(),
aSizePixel.Height() / (double)aSizeLogic.Height() );
@@ -168,7 +168,7 @@ namespace cppcanvas
// rotation involved - convert to polygon first,
// then transform that
::basegfx::B2DPolygon aLocalClip(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRectangle(
(double)(aLocalClipRect.Left()),
(double)(aLocalClipRect.Top()),
@@ -197,7 +197,7 @@ namespace cppcanvas
o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
rCanvas->getUNOCanvas()->getDevice(),
::basegfx::B2DPolyPolygon(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRectangle(
(aLocalClipRect.Left() - rOffset.getX())/pScaling->getX(),
(aLocalClipRect.Top() - rOffset.getY())/pScaling->getY(),
@@ -211,7 +211,7 @@ namespace cppcanvas
o_rRenderState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
rCanvas->getUNOCanvas()->getDevice(),
::basegfx::B2DPolyPolygon(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRectangle( aLocalClipRect.Left() - rOffset.getX(),
aLocalClipRect.Top() - rOffset.getY(),
aLocalClipRect.Right() - rOffset.getX(),
@@ -268,7 +268,7 @@ namespace cppcanvas
const double y( rStartPos.getY() );
o_rPoly.append(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRectangle( x + nX1, y + nY1, x + nX2, y + nY2 ) ) );
}
@@ -279,7 +279,7 @@ namespace cppcanvas
const double nY2 )
{
o_rPoly.append(
- ::basegfx::tools::createPolygonFromRect(
+ ::basegfx::utils::createPolygonFromRect(
::basegfx::B2DRectangle( nX1, nY1, nX2, nY2 ) ) );
}
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 0c279ce00649..de099d9245df 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -25,7 +25,7 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <canvas/canvastools.hxx>
#include "pointaction.hxx"
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index a45642cb116b..7ad9399587a8 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -25,7 +25,7 @@
#include <vcl/canvastools.hxx>
#include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -91,7 +91,7 @@ namespace cppcanvas
bool bStroke ) :
CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
- maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
+ maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
mpCanvas( rCanvas ),
maState(),
maFillColor()
@@ -113,7 +113,7 @@ namespace cppcanvas
int nTransparency ) :
CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
- maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
+ maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
mpCanvas( rCanvas ),
maState(),
maFillColor()
@@ -264,7 +264,7 @@ namespace cppcanvas
const rendering::Texture& rTexture ) :
CachedPrimitiveBase( rCanvas, true ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
- maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
+ maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
mpCanvas( rCanvas ),
maState(),
maTexture( rTexture )
@@ -375,7 +375,7 @@ namespace cppcanvas
const rendering::StrokeAttributes& rStrokeAttributes ) :
CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
- maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
+ maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
mpCanvas( rCanvas ),
maState(),
maStrokeAttributes( rStrokeAttributes )
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 3c8827ecb65d..e53a2c0fe6e1 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -37,7 +37,7 @@
#include <vcl/canvastools.hxx>
#include <vcl/virdev.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <canvas/canvastools.hxx>
#include <memory>
@@ -74,7 +74,7 @@ namespace cppcanvas
nullptr,
&rState.fontRotation );
- basegfx::B2DHomMatrix aLocalTransformation(basegfx::tools::createRotateB2DHomMatrix(rState.fontRotation));
+ basegfx::B2DHomMatrix aLocalTransformation(basegfx::utils::createRotateB2DHomMatrix(rState.fontRotation));
aLocalTransformation.translate( rStartPoint.getX(),
rStartPoint.getY() );
::canvas::tools::appendToRenderState( o_rRenderState,
@@ -576,7 +576,7 @@ namespace cppcanvas
rOffsets,
rLineInfo ) );
- o_rOverallSize = ::basegfx::tools::getRange( aPoly ).getRange();
+ o_rOverallSize = ::basegfx::utils::getRange( aPoly ).getRange();
o_rTextLines = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
rCanvas->getUNOCanvas()->getDevice(),
@@ -593,7 +593,7 @@ namespace cppcanvas
tools::createTextLinesPolyPolygon( 0.0, nLineWidth,
rLineInfo ) );
- o_rOverallSize = ::basegfx::tools::getRange( aPoly ).getRange();
+ o_rOverallSize = ::basegfx::utils::getRange( aPoly ).getRange();
o_rTextLines = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
rCanvas->getUNOCanvas()->getDevice(),
@@ -1495,7 +1495,7 @@ namespace cppcanvas
return calcEffectTextBounds( ::basegfx::unotools::b2DRectangleFromRealRectangle2D(
xTextLayout->queryTextBounds() ),
- ::basegfx::tools::getRange( aPoly ),
+ ::basegfx::utils::getRange( aPoly ),
maReliefOffset,
maShadowOffset,
aLocalState,
@@ -2007,7 +2007,7 @@ namespace cppcanvas
rReliefColor,
rShadowOffset,
rShadowColor,
- ::basegfx::tools::getRange(aResultingPolyPolygon),
+ ::basegfx::utils::getRange(aResultingPolyPolygon),
xTextPoly,
aCharWidthSeq,
rVDev,
@@ -2024,7 +2024,7 @@ namespace cppcanvas
rReliefColor,
rShadowOffset,
rShadowColor,
- ::basegfx::tools::getRange(aResultingPolyPolygon),
+ ::basegfx::utils::getRange(aResultingPolyPolygon),
xTextPoly,
aCharWidthSeq,
rVDev,
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index f8e03bf467d3..16fa545c3c68 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -45,7 +45,7 @@
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include "transparencygroupaction.hxx"
@@ -380,7 +380,7 @@ namespace cppcanvas
// tdf#95709
// Adjust renderstate clip to modified scale from above
::basegfx::B2DPolyPolygon aClip = ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(aLocalState.Clip);
- aClip.transform(basegfx::tools::createScaleB2DHomMatrix(aScale));
+ aClip.transform(basegfx::utils::createScaleB2DHomMatrix(aScale));
aLocalState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mpCanvas->getUNOCanvas()->getDevice(), aClip);
}
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index 56b0f7543790..81e77cc39c1e 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#include <canvas/canvastools.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <cppcanvas/polypolygon.hxx>
diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx
index 04be736c272a..f3b3babbbc0f 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.cxx
@@ -26,7 +26,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <cppcanvas/basegfxfactory.hxx>
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index 35f335b4e63d..fee1cf357706 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -23,7 +23,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include "implbitmapcanvas.hxx"
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index f3e5f49e8980..23d055e2b9f6 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -21,7 +21,7 @@
#include <rtl/ustring.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <com/sun/star/rendering/XCanvas.hpp>
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index ab1504c78e5c..16e29abc541a 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/rendering/PathCapType.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include "implpolypolygon.hxx"
#include "tools.hxx"
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index e2921786ac30..aaff60db40ca 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/rendering/XSprite.hpp>
#include <com/sun/star/rendering/XAnimatedSprite.hpp>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <canvas/canvastools.hxx>
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 21a9ae4e0a18..9d720cdef5b0 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -18,7 +18,7 @@
*/
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <com/sun/star/rendering/InterpolationMode.hpp>