diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-09-22 14:12:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-09-26 14:18:41 +0200 |
| commit | 8e7897588d7185ef1964e8120669c1de3d1ce734 (patch) | |
| tree | 8f48598670a5dc22703371943c05789d60b9a07d /drawinglayer | |
| parent | 0b4135ec9945ea627318ecf5fccc4b7d0940ff0d (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 'drawinglayer')
73 files changed, 287 insertions, 287 deletions
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index 185e7031bb98..5f070d4f77df 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -97,9 +97,9 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b3drange.hxx> #include <basegfx/range/basicrange.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/tuple/b2dtuple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/vector/b2dsize.hxx> diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index 02dd689b7048..c8139bb19dfd 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -146,7 +146,7 @@ namespace drawinglayer const sal_uInt32 nDiscreteHeight(basegfx::fround((fHeight * fFactor100th_mmToInch) * DPI_Y)); basegfx::B2DHomMatrix aEmbedding( - basegfx::tools::createTranslateB2DHomMatrix( + basegfx::utils::createTranslateB2DHomMatrix( -aRange.getMinX(), -aRange.getMinY())); diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index e792c978c306..1010508e36b0 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -20,7 +20,7 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <com/sun/star/geometry/AffineMatrix2D.hpp> #include <com/sun/star/geometry/RealRectangle2D.hpp> #include <rtl/instance.hxx> diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index ab16e6125d46..a8ababa930aa 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -22,7 +22,7 @@ #include <basegfx/matrix/b3dhommatrix.hxx> #include <com/sun/star/geometry/AffineMatrix3D.hpp> #include <com/sun/star/geometry/RealRectangle3D.hpp> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <rtl/instance.hxx> diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 00af2589627d..5808b68e0374 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -162,7 +162,7 @@ namespace drawinglayer const sal_uInt32 nIndA(sal_uInt32(floor(fIndex))); const double fOffset(fIndex - (double)nIndA); basegfx::B2DHomMatrix aTargetTransform; - std::vector< basegfx::tools::B2DHomMatrixBufferedDecompose >::const_iterator aMatA(maMatrixStack.begin() + nIndA); + std::vector< basegfx::utils::B2DHomMatrixBufferedDecompose >::const_iterator aMatA(maMatrixStack.begin() + nIndA); if(basegfx::fTools::equalZero(fOffset)) { @@ -173,7 +173,7 @@ namespace drawinglayer { // interpolate. Get involved buffered decomposed matrices const sal_uInt32 nIndB((nIndA + 1) % nSize); - std::vector< basegfx::tools::B2DHomMatrixBufferedDecompose >::const_iterator aMatB(maMatrixStack.begin() + nIndB); + std::vector< basegfx::utils::B2DHomMatrixBufferedDecompose >::const_iterator aMatB(maMatrixStack.begin() + nIndB); // interpolate for fOffset [0.0 .. 1.0[ const basegfx::B2DVector aScale(basegfx::interpolate(aMatA->getScale(), aMatB->getScale(), fOffset)); @@ -182,7 +182,7 @@ namespace drawinglayer const double fShearX(((aMatB->getShearX() - aMatA->getShearX()) * fOffset) + aMatA->getShearX()); // build matrix for state - aTargetTransform = basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( + aTargetTransform = basegfx::utils::createScaleShearXRotateTranslateB2DHomMatrix( aScale, fShearX, fRotate, aTranslate); } diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index 00ef47ffd94d..3121a3fd573b 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -21,7 +21,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> @@ -37,7 +37,7 @@ namespace drawinglayer { if(!rViewInformation.getViewport().isEmpty()) { - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(rViewInformation.getViewport())); + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(rViewInformation.getViewport())); rContainer.push_back(new PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aOutline), getBColor())); } } diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 581f0c421c75..cd45da11bae5 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <comphelper/sequence.hxx> diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index 154791ab6e51..9e19fcce80b8 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 3b967fb092b5..f718ceef5511 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -202,7 +202,7 @@ namespace drawinglayer } // short form for scale and translate transformation - const basegfx::B2DHomMatrix aBitmapTransform(basegfx::tools::createScaleTranslateB2DHomMatrix( + const basegfx::B2DHomMatrix aBitmapTransform(basegfx::utils::createScaleTranslateB2DHomMatrix( aBitmapSizeLogic.getX(), aBitmapSizeLogic.getY(), aTranslate.getX(), aTranslate.getY())); // create primitive @@ -225,7 +225,7 @@ namespace drawinglayer // create a gray placeholder hairline polygon in object size basegfx::B2DRange aObjectRange(0.0, 0.0, 1.0, 1.0); aObjectRange.transform(getTransform()); - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aObjectRange)); + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aObjectRange)); const basegfx::BColor aGrayTone(0xc0 / 255.0, 0xc0 / 255.0, 0xc0 / 255.0); // The replacement object may also get a text like 'empty group' here later diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx index 0088e2f349b2..b5e459c07db6 100644 --- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx @@ -106,7 +106,7 @@ namespace drawinglayer aNewTransform.invert(); // apply crop enlargement in unit coordinates - aNewTransform = basegfx::tools::createScaleTranslateB2DHomMatrix( + aNewTransform = basegfx::utils::createScaleTranslateB2DHomMatrix( aNewRange.getRange(), aNewRange.getMinimum()) * aNewTransform; @@ -131,7 +131,7 @@ namespace drawinglayer else { // mask with original object's bounds - basegfx::B2DPolyPolygon aMaskPolyPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolyPolygon aMaskPolyPolygon(basegfx::utils::createUnitPolygon()); aMaskPolyPolygon.transform(getTransformation()); // create maskPrimitive with aMaskPolyPolygon and aMaskContentVector diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx index 3854e1a3f5aa..c46b27b50001 100644 --- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx @@ -182,7 +182,7 @@ namespace drawinglayer xRetval[0] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getTopLeft(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fBigLenX, fBigLenY, -fBorderX, @@ -192,7 +192,7 @@ namespace drawinglayer xRetval[1] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getTop(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX, fBorderY, fBorderX + fSingleX, @@ -202,7 +202,7 @@ namespace drawinglayer xRetval[2] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getTopRight(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fBigLenX, fBigLenY, 1.0 - fBorderX, @@ -212,7 +212,7 @@ namespace drawinglayer xRetval[3] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getRight(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fBorderX, 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY, 1.0 + fSingleX, @@ -222,7 +222,7 @@ namespace drawinglayer xRetval[4] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getBottomRight(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fBigLenX, fBigLenY, 1.0 - (fBorderX + fSingleX) + fSingleX, @@ -232,7 +232,7 @@ namespace drawinglayer xRetval[5] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getBottom(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX, fBorderY, fBorderX + fSingleX, @@ -242,7 +242,7 @@ namespace drawinglayer xRetval[6] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getBottomLeft(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fBigLenX, fBigLenY, -fBorderX, @@ -252,7 +252,7 @@ namespace drawinglayer xRetval[7] = Primitive2DReference( new BitmapPrimitive2D( getDiscreteShadow().getLeft(), - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fBorderX, 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY, -fBorderX, diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index 52642107069e..06ec8dd58a44 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -22,7 +22,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -67,7 +67,7 @@ namespace drawinglayer { // use info to create a yellow 2d rectangle, similar to empty 3d scenes and/or groups const basegfx::B2DRange aLocal2DRange(getB2DRange(rViewInformation)); - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aLocal2DRange)); + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aLocal2DRange)); const basegfx::BColor aYellow(1.0, 1.0, 0.0); rContainer.push_back(new PolygonHairlinePrimitive2D(aOutline, aYellow)); } diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index 1848d0165369..a890288e5e30 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -22,7 +22,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/texture/texture.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> @@ -158,7 +158,7 @@ namespace drawinglayer rContainer.push_back( new PolyPolygonColorPrimitive2D( basegfx::B2DPolyPolygon( - basegfx::tools::createPolygonFromRect(getOutputRange())), + basegfx::utils::createPolygonFromRect(getOutputRange())), rOuterColor)); // create solid fill steps @@ -198,7 +198,7 @@ namespace drawinglayer } // add outmost range to combined polypolygon (in 1st place), create first primitive - aCombinedPolyPoly.insert(0, basegfx::tools::createPolygonFromRect(aOutmostRange)); + aCombinedPolyPoly.insert(0, basegfx::utils::createPolygonFromRect(aOutmostRange)); rContainer.push_back( new PolyPolygonColorPrimitive2D( aCombinedPolyPoly, @@ -245,12 +245,12 @@ namespace drawinglayer case attribute::GradientStyle::Radial: case attribute::GradientStyle::Elliptical: { - aUnitPolygon = basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 1.0); + aUnitPolygon = basegfx::utils::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 1.0); break; } default: // GradientStyle::Linear, attribute::GradientStyle::Axial, attribute::GradientStyle::Square, attribute::GradientStyle::Rect { - aUnitPolygon = basegfx::tools::createPolygonFromRect(basegfx::B2DRange(-1.0, -1.0, 1.0, 1.0)); + aUnitPolygon = basegfx::utils::createPolygonFromRect(basegfx::B2DRange(-1.0, -1.0, 1.0, 1.0)); break; } } diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx index 9bdd689f0e78..eb5550deb22a 100644 --- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx @@ -81,7 +81,7 @@ namespace drawinglayer { // add graphic without tiling const basegfx::B2DHomMatrix aObjectTransform( - getTransformation() * basegfx::tools::createScaleTranslateB2DHomMatrix( + getTransformation() * basegfx::utils::createScaleTranslateB2DHomMatrix( rAttribute.getGraphicRange().getRange(), rAttribute.getGraphicRange().getMinimum())); @@ -119,10 +119,10 @@ namespace drawinglayer basegfx::B2DRange FillGraphicPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { // return range of it - basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aPolygon(basegfx::utils::createUnitPolygon()); aPolygon.transform(getTransformation()); - return basegfx::tools::getRange(aPolygon); + return basegfx::utils::getRange(aPolygon); } // provide unique ID diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 210ed61a251a..ce178aec61be 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -109,7 +109,7 @@ namespace drawinglayer rContainer.push_back( new PolyPolygonColorPrimitive2D( basegfx::B2DPolyPolygon( - basegfx::tools::createPolygonFromRect(getOutputRange())), getBColor())); + basegfx::utils::createPolygonFromRect(getOutputRange())), getBColor())); } // create primitives diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 35ec935ab9a7..4c2f80f87327 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -55,7 +55,7 @@ namespace drawinglayer // mirror by applying negative scale to the unit primitive and // applying the object transformation on it. - aTransform = basegfx::tools::createScaleB2DHomMatrix( + aTransform = basegfx::utils::createScaleB2DHomMatrix( bHMirr ? -1.0 : 1.0, bVMirr ? -1.0 : 1.0); aTransform.translate( diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 20ee33834afb..6d4e1ba14f8c 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -482,7 +482,7 @@ namespace drawinglayer { // translate back to origin, scale to unit coordinates basegfx::B2DHomMatrix aEmbedVectorGraphic( - basegfx::tools::createTranslateB2DHomMatrix( + basegfx::utils::createTranslateB2DHomMatrix( -rSvgRange.getMinX(), -rSvgRange.getMinY())); @@ -533,7 +533,7 @@ namespace drawinglayer || aMetaFileRealSize.getHeight() > aMetaFilePrefSize.getHeight()) { // clipping needed. Embed to MaskPrimitive2D. Create children and mask polygon - basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aMaskPolygon(basegfx::utils::createUnitPolygon()); aMaskPolygon.transform(rTransform); Primitive2DReference mask = new MaskPrimitive2D( diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index 9326d35b289d..877374e549ef 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/primitive2d/gridprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -43,7 +43,7 @@ namespace drawinglayer getTransform().decompose(aScale, aTranslate, fRotate, fShearX); // create grid matrix which transforms from scaled logic to view - basegfx::B2DHomMatrix aRST(basegfx::tools::createShearXRotateTranslateB2DHomMatrix( + basegfx::B2DHomMatrix aRST(basegfx::utils::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate.getX(), aTranslate.getY())); aRST *= rViewInformation.getObjectToViewTransformation(); diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index 760022c53e7d..eb31fade9fb6 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -21,7 +21,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> @@ -109,7 +109,7 @@ namespace drawinglayer if(aLine.count()) { // clip against visible area - const basegfx::B2DPolyPolygon aResult(basegfx::tools::clipPolygonOnRange(aLine, rViewInformation.getDiscreteViewport(), true, true)); + const basegfx::B2DPolyPolygon aResult(basegfx::utils::clipPolygonOnRange(aLine, rViewInformation.getDiscreteViewport(), true, true)); for(sal_uInt32 a(0); a < aResult.count(); a++) { diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index dd4d5241f3a2..fc9a7270afab 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -39,7 +39,7 @@ namespace drawinglayer xRetval.resize(1); // create background object - basegfx::B2DPolygon aBackgroundPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aBackgroundPolygon(basegfx::utils::createUnitPolygon()); aBackgroundPolygon.transform(getTransform()); const Primitive2DReference xRefBackground( new PolyPolygonColorPrimitive2D( diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index da3cca98b844..bb3d243b4beb 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -20,7 +20,7 @@ #include <drawinglayer/primitive2d/metafileprimitive2d.hxx> #include <wmfemfhelper.hxx> -//#include <basegfx/tools/canvastools.hxx> +//#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> //#include <basegfx/color/bcolor.hxx> //#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index 1b8c941537e7..64d47694d121 100644 --- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx @@ -58,7 +58,7 @@ namespace drawinglayer const Primitive2DReference xReferenceA( new MaskPrimitive2D( basegfx::B2DPolyPolygon( - basegfx::tools::createPolygonFromRect(aAllowedContentRange)), aContent)); + basegfx::utils::createPolygonFromRect(aAllowedContentRange)), aContent)); aContent = Primitive2DContainer { xReferenceA }; } @@ -92,7 +92,7 @@ namespace drawinglayer } // add the missing object transformation aspects - const basegfx::B2DHomMatrix aCombined(basegfx::tools::createShearXRotateTranslateB2DHomMatrix( + const basegfx::B2DHomMatrix aCombined(basegfx::utils::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate.getX(), aTranslate.getY())); aPageTrans = aCombined * aPageTrans; diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx index ed26d32470b9..1cad17802106 100644 --- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx @@ -54,7 +54,7 @@ namespace drawinglayer // get discrete rounded up square size of a single tile const basegfx::B2DHomMatrix aMaskRangeTransformation( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( aMaskRange.getRange(), aMaskRange.getMinimum())); const basegfx::B2DHomMatrix aTransform( @@ -105,7 +105,7 @@ namespace drawinglayer const geometry::ViewInformation2D aViewInformation2D; const primitive2d::Primitive2DReference xEmbedRef( new primitive2d::TransformPrimitive2D( - basegfx::tools::createScaleB2DHomMatrix(mnDiscreteWidth, mnDiscreteHeight), + basegfx::utils::createScaleB2DHomMatrix(mnDiscreteWidth, mnDiscreteHeight), getChildren())); const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef }; @@ -150,7 +150,7 @@ namespace drawinglayer { const Primitive2DReference xRef( new MaskPrimitive2D( - basegfx::B2DPolyPolygon(basegfx::tools::createPolygonFromRect(aUnitRange)), + basegfx::B2DPolyPolygon(basegfx::utils::createPolygonFromRect(aUnitRange)), aContent)); aContent = Primitive2DContainer { xRef }; @@ -195,7 +195,7 @@ namespace drawinglayer // transform result which is in unit coordinates to mask's object coordinates { const basegfx::B2DHomMatrix aMaskTransform( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( aMaskRange.getRange(), aMaskRange.getMinimum())); diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 0511d3602fd4..28bd5f2fe714 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> @@ -106,7 +106,7 @@ namespace drawinglayer aDash.push_back(fLogicDashLength); aDash.push_back(fLogicDashLength); - basegfx::tools::applyLineDashing(getB2DPolygon(), aDash, &aDashedPolyPolyA, &aDashedPolyPolyB, 2.0 * fLogicDashLength); + basegfx::utils::applyLineDashing(getB2DPolygon(), aDash, &aDashedPolyPolyA, &aDashedPolyPolyB, 2.0 * fLogicDashLength); rContainer.push_back(new PolyPolygonHairlinePrimitive2D(aDashedPolyPolyA, getRGBColorA())); rContainer.push_back(new PolyPolygonHairlinePrimitive2D(aDashedPolyPolyB, getRGBColorB())); @@ -218,7 +218,7 @@ namespace drawinglayer if(getB2DPolygon().count()) { // #i102241# try to simplify before usage - const basegfx::B2DPolygon aB2DPolygon(basegfx::tools::simplifyCurveSegments(getB2DPolygon())); + const basegfx::B2DPolygon aB2DPolygon(basegfx::utils::simplifyCurveSegments(getB2DPolygon())); basegfx::B2DPolyPolygon aHairLinePolyPolygon; if(getStrokeAttribute().isDefault() || 0.0 == getStrokeAttribute().getFullDotDashLen()) @@ -229,7 +229,7 @@ namespace drawinglayer else { // apply LineStyle - basegfx::tools::applyLineDashing( + basegfx::utils::applyLineDashing( aB2DPolygon, getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, nullptr, getStrokeAttribute().getFullDotDashLen()); } @@ -248,7 +248,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nCount; a++) { // New version of createAreaGeometry; now creates bezier polygons - aAreaPolyPolygon.append(basegfx::tools::createAreaGeometry( + aAreaPolyPolygon.append(basegfx::utils::createAreaGeometry( aHairLinePolyPolygon.getB2DPolygon(a), fHalfLineWidth, aLineJoin, @@ -404,7 +404,7 @@ namespace drawinglayer if(bHasWidth && bHasHeight) { // create waveline curve - const basegfx::B2DPolygon aWaveline(basegfx::tools::createWaveline(getB2DPolygon(), getWaveWidth(), getWaveHeight())); + const basegfx::B2DPolygon aWaveline(basegfx::utils::createWaveline(getB2DPolygon(), getWaveWidth(), getWaveHeight())); rContainer.push_back(new PolygonStrokePrimitive2D(aWaveline, getLineAttribute(), getStrokeAttribute())); } else @@ -511,7 +511,7 @@ namespace drawinglayer if(!aLocalPolygon.isClosed() && aLocalPolygon.count() > 1) { // apply arrows - const double fPolyLength(basegfx::tools::getLength(aLocalPolygon)); + const double fPolyLength(basegfx::utils::getLength(aLocalPolygon)); double fStart(0.0); double fEnd(0.0); double fStartOverlap(0.0); @@ -520,7 +520,7 @@ namespace drawinglayer if(!getStart().isDefault() && getStart().isActive()) { // create start arrow primitive and consume - aArrowA = basegfx::tools::createAreaGeometryForLineStartEnd( + aArrowA = basegfx::utils::createAreaGeometryForLineStartEnd( aLocalPolygon, getStart().getB2DPolyPolygon(), true, getStart().getWidth(), fPolyLength, getStart().isCentered() ? 0.5 : 0.0, &fStart); @@ -532,7 +532,7 @@ namespace drawinglayer if(!getEnd().isDefault() && getEnd().isActive()) { // create end arrow primitive and consume - aArrowB = basegfx::tools::createAreaGeometryForLineStartEnd( + aArrowB = basegfx::utils::createAreaGeometryForLineStartEnd( aLocalPolygon, getEnd().getB2DPolyPolygon(), false, getEnd().getWidth(), fPolyLength, getEnd().isCentered() ? 0.5 : 0.0, &fEnd); @@ -543,7 +543,7 @@ namespace drawinglayer if(0.0 != fStart || 0.0 != fEnd) { // build new poly, consume something from old poly - aLocalPolygon = basegfx::tools::getSnippetAbsolute(aLocalPolygon, fStart-fStartOverlap, fPolyLength - fEnd + fEndOverlap, fPolyLength); + aLocalPolygon = basegfx::utils::getSnippetAbsolute(aLocalPolygon, fStart-fStartOverlap, fPolyLength - fEnd + fEndOverlap, fPolyLength); } } diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx index a81922e52db0..73f40a1f319a 100644 --- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx @@ -19,7 +19,7 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx> @@ -77,7 +77,7 @@ namespace drawinglayer basegfx::B2DRange PolyPolygonHairlinePrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { // return range - return basegfx::tools::getRange(getB2DPolyPolygon()); + return basegfx::utils::getRange(getB2DPolyPolygon()); } // provide unique ID @@ -141,7 +141,7 @@ namespace drawinglayer basegfx::B2DRange PolyPolygonMarkerPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { // return range - return basegfx::tools::getRange(getB2DPolyPolygon()); + return basegfx::utils::getRange(getB2DPolyPolygon()); } // provide unique ID @@ -209,7 +209,7 @@ namespace drawinglayer basegfx::B2DRange PolyPolygonStrokePrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { // get range of it (subdivided) - basegfx::B2DRange aRetval(basegfx::tools::getRange(getB2DPolyPolygon())); + basegfx::B2DRange aRetval(basegfx::utils::getRange(getB2DPolyPolygon())); // if width, grow by line width if(getLineAttribute().getWidth()) @@ -256,7 +256,7 @@ namespace drawinglayer basegfx::B2DRange PolyPolygonColorPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { // return range - return basegfx::tools::getRange(getB2DPolyPolygon()); + return basegfx::utils::getRange(getB2DPolyPolygon()); } // provide unique ID @@ -422,7 +422,7 @@ namespace drawinglayer // create SubSequence with FillGraphicPrimitive2D based on polygon range const basegfx::B2DRange aOutRange(getB2DPolyPolygon().getB2DRange()); const basegfx::B2DHomMatrix aNewObjectTransform( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( aOutRange.getRange(), aOutRange.getMinimum())); Primitive2DReference xSubRef; @@ -439,14 +439,14 @@ namespace drawinglayer basegfx::B2DRange aAdaptedRange(getFillGraphic().getGraphicRange()); const basegfx::B2DHomMatrix aFromDefinitionRangeToGlobal( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( getDefinitionRange().getRange(), getDefinitionRange().getMinimum())); aAdaptedRange.transform(aFromDefinitionRangeToGlobal); basegfx::B2DHomMatrix aFromGlobalToOutRange( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( aOutRange.getRange(), aOutRange.getMinimum())); aFromGlobalToOutRange.invert(); @@ -595,7 +595,7 @@ namespace drawinglayer basegfx::B2DRange PolyPolygonSelectionPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const { - basegfx::B2DRange aRetval(basegfx::tools::getRange(getB2DPolyPolygon())); + basegfx::B2DRange aRetval(basegfx::utils::getRange(getB2DPolyPolygon())); if(getDiscreteGrow() > 0.0) { diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 3167d5f60d8f..6dce6773202b 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/primitive2d/sceneprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> @@ -482,7 +482,7 @@ namespace drawinglayer if(bAddOutlineToCreated3DSceneRepresentation) { - basegfx::B2DPolygon aOutline(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aOutline(basegfx::utils::createUnitPolygon()); aOutline.transform(aNew2DTransform); rContainer.push_back(new PolygonHairlinePrimitive2D(aOutline, basegfx::BColor(1.0, 0.0, 0.0))); } diff --git a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx index 40b5d3ef531c..be04cd9f44d5 100644 --- a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx +++ b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx @@ -32,7 +32,7 @@ namespace drawinglayer Primitive2DReference createHiddenGeometryPrimitives2D( const basegfx::B2DHomMatrix& rMatrix) { - const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createUnitPolygon()); + const basegfx::B2DPolygon aUnitOutline(basegfx::utils::createUnitPolygon()); return createHiddenGeometryPrimitives2D( false/*bFilled*/, @@ -64,7 +64,7 @@ namespace drawinglayer const basegfx::B2DRange& rRange, const basegfx::B2DHomMatrix& rMatrix) { - const basegfx::B2DPolyPolygon aOutline(basegfx::tools::createPolygonFromRect(rRange)); + const basegfx::B2DPolyPolygon aOutline(basegfx::utils::createPolygonFromRect(rRange)); return createHiddenGeometryPrimitives2D( bFilled, diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index 4375319e5453..78b15dbb2c6f 100644 --- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx @@ -21,7 +21,7 @@ #include <basegfx/color/bcolormodifier.hxx> #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index 60fc556a4f52..54b750d3df14 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -387,7 +387,7 @@ namespace drawinglayer // create ObjectTransform based on polygon range const basegfx::B2DHomMatrix aObjectTransform( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fPolyWidth, fPolyHeight, aPolyRange.getMinX(), aPolyRange.getMinY())); basegfx::B2DHomMatrix aUnitGradientToObject; @@ -449,7 +449,7 @@ namespace drawinglayer // add a pre-multiply to aUnitGradientToObject to allow // multiplication of the polygon(xl, 0.0, xr, 1.0) const basegfx::B2DHomMatrix aPreMultiply( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( 1.0, aUnitRange.getHeight(), 0.0, aUnitRange.getMinY())); aUnitGradientToObject = aUnitGradientToObject * aPreMultiply; @@ -725,7 +725,7 @@ namespace drawinglayer // create ObjectTransform based on polygon range const basegfx::B2DHomMatrix aObjectTransform( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fPolyWidth, fPolyHeight, aPolyRange.getMinX(), aPolyRange.getMinY())); basegfx::B2DHomMatrix aUnitGradientToObject; @@ -917,7 +917,7 @@ namespace drawinglayer // prepare polygon in needed width at start position (with discrete overlap) const basegfx::B2DPolygon aPolygon( - basegfx::tools::createPolygonFromRect( + basegfx::utils::createPolygonFromRect( basegfx::B2DRange( getOffsetA() - fDiscreteUnit, 0.0, @@ -932,7 +932,7 @@ namespace drawinglayer { basegfx::B2DPolygon aNew(aPolygon); - aNew.transform(basegfx::tools::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0)); + aNew.transform(basegfx::utils::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0)); rContainer.push_back(new PolyPolygonColorPrimitive2D( basegfx::B2DPolyPolygon(aNew), basegfx::interpolate(getColorA(), getColorB(), fUnitScale))); @@ -1013,7 +1013,7 @@ namespace drawinglayer getTranslateA(), fUnitScale)); - aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix( + aTransform = basegfx::utils::createScaleTranslateB2DHomMatrix( fEndScale, fEndScale, aTranslate.getX(), @@ -1021,12 +1021,12 @@ namespace drawinglayer } else { - aTransform = basegfx::tools::createScaleB2DHomMatrix( + aTransform = basegfx::utils::createScaleB2DHomMatrix( fEndScale, fEndScale); } - basegfx::B2DPolygon aNew(basegfx::tools::createPolygonFromUnitCircle()); + basegfx::B2DPolygon aNew(basegfx::utils::createPolygonFromUnitCircle()); aNew.transform(aTransform); rContainer.push_back(new PolyPolygonColorPrimitive2D( diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index 897166caa5fc..dbc19901001d 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -36,7 +36,7 @@ namespace drawinglayer { void TextDecoratedPortionPrimitive2D::impCreateGeometryContent( std::vector< Primitive2DReference >& rTarget, - basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose const & rDecTrans, + basegfx::utils::B2DHomMatrixBufferedOnDemandDecompose const & rDecTrans, const OUString& rText, sal_Int32 nTextPosition, sal_Int32 nTextLength, @@ -176,7 +176,7 @@ namespace drawinglayer } } std::vector< Primitive2DReference > aNewPrimitives; - basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose aDecTrans(getTextTransform()); + basegfx::utils::B2DHomMatrixBufferedOnDemandDecompose aDecTrans(getTextTransform()); Primitive2DContainer aRetval; // create basic geometry such as SimpleTextPrimitive, Overline, Underline, @@ -233,7 +233,7 @@ namespace drawinglayer static basegfx::BColor aShadowColor(0.3, 0.3, 0.3); // preapare shadow transform matrix - const basegfx::B2DHomMatrix aShadowTransform(basegfx::tools::createTranslateB2DHomMatrix( + const basegfx::B2DHomMatrix aShadowTransform(basegfx::utils::createTranslateB2DHomMatrix( fTextShadowOffset, fTextShadowOffset)); // create shadow primitive diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx index 858be59a4f89..af22b38ba958 100644 --- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx @@ -47,12 +47,12 @@ namespace drawinglayer case TextEffectStyle2D::ReliefEngravedDefault: { // prepare transform of sub-group back to (0,0) and align to X-Axis - basegfx::B2DHomMatrix aBackTransform(basegfx::tools::createTranslateB2DHomMatrix( + basegfx::B2DHomMatrix aBackTransform(basegfx::utils::createTranslateB2DHomMatrix( -getRotationCenter().getX(), -getRotationCenter().getY())); aBackTransform.rotate(-getDirection()); // prepare transform of sub-group back to its position and rotation - basegfx::B2DHomMatrix aForwardTransform(basegfx::tools::createRotateB2DHomMatrix(getDirection())); + basegfx::B2DHomMatrix aForwardTransform(basegfx::utils::createRotateB2DHomMatrix(getDirection())); aForwardTransform.translate(getRotationCenter().getX(), getRotationCenter().getY()); // create transformation for one discrete unit diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index a9ad1ec2dd89..89d1b92afec6 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -189,7 +189,7 @@ namespace drawinglayer aLine.append(basegfx::B2DPoint(getWidth(), fOffset)); const basegfx::B2DHomMatrix aUnscaledTransform( - basegfx::tools::createShearXRotateTranslateB2DHomMatrix( + basegfx::utils::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate)); aLine.transform(aUnscaledTransform); @@ -230,7 +230,7 @@ namespace drawinglayer } // move base point of text to 0.0 and de-rotate - basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( + basegfx::B2DHomMatrix aTransform(basegfx::utils::createTranslateB2DHomMatrix( -aTranslate.getX(), -aTranslate.getY())); aTransform.rotate(-fRotate); diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 3dc00a9e1a99..adc0ecaad385 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -157,7 +157,7 @@ namespace drawinglayer if(nCount) { // prepare object transformation for polygons - rTransformation = basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( + rTransformation = basegfx::utils::createScaleShearXRotateTranslateB2DHomMatrix( aScale, fShearX, fRotate, aTranslate); } } @@ -308,7 +308,7 @@ namespace drawinglayer if(!aNewRange.isEmpty()) { // prepare object transformation for range - const basegfx::B2DHomMatrix aRangeTransformation(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( + const basegfx::B2DHomMatrix aRangeTransformation(basegfx::utils::createScaleShearXRotateTranslateB2DHomMatrix( aScale, fShearX, fRotate, aTranslate)); // apply range transformation to it diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 37b9c3cd68fd..952ef92284ae 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -193,7 +193,7 @@ namespace drawinglayer aStrikeoutLine.append(basegfx::B2DPoint(getWidth(), -fStrikeoutOffset)); const basegfx::B2DHomMatrix aUnscaledTransform( - basegfx::tools::createShearXRotateTranslateB2DHomMatrix( + basegfx::utils::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate)); aStrikeoutLine.transform(aUnscaledTransform); @@ -210,7 +210,7 @@ namespace drawinglayer const double fLineDist(2.0 * fStrikeoutHeight); // move base point of text to 0.0 and de-rotate - basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( + basegfx::B2DHomMatrix aTransform(basegfx::utils::createTranslateB2DHomMatrix( -aTranslate.getX(), -aTranslate.getY())); aTransform.rotate(-fRotate); diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx index 002b6490752b..39f5db38cdeb 100644 --- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx index 24f07733e81c..23a01e03e101 100644 --- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx @@ -87,7 +87,7 @@ namespace drawinglayer // I will take the last one here. The small overhead of two primitives will only be // used when UnifiedTransparencePrimitive2D is not handled directly. const basegfx::B2DRange aPolygonRange(getChildren().getB2DRange(rViewInformation)); - const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aPolygonRange)); + const basegfx::B2DPolygon aPolygon(basegfx::utils::createPolygonFromRect(aPolygonRange)); const basegfx::BColor aGray(getTransparence(), getTransparence(), getTransparence()); Primitive2DContainer aTransparenceContent(2); diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index b5280ad2f31c..6bab9e92255f 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx @@ -184,7 +184,7 @@ namespace drawinglayer // create ObjectTransform const basegfx::B2DHomMatrix aObjectTransform( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( getLocalObjectRange().getRange(), getLocalObjectRange().getMinimum())); @@ -203,7 +203,7 @@ namespace drawinglayer { // embed to clipping; this is necessary for tiled fills const basegfx::B2DPolyPolygon aPolyPolygon( - basegfx::tools::createPolygonFromRect(getLocalObjectRange())); + basegfx::utils::createPolygonFromRect(getLocalObjectRange())); const drawinglayer::primitive2d::Primitive2DReference xClippedFill( new drawinglayer::primitive2d::MaskPrimitive2D( aPolyPolygon, diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx index d9d5804c69ff..cfac964e1a3a 100644 --- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx @@ -19,7 +19,7 @@ #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <comphelper/sequence.hxx> diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index d8348b2689f4..4400dd827d66 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -132,7 +132,7 @@ namespace drawinglayer { // found two linearly independent 2D vectors // get 2d range of texture coordinates - const basegfx::B2DRange aOutlineRange(basegfx::tools::getRange(aTexPolyPolygon)); + const basegfx::B2DRange aOutlineRange(basegfx::utils::getRange(aTexPolyPolygon)); const basegfx::BColor aHatchColor(getHatch().getColor()); const double fAngle(getHatch().getAngle()); std::vector< basegfx::B2DHomMatrix > aMatrices; @@ -195,7 +195,7 @@ namespace drawinglayer if(a2DHatchLines.count()) { // clip against texture polygon - a2DHatchLines = basegfx::tools::clipPolyPolygonOnPolyPolygon(a2DHatchLines, aTexPolyPolygon, true, true); + a2DHatchLines = basegfx::utils::clipPolyPolygonOnPolyPolygon(a2DHatchLines, aTexPolyPolygon, true, true); } if(a2DHatchLines.count()) @@ -216,7 +216,7 @@ namespace drawinglayer a2DHatchLines.transform(a2D); // expand back-transformed geometry to 3D - basegfx::B3DPolyPolygon a3DHatchLines(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(a2DHatchLines, 0.0)); + basegfx::B3DPolyPolygon a3DHatchLines(basegfx::utils::createB3DPolyPolygonFromB2DPolyPolygon(a2DHatchLines, 0.0)); // create 3d matrix with 3d vectors as column vectors (0,0,1 as Z) and 3d point as offset, this represents // a coordinate system transformation from unit coordinates to the object's 3d coordinate system diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index 20de70b7610a..a1956d9786e6 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx @@ -19,7 +19,7 @@ #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> #include <basegfx/polygon/b3dpolygontools.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> #include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> @@ -56,7 +56,7 @@ namespace drawinglayer basegfx::B3DRange PolygonHairlinePrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const { - return basegfx::tools::getRange(getB3DPolygon()); + return basegfx::utils::getRange(getB3DPolygon()); } // provide unique ID @@ -85,7 +85,7 @@ namespace drawinglayer else { // apply LineStyle - basegfx::tools::applyLineDashing(getB3DPolygon(), getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, nullptr, getStrokeAttribute().getFullDotDashLen()); + basegfx::utils::applyLineDashing(getB3DPolygon(), getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, nullptr, getStrokeAttribute().getFullDotDashLen()); } // prepare result diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 5657307dd5f3..fb6555fd4e05 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -239,7 +239,7 @@ namespace drawinglayer // create half-sphere; upper half of unit sphere basegfx::B3DPolyPolygon aSphere( - basegfx::tools::createUnitSphereFillPolyPolygon( + basegfx::utils::createUnitSphereFillPolyPolygon( nSegments, nVerSeg, true, @@ -314,7 +314,7 @@ namespace drawinglayer if(nHorSeg) { // create half-sphere - const basegfx::B3DPolyPolygon aSphere(basegfx::tools::createUnitSphereFillPolyPolygon(nHorSeg, nVerSeg, true, F_PI2, -F_PI2, 0.0, fAngle)); + const basegfx::B3DPolyPolygon aSphere(basegfx::utils::createUnitSphereFillPolyPolygon(nHorSeg, nVerSeg, true, F_PI2, -F_PI2, 0.0, fAngle)); for(sal_uInt32 a(0); a < aSphere.count(); a++) { diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx index 3a77955da71a..38acc8c123f9 100644 --- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx @@ -19,7 +19,7 @@ #include <drawinglayer/primitive3d/polypolygonprimitive3d.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> @@ -57,7 +57,7 @@ namespace drawinglayer basegfx::B3DRange PolyPolygonMaterialPrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const { - return basegfx::tools::getRange(getB3DPolyPolygon()); + return basegfx::utils::getRange(getB3DPolyPolygon()); } // provide unique ID diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 9b6d650e0303..864d3e41e98b 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -22,7 +22,7 @@ #include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> @@ -40,7 +40,7 @@ namespace drawinglayer { const basegfx::B3DRange aUnitRange(0.0, 0.0, 0.0, 1.0, 1.0, 1.0); Primitive3DContainer aRetval; - basegfx::B3DPolyPolygon aFill(basegfx::tools::createCubeFillPolyPolygonFromB3DRange(aUnitRange)); + basegfx::B3DPolyPolygon aFill(basegfx::utils::createCubeFillPolyPolygonFromB3DRange(aUnitRange)); // normal creation if(!getSdrLFSAttribute().getFill().isDefault()) @@ -49,14 +49,14 @@ namespace drawinglayer || css::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()) { // create sphere normals - const basegfx::B3DPoint aCenter(basegfx::tools::getRange(aFill).getCenter()); - aFill = basegfx::tools::applyDefaultNormalsSphere(aFill, aCenter); + const basegfx::B3DPoint aCenter(basegfx::utils::getRange(aFill).getCenter()); + aFill = basegfx::utils::applyDefaultNormalsSphere(aFill, aCenter); } if(getSdr3DObjectAttribute().getNormalsInvert()) { // invert normals - aFill = basegfx::tools::invertNormals(aFill); + aFill = basegfx::utils::invertNormals(aFill); } } @@ -76,16 +76,16 @@ namespace drawinglayer if(bParallelX || bParallelY) { // apply parallel texture coordinates in X and/or Y - const basegfx::B3DRange aRange(basegfx::tools::getRange(aFill)); - aFill = basegfx::tools::applyDefaultTextureCoordinatesParallel(aFill, aRange, bParallelX, bParallelY); + const basegfx::B3DRange aRange(basegfx::utils::getRange(aFill)); + aFill = basegfx::utils::applyDefaultTextureCoordinatesParallel(aFill, aRange, bParallelX, bParallelY); } if(bSphereX || bSphereY) { // apply spherical texture coordinates in X and/or Y - const basegfx::B3DRange aRange(basegfx::tools::getRange(aFill)); + const basegfx::B3DRange aRange(basegfx::utils::getRange(aFill)); const basegfx::B3DPoint aCenter(aRange.getCenter()); - aFill = basegfx::tools::applyDefaultTextureCoordinatesSphere(aFill, aCenter, bSphereX, bSphereY); + aFill = basegfx::utils::applyDefaultTextureCoordinatesSphere(aFill, aCenter, bSphereX, bSphereY); } if(bObjectSpecificX || bObjectSpecificY) @@ -157,7 +157,7 @@ namespace drawinglayer // add line if(!getSdrLFSAttribute().getLine().isDefault()) { - basegfx::B3DPolyPolygon aLine(basegfx::tools::createCubePolyPolygonFromB3DRange(aUnitRange)); + basegfx::B3DPolyPolygon aLine(basegfx::utils::createCubePolyPolygonFromB3DRange(aUnitRange)); const Primitive3DContainer aLines(create3DPolyPolygonLinePrimitives( aLine, getTransform(), getSdrLFSAttribute().getLine())); aRetval.append(aLines); diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index 8f8f80303e9d..dcea2f877543 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx @@ -51,7 +51,7 @@ namespace drawinglayer for(basegfx::B3DPolyPolygon & a : rFill) { - aRetval.expand(basegfx::tools::getRange(a)); + aRetval.expand(basegfx::utils::getRange(a)); } return aRetval; @@ -64,7 +64,7 @@ namespace drawinglayer for(basegfx::B3DPolyPolygon & a : rFill) { - a = basegfx::tools::applyDefaultNormalsSphere(a, aCenter); + a = basegfx::utils::applyDefaultNormalsSphere(a, aCenter); } } @@ -81,7 +81,7 @@ namespace drawinglayer // invert normals for(basegfx::B3DPolyPolygon & a : rFill) { - a = basegfx::tools::invertNormals(a); + a = basegfx::utils::invertNormals(a); } } @@ -105,7 +105,7 @@ namespace drawinglayer // apply parallel texture coordinates in X and/or Y for(auto & a: rFill) { - a = basegfx::tools::applyDefaultTextureCoordinatesParallel(a, rRange, bParallelX, bParallelY); + a = basegfx::utils::applyDefaultTextureCoordinatesParallel(a, rRange, bParallelX, bParallelY); } } @@ -116,7 +116,7 @@ namespace drawinglayer for(auto & a: rFill) { - a = basegfx::tools::applyDefaultTextureCoordinatesSphere(a, aCenter, bSphereX, bSphereY); + a = basegfx::utils::applyDefaultTextureCoordinatesSphere(a, aCenter, bSphereX, bSphereY); } } diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index deac45e862c9..be8fc6d91368 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -50,7 +50,7 @@ namespace if(!basegfx::fTools::equalZero(fScale)) { - const basegfx::B2DRange aRange(basegfx::tools::getRange(rSource)); + const basegfx::B2DRange aRange(basegfx::utils::getRange(rSource)); const basegfx::B2DPoint aCenter(aRange.getCenter()); basegfx::B2DHomMatrix aTrans; @@ -78,9 +78,9 @@ namespace // grow the outside polygon and scale all polygons to original size. This is done // to avoid a shrink which potentially would lead to self-intersections, but changes // the original polygon -> not a precision step, so e.g. not usable for charts - const basegfx::B2DRange aRange(basegfx::tools::getRange(rPolygon)); - rPolygon = basegfx::tools::growInNormalDirection(rPolygon, fOffset); - const basegfx::B2DRange aGrownRange(basegfx::tools::getRange(rPolygon)); + const basegfx::B2DRange aRange(basegfx::utils::getRange(rPolygon)); + rPolygon = basegfx::utils::growInNormalDirection(rPolygon, fOffset); + const basegfx::B2DRange aGrownRange(basegfx::utils::getRange(rPolygon)); const double fScaleX(basegfx::fTools::equalZero(aGrownRange.getWidth()) ? 1.0 : aRange.getWidth() / aGrownRange.getWidth()); const double fScaleY(basegfx::fTools::equalZero(aGrownRange.getHeight())? 1.0 : aRange.getHeight() / aGrownRange.getHeight()); basegfx::B2DHomMatrix aScaleTrans; @@ -95,8 +95,8 @@ namespace { // use more precision, shrink the outer polygons. Since this may lead to self-intersections, // some kind of correction should be applied here after that step - rOuterPolyPolygon = basegfx::tools::growInNormalDirection(rPolygon, -fOffset); - // basegfx::tools::correctGrowShrinkPolygonPair(rPolygon, rOuterPolyPolygon); + rOuterPolyPolygon = basegfx::utils::growInNormalDirection(rPolygon, -fOffset); + // basegfx::utils::correctGrowShrinkPolygonPair(rPolygon, rOuterPolyPolygon); } } } @@ -128,10 +128,10 @@ namespace if(bCreateTextureCoordinates) { - const double fPolygonLengthA(basegfx::tools::getLength(aSubA)); + const double fPolygonLengthA(basegfx::utils::getLength(aSubA)); fTexHorMultiplicatorA = basegfx::fTools::equalZero(fPolygonLengthA) ? 1.0 : 1.0 / fPolygonLengthA; - const double fPolygonLengthB(basegfx::tools::getLength(aSubB)); + const double fPolygonLengthB(basegfx::utils::getLength(aSubB)); fTexHorMultiplicatorB = basegfx::fTools::equalZero(fPolygonLengthB) ? 1.0 : 1.0 / fPolygonLengthB; } @@ -330,7 +330,7 @@ namespace const basegfx::B2DPoint aNext(rPoly.getB2DPoint(nNextIndex)); const basegfx::B2DVector aEdgeVector(aNext - aCurrent); - if(basegfx::tools::findCut( + if(basegfx::utils::findCut( rStart, aVector, aCurrent, aEdgeVector) != CutFlagValue::NONE) { @@ -394,7 +394,7 @@ namespace drawinglayer if(bCloseFront || bCloseBack) { - const basegfx::B2DRange aBaseRange(basegfx::tools::getRange(aFront)); + const basegfx::B2DRange aBaseRange(basegfx::utils::getRange(aFront)); const double fOuterLength(aBaseRange.getMaxX() * fRotation); const double fInnerLength(aBaseRange.getMinX() * fRotation); const double fAverageLength((fOuterLength + fInnerLength) * 0.5); @@ -430,7 +430,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nSteps; a++) { const double fStep((double)(a + 1) * fStepSize); - basegfx::B2DPolyPolygon aNewPoly(bBackScale ? basegfx::tools::interpolate(aFront, aBack, fStep) : aFront); + basegfx::B2DPolyPolygon aNewPoly(bBackScale ? basegfx::utils::interpolate(aFront, aBack, fStep) : aFront); basegfx::B3DHomMatrix aNewMat; aNewMat.rotate(0.0, fRotation * fStep, 0.0); rSliceVector.emplace_back(aNewPoly, aNewMat); @@ -601,8 +601,8 @@ namespace drawinglayer if(bCreateTextureCoordinates) { - aTexRangeFront = basegfx::tools::getRange(rSliceVector[0].getB3DPolyPolygon()); - aTexRangeBack = basegfx::tools::getRange(rSliceVector[nNumSlices - 1].getB3DPolyPolygon()); + aTexRangeFront = basegfx::utils::getRange(rSliceVector[0].getB3DPolyPolygon()); + aTexRangeBack = basegfx::utils::getRange(rSliceVector[nNumSlices - 1].getB3DPolyPolygon()); if(aTexRangeBack.getDepth() > aTexRangeBack.getWidth()) { @@ -614,11 +614,11 @@ namespace drawinglayer aTexRangeBack.getMaxZ(), aTexRangeBack.getMaxY(), aTexRangeBack.getMaxX()); } - basegfx::B3DPoint aCenter(basegfx::tools::getRange(rSliceVector[0].getB3DPolyPolygon()).getCenter()); + basegfx::B3DPoint aCenter(basegfx::utils::getRange(rSliceVector[0].getB3DPolyPolygon()).getCenter()); for(a = 0; a < nLoopCount; a++) { - const basegfx::B3DPoint aNextCenter(basegfx::tools::getRange(rSliceVector[(a + 1) % nNumSlices].getB3DPolyPolygon()).getCenter()); + const basegfx::B3DPoint aNextCenter(basegfx::utils::getRange(rSliceVector[(a + 1) % nNumSlices].getB3DPolyPolygon()).getCenter()); const double fLength(basegfx::B3DVector(aNextCenter - aCenter).getLength()); aTexHeightArray.push_back(fLength); aCenter = aNextCenter; @@ -663,7 +663,7 @@ namespace drawinglayer if(bCreateTextureCoordinates) { - aFront = basegfx::tools::applyDefaultTextureCoordinatesParallel(aFront, aTexRangeFront); + aFront = basegfx::utils::applyDefaultTextureCoordinatesParallel(aFront, aTexRangeFront); } if(bCreateNormals) @@ -761,7 +761,7 @@ namespace drawinglayer if(bCreateTextureCoordinates) { - aBack = basegfx::tools::applyDefaultTextureCoordinatesParallel(aBack, aTexRangeBack); + aBack = basegfx::utils::applyDefaultTextureCoordinatesParallel(aBack, aTexRangeBack); } if(bCreateNormals) @@ -865,7 +865,7 @@ namespace drawinglayer if(bCreateTextureCoordinates) { - aFront = basegfx::tools::applyDefaultTextureCoordinatesParallel(aFront, aTexRangeFront); + aFront = basegfx::utils::applyDefaultTextureCoordinatesParallel(aFront, aTexRangeFront); } if(bCreateNormals) @@ -911,8 +911,8 @@ namespace drawinglayer if(nPointCount && nPointCount == rLoopB.count()) { const basegfx::B3DHomMatrix aObjectTransform(rViewInformation.getObjectToView() * rObjectTransform); - const basegfx::B2DPolygon a2DLoopA(basegfx::tools::createB2DPolygonFromB3DPolygon(rLoopA, aObjectTransform)); - const basegfx::B2DPolygon a2DLoopB(basegfx::tools::createB2DPolygonFromB3DPolygon(rLoopB, aObjectTransform)); + const basegfx::B2DPolygon a2DLoopA(basegfx::utils::createB2DPolygonFromB3DPolygon(rLoopA, aObjectTransform)); + const basegfx::B2DPolygon a2DLoopB(basegfx::utils::createB2DPolygonFromB3DPolygon(rLoopB, aObjectTransform)); const basegfx::B2DPoint a2DCenterA(a2DLoopA.getB2DRange().getCenter()); const basegfx::B2DPoint a2DCenterB(a2DLoopB.getB2DRange().getCenter()); @@ -933,9 +933,9 @@ namespace drawinglayer const basegfx::B2DPoint aEnd(a2DLoopB.getB2DPoint(a)); const basegfx::B2DPoint aMiddle(basegfx::average(aStart, aEnd)); - if(!basegfx::tools::isInside(a2DLoopA, aMiddle)) + if(!basegfx::utils::isInside(a2DLoopA, aMiddle)) { - if(!basegfx::tools::isInside(a2DLoopB, aMiddle)) + if(!basegfx::utils::isInside(a2DLoopB, aMiddle)) { if(!impHasCutWith(a2DLoopA, aStart, aEnd)) { diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index 06a6eb3f2050..246894d0eab1 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -22,7 +22,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> #include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> @@ -58,8 +58,8 @@ namespace drawinglayer if(!getSdrLFSAttribute().getFill().isDefault() && (bCreateTextureCoordinatesX || bCreateTextureCoordinatesY)) { const basegfx::B2DPolygon aFirstPolygon(maCorrectedPolyPolygon.getB2DPolygon(0)); - const double fFrontLength(basegfx::tools::getLength(aFirstPolygon)); - const double fFrontArea(basegfx::tools::getArea(aFirstPolygon)); + const double fFrontLength(basegfx::utils::getLength(aFirstPolygon)); + const double fFrontArea(basegfx::utils::getArea(aFirstPolygon)); const double fSqrtFrontArea(sqrt(fFrontArea)); double fRelativeTextureWidth = basegfx::fTools::equalZero(fSqrtFrontArea) ? 1.0 : fFrontLength / fSqrtFrontArea; fRelativeTextureWidth = (double)((sal_uInt32)(fRelativeTextureWidth - 0.5)); @@ -360,10 +360,10 @@ namespace drawinglayer // prepare the polygon. No double points, correct orientations and a correct // outmost polygon are needed // Also important: subdivide here to ensure equal point count for all slices (!) - maCorrectedPolyPolygon = basegfx::tools::adaptiveSubdivideByAngle(getPolyPolygon()); + maCorrectedPolyPolygon = basegfx::utils::adaptiveSubdivideByAngle(getPolyPolygon()); maCorrectedPolyPolygon.removeDoublePoints(); - maCorrectedPolyPolygon = basegfx::tools::correctOrientations(maCorrectedPolyPolygon); - maCorrectedPolyPolygon = basegfx::tools::correctOutmostPolygon(maCorrectedPolyPolygon); + maCorrectedPolyPolygon = basegfx::utils::correctOrientations(maCorrectedPolyPolygon); + maCorrectedPolyPolygon = basegfx::utils::correctOutmostPolygon(maCorrectedPolyPolygon); // prepare slices as geometry createExtrudeSlices(maSlices, maCorrectedPolyPolygon, getBackScale(), getDiagonal(), getDepth(), getCharacterMode(), getCloseFront(), getCloseBack()); diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index f453d03578d9..a63a7886e4b3 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -22,7 +22,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> #include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> @@ -205,10 +205,10 @@ namespace drawinglayer // prepare the polygon. No double points, correct orientations and a correct // outmost polygon are needed // Also important: subdivide here to ensure equal point count for all slices (!) - maCorrectedPolyPolygon = basegfx::tools::adaptiveSubdivideByAngle(getPolyPolygon()); + maCorrectedPolyPolygon = basegfx::utils::adaptiveSubdivideByAngle(getPolyPolygon()); maCorrectedPolyPolygon.removeDoublePoints(); - maCorrectedPolyPolygon = basegfx::tools::correctOrientations(maCorrectedPolyPolygon); - maCorrectedPolyPolygon = basegfx::tools::correctOutmostPolygon(maCorrectedPolyPolygon); + maCorrectedPolyPolygon = basegfx::utils::correctOrientations(maCorrectedPolyPolygon); + maCorrectedPolyPolygon = basegfx::utils::correctOutmostPolygon(maCorrectedPolyPolygon); // check edge count of first sub-polygon. If different, reSegment polyPolygon. This ensures // that for polyPolygons, the subPolys 1..n only get reSegmented when polygon 0 is different @@ -218,7 +218,7 @@ namespace drawinglayer if(nSubEdgeCount != getVerticalSegments()) { - maCorrectedPolyPolygon = basegfx::tools::reSegmentPolyPolygon(maCorrectedPolyPolygon, getVerticalSegments()); + maCorrectedPolyPolygon = basegfx::utils::reSegmentPolyPolygon(maCorrectedPolyPolygon, getVerticalSegments()); } // prepare slices as geometry diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx index 76c2ac5d24eb..d94ff20bfebf 100644 --- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx @@ -153,7 +153,7 @@ namespace drawinglayer if(getPolyPolygon3D().count()) { - aRetval = basegfx::tools::getRange(getPolyPolygon3D()); + aRetval = basegfx::utils::getRange(getPolyPolygon3D()); aRetval.transform(getTransform()); if(!getSdrLFSAttribute().getLine().isDefault()) diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx index 298b58410041..8547da5a89bf 100644 --- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx @@ -57,7 +57,7 @@ namespace drawinglayer { for(const auto & rSlice : rSlices) { - aRetval.expand(basegfx::tools::getRange(rSlice.getB3DPolyPolygon())); + aRetval.expand(basegfx::utils::getRange(rSlice.getB3DPolyPolygon())); } aRetval.transform(getTransform()); diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index e09476df2c19..396cf22c0e7f 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -22,7 +22,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> @@ -44,7 +44,7 @@ namespace drawinglayer || css::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()); // create unit geometry - basegfx::B3DPolyPolygon aFill(basegfx::tools::createSphereFillPolyPolygonFromB3DRange(aUnitRange, + basegfx::B3DPolyPolygon aFill(basegfx::utils::createSphereFillPolyPolygonFromB3DRange(aUnitRange, getHorizontalSegments(), getVerticalSegments(), bCreateNormals)); // normal inversion @@ -54,7 +54,7 @@ namespace drawinglayer && aFill.areNormalsUsed()) { // invert normals - aFill = basegfx::tools::invertNormals(aFill); + aFill = basegfx::utils::invertNormals(aFill); } // texture coordinates @@ -73,8 +73,8 @@ namespace drawinglayer if(bParallelX || bParallelY) { // apply parallel texture coordinates in X and/or Y - const basegfx::B3DRange aRange(basegfx::tools::getRange(aFill)); - aFill = basegfx::tools::applyDefaultTextureCoordinatesParallel(aFill, aRange, bParallelX, bParallelY); + const basegfx::B3DRange aRange(basegfx::utils::getRange(aFill)); + aFill = basegfx::utils::applyDefaultTextureCoordinatesParallel(aFill, aRange, bParallelX, bParallelY); } if(bSphereX || bObjectSpecificX || bSphereY || bObjectSpecificY) @@ -94,9 +94,9 @@ namespace drawinglayer } // apply spherical texture coordinates in X and/or Y - const basegfx::B3DRange aRange(basegfx::tools::getRange(aFill)); + const basegfx::B3DRange aRange(basegfx::utils::getRange(aFill)); const basegfx::B3DPoint aCenter(aRange.getCenter()); - aFill = basegfx::tools::applyDefaultTextureCoordinatesSphere(aFill, aCenter, + aFill = basegfx::utils::applyDefaultTextureCoordinatesSphere(aFill, aCenter, bSphereX || bObjectSpecificX, bSphereY || bObjectSpecificY); if(bObjectSpecificX) @@ -146,7 +146,7 @@ namespace drawinglayer // add line if(!getSdrLFSAttribute().getLine().isDefault()) { - basegfx::B3DPolyPolygon aSphere(basegfx::tools::createSpherePolyPolygonFromB3DRange(aUnitRange, getHorizontalSegments(), getVerticalSegments())); + basegfx::B3DPolyPolygon aSphere(basegfx::utils::createSpherePolyPolygonFromB3DRange(aUnitRange, getHorizontalSegments(), getVerticalSegments())); const Primitive3DContainer aLines(create3DPolyPolygonLinePrimitives( aSphere, getTransform(), getSdrLFSAttribute().getLine())); aRetval.append(aLines); diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx index 7af03029fc43..0090d0ec08fa 100644 --- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/primitive3d/transformprimitive3d.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx index 5015544f4c18..7e730bd2293e 100644 --- a/drawinglayer/source/processor2d/contourextractor2d.cxx +++ b/drawinglayer/source/processor2d/contourextractor2d.cxx @@ -67,7 +67,7 @@ namespace drawinglayer { // line polygons need to be represented as open polygons to differentiate them // from filled polygons - basegfx::tools::openWithGeometryChange(aLocalPolygon); + basegfx::utils::openWithGeometryChange(aLocalPolygon); } maExtractedContour.emplace_back(aLocalPolygon); @@ -88,7 +88,7 @@ namespace drawinglayer // extract BoundRect from bitmaps in world coordinates const primitive2d::BitmapPrimitive2D& rBitmapCandidate(static_cast< const primitive2d::BitmapPrimitive2D& >(rCandidate)); basegfx::B2DHomMatrix aLocalTransform(getViewInformation2D().getObjectTransformation() * rBitmapCandidate.getTransform()); - basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aPolygon(basegfx::utils::createUnitPolygon()); aPolygon.transform(aLocalTransform); maExtractedContour.emplace_back(aPolygon); break; @@ -98,7 +98,7 @@ namespace drawinglayer // extract BoundRect from MetaFiles in world coordinates const primitive2d::MetafilePrimitive2D& rMetaCandidate(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate)); basegfx::B2DHomMatrix aLocalTransform(getViewInformation2D().getObjectTransformation() * rMetaCandidate.getTransform()); - basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aPolygon(basegfx::utils::createUnitPolygon()); aPolygon.transform(aLocalTransform); maExtractedContour.emplace_back(aPolygon); break; @@ -177,7 +177,7 @@ namespace drawinglayer // primitives who's BoundRect will be added in world coordinates basegfx::B2DRange aRange(rCandidate.getB2DRange(getViewInformation2D())); aRange.transform(getViewInformation2D().getObjectTransformation()); - maExtractedContour.emplace_back(basegfx::tools::createPolygonFromRect(aRange)); + maExtractedContour.emplace_back(basegfx::utils::createPolygonFromRect(aRange)); break; } default : diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index cae95d7e6a51..ef512060cf06 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -92,7 +92,7 @@ namespace drawinglayer if(aPolygonRange.isInside(getDiscreteHitPosition())) { // check if a polygon edge is hit - return basegfx::tools::isInEpsilonRange( + return basegfx::utils::isInEpsilonRange( aLocalPolygon, getDiscreteHitPosition(), fDiscreteHitTolerance); @@ -123,7 +123,7 @@ namespace drawinglayer { // if a HitTolerance is given, check for polygon edge hit in epsilon first if(bDiscreteHitToleranceUsed && - basegfx::tools::isInEpsilonRange( + basegfx::utils::isInEpsilonRange( aLocalPolyPolygon, getDiscreteHitPosition(), fDiscreteHitTolerance)) @@ -132,7 +132,7 @@ namespace drawinglayer } // check for hit in filled polyPolygon - if(!bRetval && basegfx::tools::isInside( + if(!bRetval && basegfx::utils::isInside( aLocalPolyPolygon, getDiscreteHitPosition(), true)) @@ -209,7 +209,7 @@ namespace drawinglayer if(!getHit()) { // empty 3D scene; Check for border hit - basegfx::B2DPolygon aOutline(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aOutline(basegfx::utils::createUnitPolygon()); aOutline.transform(rCandidate.getObjectTransformation()); mbHit = checkHairlineHitWithTolerance(aOutline, getDiscreteHitTolerance()); @@ -416,7 +416,7 @@ namespace drawinglayer if(!aRange.isEmpty()) { - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aRange)); mbHit = checkFillHitWithTolerance(basegfx::B2DPolyPolygon(aOutline), getDiscreteHitTolerance()); } @@ -459,7 +459,7 @@ namespace drawinglayer else { // fallback to standard HitTest - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aRange)); mbHit = checkFillHitWithTolerance(basegfx::B2DPolyPolygon(aOutline), getDiscreteHitTolerance()); } } @@ -486,7 +486,7 @@ namespace drawinglayer if(!aRange.isEmpty()) { - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aRange)); mbHit = checkFillHitWithTolerance(basegfx::B2DPolyPolygon(aOutline), getDiscreteHitTolerance()); } } diff --git a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx index fe962c2b980a..16bd3b6404f4 100644 --- a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx +++ b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx @@ -21,7 +21,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> #include <vcl/gdimtf.hxx> -#include <basegfx/tools/canvastools.hxx> +#include <basegfx/utils/canvastools.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include "vclmetafileprocessor2d.hxx" #include "vclpixelprocessor2d.hxx" diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 8ad128a53355..6f6deef4bfb5 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -153,14 +153,14 @@ namespace { // clip in left and right const basegfx::B2DPolyPolygon aLeft( - basegfx::tools::clipPolygonOnParallelAxis( + basegfx::utils::clipPolygonOnParallelAxis( aCandidate, false, true, aCenter.getX(), false)); const basegfx::B2DPolyPolygon aRight( - basegfx::tools::clipPolygonOnParallelAxis( + basegfx::utils::clipPolygonOnParallelAxis( aCandidate, false, false, @@ -174,14 +174,14 @@ namespace { // clip in top and bottom const basegfx::B2DPolyPolygon aTop( - basegfx::tools::clipPolygonOnParallelAxis( + basegfx::utils::clipPolygonOnParallelAxis( aCandidate, true, true, aCenter.getY(), false)); const basegfx::B2DPolyPolygon aBottom( - basegfx::tools::clipPolygonOnParallelAxis( + basegfx::utils::clipPolygonOnParallelAxis( aCandidate, true, false, @@ -414,9 +414,9 @@ namespace drawinglayer if(pStart && pStart->isActive()) { - fPolyLength = basegfx::tools::getLength(aLocalPolygon); + fPolyLength = basegfx::utils::getLength(aLocalPolygon); - aStartArrow = basegfx::tools::createAreaGeometryForLineStartEnd( + aStartArrow = basegfx::utils::createAreaGeometryForLineStartEnd( aLocalPolygon, pStart->getB2DPolyPolygon(), true, pStart->getWidth(), fPolyLength, pStart->isCentered() ? 0.5 : 0.0, &fStart); } @@ -425,10 +425,10 @@ namespace drawinglayer { if(basegfx::fTools::equalZero(fPolyLength)) { - fPolyLength = basegfx::tools::getLength(aLocalPolygon); + fPolyLength = basegfx::utils::getLength(aLocalPolygon); } - aEndArrow = basegfx::tools::createAreaGeometryForLineStartEnd( + aEndArrow = basegfx::utils::createAreaGeometryForLineStartEnd( aLocalPolygon, pEnd->getB2DPolyPolygon(), false, pEnd->getWidth(), fPolyLength, pEnd->isCentered() ? 0.5 : 0.0, &fEnd); } @@ -436,7 +436,7 @@ namespace drawinglayer if(0.0 != fStart || 0.0 != fEnd) { // build new poly, consume something from old poly - aLocalPolygon = basegfx::tools::getSnippetAbsolute(aLocalPolygon, fStart, fPolyLength - fEnd, fPolyLength); + aLocalPolygon = basegfx::utils::getSnippetAbsolute(aLocalPolygon, fStart, fPolyLength - fEnd, fPolyLength); } } @@ -1247,7 +1247,7 @@ namespace drawinglayer } else { - basegfx::tools::applyLineDashing( + basegfx::utils::applyLineDashing( rBasePolygon, rStroke.getDotDashArray(), &aHairLinePolyPolygon, nullptr, rStroke.getFullDotDashLen()); } @@ -1532,7 +1532,7 @@ namespace drawinglayer // #i111954# do NOT use decomposition, but use direct VCL-command // process(rCandidate.get2DDecomposition(getViewInformation2D())); - const ::tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon)); + const ::tools::PolyPolygon aToolsPolyPolygon(basegfx::utils::adaptiveSubdivideByAngle(aLocalPolyPolygon)); const HatchStyle aHatchStyle( attribute::HatchStyle::Single == rFillHatchAttribute.getStyle() ? HatchStyle::Single : attribute::HatchStyle::Double == rFillHatchAttribute.getStyle() ? HatchStyle::Double : @@ -1608,7 +1608,7 @@ namespace drawinglayer // me when that task is fixed in the master const ::tools::PolyPolygon aToolsPolyPolygon( getFillPolyPolygon( - basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon))); + basegfx::utils::adaptiveSubdivideByAngle(aLocalPolyPolygon))); // XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END support @@ -1739,7 +1739,7 @@ namespace drawinglayer { // there is already a clip polygon set; build clipped union of // current mask polygon and new one - maClipPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon( + maClipPolyPolygon = basegfx::utils::clipPolyPolygonOnPolyPolygon( aMask, maClipPolyPolygon, true, // #i106516# we want the inside of aMask, not the outside diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 5830a14c593c..d638fabfccc4 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -156,7 +156,7 @@ namespace drawinglayer basegfx::B2DPoint aTopRight(aRange.getMaxX() - fXOnePixel, aRange.getMinY()); basegfx::B2DPoint aBottomLeft(aRange.getMinX(), aRange.getMaxY() - fYOnePixel); basegfx::B2DPoint aBottomRight(aRange.getMaxX() - fXOnePixel, aRange.getMaxY() - fYOnePixel); - aLocalPolygon = basegfx::tools::distort(aLocalPolygon, aRange, aTopLeft, aTopRight, aBottomLeft, aBottomRight); + aLocalPolygon = basegfx::utils::distort(aLocalPolygon, aRange, aTopLeft, aTopRight, aBottomLeft, aBottomRight); } const basegfx::BColor aLineColor(maBColorModifierStack.getModifiedColor(rSource.getBColor())); @@ -182,7 +182,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aHairLinePolyPolygon; // simplify curve segments - aLocalPolygon = basegfx::tools::simplifyCurveSegments(aLocalPolygon); + aLocalPolygon = basegfx::utils::simplifyCurveSegments(aLocalPolygon); if(rSource.getStrokeAttribute().isDefault() || 0.0 == rSource.getStrokeAttribute().getFullDotDashLen()) { @@ -192,7 +192,7 @@ namespace drawinglayer else { // apply LineStyle - basegfx::tools::applyLineDashing( + basegfx::utils::applyLineDashing( aLocalPolygon, rSource.getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, @@ -745,7 +745,7 @@ namespace drawinglayer // create hatch polygon in range size and discrete coordinates basegfx::B2DRange aHatchRange(rFillHatchPrimitive.getOutputRange()); aHatchRange.transform(maCurrentTransformation); - const basegfx::B2DPolygon aHatchPolygon(basegfx::tools::createPolygonFromRect(aHatchRange)); + const basegfx::B2DPolygon aHatchPolygon(basegfx::utils::createPolygonFromRect(aHatchRange)); if(rFillHatchAttributes.isFillBackground()) { diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 97ef1f979f9b..da7e8e1056dd 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -335,7 +335,7 @@ namespace drawinglayer // allows to suppress AntiAliasing for pure horizontal or vertical lines. This is done since // not-AntiAliased such lines look more pleasing to the eye (e.g. 2D chart content). This // NEEDS to be done in discrete coordinates, so only useful for pixel based rendering. - aLocalPolygon = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aLocalPolygon); + aLocalPolygon = basegfx::utils::snapPointsOfHorizontalOrVerticalEdges(aLocalPolygon); } mpOutputDevice->DrawPolyLine(aLocalPolygon, 0.0); @@ -355,7 +355,7 @@ namespace drawinglayer { // color gets completely replaced, get it const basegfx::BColor aModifiedColor(maBColorModifierStack.getModifiedColor(basegfx::BColor())); - basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aPolygon(basegfx::utils::createUnitPolygon()); aPolygon.transform(aLocalTransform); mpOutputDevice->SetFillColor(Color(aModifiedColor)); @@ -464,7 +464,7 @@ namespace drawinglayer { // color gets completely replaced, get it const basegfx::BColor aModifiedColor(maBColorModifierStack.getModifiedColor(basegfx::BColor())); - basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); + basegfx::B2DPolygon aPolygon(basegfx::utils::createUnitPolygon()); aPolygon.transform(aLocalTransform); mpOutputDevice->SetFillColor(Color(aModifiedColor)); @@ -655,7 +655,7 @@ namespace drawinglayer basegfx::B2DRange aTileRange(rFillGraphicAttribute.getGraphicRange()); const basegfx::B2DRange aPolyPolygonRange(rPolyPolygon.getB2DRange()); const basegfx::B2DHomMatrix aNewObjectTransform( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( aPolyPolygonRange.getRange(), aPolyPolygonRange.getMinimum())); @@ -663,7 +663,7 @@ namespace drawinglayer // now clip the object polyPolygon against the tile range // to get the common area - basegfx::B2DPolyPolygon aTarget = basegfx::tools::clipPolyPolygonOnRange( + basegfx::B2DPolyPolygon aTarget = basegfx::utils::clipPolyPolygonOnRange( rPolyPolygon, aTileRange, true, @@ -711,7 +711,7 @@ namespace drawinglayer if(aMask.count()) { aMask.transform(maCurrentTransformation); - const basegfx::B2DRange aRange(basegfx::tools::getRange(aMask)); + const basegfx::B2DRange aRange(basegfx::utils::getRange(aMask)); impBufferDevice aBufferDevice(*mpOutputDevice, aRange); if(aBufferDevice.isVisible()) @@ -977,7 +977,7 @@ namespace drawinglayer else { // else apply LineStyle - basegfx::tools::applyLineDashing(rPolygonStrokeCandidate.getB2DPolygon(), + basegfx::utils::applyLineDashing(rPolygonStrokeCandidate.getB2DPolygon(), rStrokeAttribute.getDotDashArray(), &aHairlinePolyPolygon, nullptr, rStrokeAttribute.getFullDotDashLen()); } @@ -1222,7 +1222,7 @@ namespace drawinglayer // prepare polygon in needed width at start position (with discrete overlap) const basegfx::B2DPolygon aPolygon( - basegfx::tools::createPolygonFromRect( + basegfx::utils::createPolygonFromRect( basegfx::B2DRange( rCandidate.getOffsetA() - fDiscreteUnit, 0.0, @@ -1239,7 +1239,7 @@ namespace drawinglayer { basegfx::B2DPolygon aNew(aPolygon); - aNew.transform(maCurrentTransformation * basegfx::tools::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0)); + aNew.transform(maCurrentTransformation * basegfx::utils::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0)); mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorA, aColorB, fUnitScale))); mpOutputDevice->DrawPolyPolygon(basegfx::B2DPolyPolygon(aNew)); } @@ -1282,7 +1282,7 @@ namespace drawinglayer rCandidate.getTranslateA(), fUnitScale)); - aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix( + aTransform = basegfx::utils::createScaleTranslateB2DHomMatrix( fEndScale, fEndScale, aTranslate.getX(), @@ -1290,12 +1290,12 @@ namespace drawinglayer } else { - aTransform = basegfx::tools::createScaleB2DHomMatrix( + aTransform = basegfx::utils::createScaleB2DHomMatrix( fEndScale, fEndScale); } - basegfx::B2DPolygon aNew(basegfx::tools::createPolygonFromUnitCircle()); + basegfx::B2DPolygon aNew(basegfx::utils::createPolygonFromUnitCircle()); aNew.transform(maCurrentTransformation * aTransform); mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorB, aColorA, fUnitScale))); diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx index 00b9a9a43c0f..04a37a73c2ad 100644 --- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx +++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx @@ -163,11 +163,11 @@ namespace drawinglayer const basegfx::B3DPoint aPointOnPlane(aPolygon.getB3DPoint(0)); double fCut(0.0); - if(basegfx::tools::getCutBetweenLineAndPlane(aPlaneNormal, aPointOnPlane, maFront, maBack, fCut)) + if(basegfx::utils::getCutBetweenLineAndPlane(aPlaneNormal, aPointOnPlane, maFront, maBack, fCut)) { const basegfx::B3DPoint aCutPoint(basegfx::interpolate(maFront, maBack, fCut)); - if(basegfx::tools::isInside(rPolyPolygon, aCutPoint)) + if(basegfx::utils::isInside(rPolyPolygon, aCutPoint)) { // #i102956# add result. Do not forget to do this in the coordinate // system the processor get started with, so use the collected diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index bd584eae9a93..a055a3e71aef 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -270,7 +270,7 @@ namespace drawinglayer basegfx::B2DRange aGraphicRange(rFillGraphicAttribute.getGraphicRange()); aGraphicRange.transform( - basegfx::tools::createScaleB2DHomMatrix( + basegfx::utils::createScaleB2DHomMatrix( rPrimitive.getTextureSize())); if(rFillGraphicAttribute.getTiling()) @@ -330,7 +330,7 @@ namespace drawinglayer // transform to device coordinates (-1.0 .. 1.0) and check for visibility aHairline.transform(getViewInformation3D().getObjectToView()); - const basegfx::B3DRange a3DRange(basegfx::tools::getRange(aHairline)); + const basegfx::B3DRange a3DRange(basegfx::utils::getRange(aHairline)); const basegfx::B2DRange a2DRange(a3DRange.getMinX(), a3DRange.getMinY(), a3DRange.getMaxX(), a3DRange.getMaxY()); if(a2DRange.overlaps(maRasterRange)) @@ -370,7 +370,7 @@ namespace drawinglayer // transform to device coordinates (-1.0 .. 1.0) and check for visibility aFill.transform(getViewInformation3D().getObjectToView()); - const basegfx::B3DRange a3DRange(basegfx::tools::getRange(aFill)); + const basegfx::B3DRange a3DRange(basegfx::utils::getRange(aFill)); const basegfx::B2DRange a2DRange(a3DRange.getMinX(), a3DRange.getMinY(), a3DRange.getMaxX(), a3DRange.getMaxY()); bPaintIt = a2DRange.overlaps(maRasterRange); diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx index 5279e7fa560a..d935546c1118 100644 --- a/drawinglayer/source/processor3d/geometry2dextractor.cxx +++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx @@ -85,7 +85,7 @@ namespace drawinglayer { // PolygonHairlinePrimitive3D const primitive3d::PolygonHairlinePrimitive3D& rPrimitive = static_cast< const primitive3d::PolygonHairlinePrimitive3D& >(rCandidate); - basegfx::B2DPolygon a2DHairline(basegfx::tools::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView())); + basegfx::B2DPolygon a2DHairline(basegfx::utils::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView())); if(a2DHairline.count()) { @@ -100,7 +100,7 @@ namespace drawinglayer { // PolyPolygonMaterialPrimitive3D const primitive3d::PolyPolygonMaterialPrimitive3D& rPrimitive = static_cast< const primitive3d::PolyPolygonMaterialPrimitive3D& >(rCandidate); - basegfx::B2DPolyPolygon a2DFill(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView())); + basegfx::B2DPolyPolygon a2DFill(basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView())); if(a2DFill.count()) { diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx index 0544406ed59b..35032588c766 100644 --- a/drawinglayer/source/processor3d/shadow3dextractor.cxx +++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx @@ -147,7 +147,7 @@ namespace drawinglayer } else { - a2DHairline = basegfx::tools::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView()); + a2DHairline = basegfx::utils::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView()); } if(a2DHairline.count()) @@ -178,7 +178,7 @@ namespace drawinglayer } else { - a2DFill = basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView()); + a2DFill = basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView()); } if(a2DFill.count()) diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index 0d9354cf303c..8f08a70d8dbe 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -395,7 +395,7 @@ public: mpTransparenceGeoTexSvx(pTransparenceGeoTexSvx), maMaterial(rMaterial), maPolyPolygon(rPolyPolygon), - mfCenterZ(basegfx::tools::getRange(rPolyPolygon).getCenter().getZ()), + mfCenterZ(basegfx::utils::getRange(rPolyPolygon).getCenter().getZ()), mbModulate(bModulate), mbFilter(bFilter), mbSimpleTextureActive(bSimpleTextureActive), @@ -464,7 +464,7 @@ namespace drawinglayer aSnappedHairline.transform(aTransform); // snap to integer - aSnappedHairline = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aSnappedHairline); + aSnappedHairline = basegfx::utils::snapPointsOfHorizontalOrVerticalEdges(aSnappedHairline); // add oversampling again aTransform.identity(); diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index 3ec49e8440a5..aef02b5424aa 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -19,7 +19,7 @@ #include <drawinglayer/texture/texture.hxx> #include <basegfx/numeric/ftools.hxx> -#include <basegfx/tools/gradienttools.hxx> +#include <basegfx/utils/gradienttools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include "converters.hxx" @@ -113,7 +113,7 @@ namespace drawinglayer mfUnitWidth(1.0), mfUnitMaxY(1.0) { - maGradientInfo = basegfx::tools::createLinearODFGradientInfo( + maGradientInfo = basegfx::utils::createLinearODFGradientInfo( rDefinitionRange, nSteps, fBorder, @@ -183,7 +183,7 @@ namespace drawinglayer void GeoTexSvxGradientLinear::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { - const double fScaler(basegfx::tools::getLinearGradientAlpha(rUV, maGradientInfo)); + const double fScaler(basegfx::utils::getLinearGradientAlpha(rUV, maGradientInfo)); rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } @@ -207,7 +207,7 @@ namespace drawinglayer mfUnitMinX(0.0), mfUnitWidth(1.0) { - maGradientInfo = basegfx::tools::createAxialODFGradientInfo( + maGradientInfo = basegfx::utils::createAxialODFGradientInfo( rDefinitionRange, nSteps, fBorder, @@ -267,7 +267,7 @@ namespace drawinglayer void GeoTexSvxGradientAxial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { - const double fScaler(basegfx::tools::getAxialGradientAlpha(rUV, maGradientInfo)); + const double fScaler(basegfx::utils::getAxialGradientAlpha(rUV, maGradientInfo)); rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } @@ -289,7 +289,7 @@ namespace drawinglayer double fOffsetY) : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { - maGradientInfo = basegfx::tools::createRadialODFGradientInfo( + maGradientInfo = basegfx::utils::createRadialODFGradientInfo( rDefinitionRange, basegfx::B2DVector(fOffsetX,fOffsetY), nSteps, @@ -314,7 +314,7 @@ namespace drawinglayer for(sal_uInt32 a(1); a < maGradientInfo.getSteps(); a++) { const double fSize(1.0 - (fStepSize * a)); - aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::tools::createScaleB2DHomMatrix(fSize, fSize); + aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::utils::createScaleB2DHomMatrix(fSize, fSize); aB2DHomMatrixAndBColor.maBColor = interpolate(maStart, maEnd, double(a) / double(maGradientInfo.getSteps() - 1)); rEntries.push_back(aB2DHomMatrixAndBColor); } @@ -323,7 +323,7 @@ namespace drawinglayer void GeoTexSvxGradientRadial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { - const double fScaler(basegfx::tools::getRadialGradientAlpha(rUV, maGradientInfo)); + const double fScaler(basegfx::utils::getRadialGradientAlpha(rUV, maGradientInfo)); rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } @@ -346,7 +346,7 @@ namespace drawinglayer double fAngle) : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { - maGradientInfo = basegfx::tools::createEllipticalODFGradientInfo( + maGradientInfo = basegfx::utils::createEllipticalODFGradientInfo( rDefinitionRange, basegfx::B2DVector(fOffsetX,fOffsetY), nSteps, @@ -390,7 +390,7 @@ namespace drawinglayer fWidth -= fIncrementX; fHeight -= fIncrementY; - aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::tools::createScaleB2DHomMatrix(fWidth, fHeight); + aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::utils::createScaleB2DHomMatrix(fWidth, fHeight); aB2DHomMatrixAndBColor.maBColor = interpolate(maStart, maEnd, double(a) / double(maGradientInfo.getSteps() - 1)); rEntries.push_back(aB2DHomMatrixAndBColor); } @@ -399,7 +399,7 @@ namespace drawinglayer void GeoTexSvxGradientElliptical::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { - const double fScaler(basegfx::tools::getEllipticalGradientAlpha(rUV, maGradientInfo)); + const double fScaler(basegfx::utils::getEllipticalGradientAlpha(rUV, maGradientInfo)); rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } @@ -422,7 +422,7 @@ namespace drawinglayer double fAngle) : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { - maGradientInfo = basegfx::tools::createSquareODFGradientInfo( + maGradientInfo = basegfx::utils::createSquareODFGradientInfo( rDefinitionRange, basegfx::B2DVector(fOffsetX,fOffsetY), nSteps, @@ -448,7 +448,7 @@ namespace drawinglayer for(sal_uInt32 a(1); a < maGradientInfo.getSteps(); a++) { const double fSize(1.0 - (fStepSize * a)); - aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::tools::createScaleB2DHomMatrix(fSize, fSize); + aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::utils::createScaleB2DHomMatrix(fSize, fSize); aB2DHomMatrixAndBColor.maBColor = interpolate(maStart, maEnd, double(a) / double(maGradientInfo.getSteps() - 1)); rEntries.push_back(aB2DHomMatrixAndBColor); } @@ -457,7 +457,7 @@ namespace drawinglayer void GeoTexSvxGradientSquare::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { - const double fScaler(basegfx::tools::getSquareGradientAlpha(rUV, maGradientInfo)); + const double fScaler(basegfx::utils::getSquareGradientAlpha(rUV, maGradientInfo)); rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } @@ -480,7 +480,7 @@ namespace drawinglayer double fAngle) : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { - maGradientInfo = basegfx::tools::createRectangularODFGradientInfo( + maGradientInfo = basegfx::utils::createRectangularODFGradientInfo( rDefinitionRange, basegfx::B2DVector(fOffsetX,fOffsetY), nSteps, @@ -524,7 +524,7 @@ namespace drawinglayer fWidth -= fIncrementX; fHeight -= fIncrementY; - aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::tools::createScaleB2DHomMatrix(fWidth, fHeight); + aB2DHomMatrixAndBColor.maB2DHomMatrix = maGradientInfo.getTextureTransform() * basegfx::utils::createScaleB2DHomMatrix(fWidth, fHeight); aB2DHomMatrixAndBColor.maBColor = interpolate(maStart, maEnd, double(a) / double(maGradientInfo.getSteps() - 1)); rEntries.push_back(aB2DHomMatrixAndBColor); } @@ -533,7 +533,7 @@ namespace drawinglayer void GeoTexSvxGradientRect::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { - const double fScaler(basegfx::tools::getRectangularGradientAlpha(rUV, maGradientInfo)); + const double fScaler(basegfx::utils::getRectangularGradientAlpha(rUV, maGradientInfo)); rBColor = basegfx::interpolate(maStart, maEnd, fScaler); } @@ -587,7 +587,7 @@ namespace drawinglayer basegfx::B2DPoint aCenter(0.5, 0.5); aCenter *= maTextureTransform; - maTextureTransform = basegfx::tools::createRotateAroundPoint(aCenter, fAngle) + maTextureTransform = basegfx::utils::createRotateAroundPoint(aCenter, fAngle) * maTextureTransform; } @@ -788,7 +788,7 @@ namespace drawinglayer if(pMatrices) { pMatrices->push_back( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fWidth, fHeight, fPosX, @@ -811,7 +811,7 @@ namespace drawinglayer if(pMatrices) { pMatrices->push_back( - basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::utils::createScaleTranslateB2DHomMatrix( fWidth, fHeight, fPosX, diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index 0f9e0cec26c0..0ffd10a44ffc 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -62,7 +62,7 @@ namespace drawinglayer const drawinglayer::primitive2d::Primitive2DReference aEmbed( new drawinglayer::primitive2d::TransformPrimitive2D( - basegfx::tools::createScaleB2DHomMatrix(fReduceFactor, fReduceFactor), + basegfx::utils::createScaleB2DHomMatrix(fReduceFactor, fReduceFactor), rSeq)); aSequence = drawinglayer::primitive2d::Primitive2DContainer { aEmbed }; diff --git a/drawinglayer/source/tools/emfpbrush.cxx b/drawinglayer/source/tools/emfpbrush.cxx index 19b1441ddb1d..28300f767bd3 100644 --- a/drawinglayer/source/tools/emfpbrush.cxx +++ b/drawinglayer/source/tools/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> @@ -185,7 +185,7 @@ namespace emfplushelper 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()); @@ -202,7 +202,7 @@ namespace emfplushelper 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/drawinglayer/source/tools/emfpcustomlinecap.cxx b/drawinglayer/source/tools/emfpcustomlinecap.cxx index d2d211d62d3e..ee366bcb4aa6 100644 --- a/drawinglayer/source/tools/emfpcustomlinecap.cxx +++ b/drawinglayer/source/tools/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/drawinglayer/source/tools/emfpfont.cxx b/drawinglayer/source/tools/emfpfont.cxx index 754e59e94319..62119d7f7cbe 100644 --- a/drawinglayer/source/tools/emfpfont.cxx +++ b/drawinglayer/source/tools/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/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index 3208ed82ed32..e95b243f7a0d 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -314,9 +314,9 @@ namespace emfplushelper // To evtl. correct and see where this came from, please compare with the implementations // of EmfPlusHelperData::MapToDevice and EmfPlusHelperData::Map* in prev versions maMapTransform = maWorldTransform; - maMapTransform *= basegfx::tools::createScaleB2DHomMatrix(100.0 * mnMmX / mnPixX, 100.0 * mnMmY / mnPixY); - maMapTransform *= basegfx::tools::createTranslateB2DHomMatrix(double(-mnFrameLeft), double(-mnFrameTop)); - maMapTransform *= basegfx::tools::createScaleB2DHomMatrix(maBaseTransform.get(0, 0), maBaseTransform.get(1, 1)); + maMapTransform *= basegfx::utils::createScaleB2DHomMatrix(100.0 * mnMmX / mnPixX, 100.0 * mnMmY / mnPixY); + maMapTransform *= basegfx::utils::createTranslateB2DHomMatrix(double(-mnFrameLeft), double(-mnFrameTop)); + maMapTransform *= basegfx::utils::createScaleB2DHomMatrix(maBaseTransform.get(0, 0), maBaseTransform.get(1, 1)); } ::basegfx::B2DPoint EmfPlusHelperData::Map(double ix, double iy) @@ -650,7 +650,7 @@ namespace emfplushelper // get the polygon range to be able to map the start/end/center point correctly // therefore, create a mapping and invert it basegfx::B2DRange aPolygonRange= polygon.getB2DRange(); - basegfx::B2DHomMatrix aPolygonTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::B2DHomMatrix aPolygonTransformation = basegfx::utils::createScaleTranslateB2DHomMatrix( aPolygonRange.getWidth(),aPolygonRange.getHeight(), aPolygonRange.getMinX(), aPolygonRange.getMinY()); aPolygonTransformation.invert(); @@ -883,7 +883,7 @@ namespace emfplushelper (360.0*startAngle / M_PI) << ", end: " << (360.0*endAngle / M_PI) << " startAngle: " << startAngle << " sweepAngle: " << sweepAngle); - ::basegfx::B2DPolygon polygon = basegfx::tools::createPolygonFromEllipseSegment( + ::basegfx::B2DPolygon polygon = basegfx::utils::createPolygonFromEllipseSegment( mappedCenter, mappedSize.getX(), mappedSize.getY(), startAngle, endAngle); if (type != EmfPlusRecordTypeDrawArc) @@ -939,7 +939,7 @@ namespace emfplushelper ::basegfx::B2DSize mappedSize(MapSize(dw / 2, dh / 2)); ::basegfx::B2DPolyPolygon polyPolygon( ::basegfx::B2DPolygon( - ::basegfx::tools::createPolygonFromEllipse(mappedCenter, mappedSize.getX(), mappedSize.getY()))); + ::basegfx::utils::createPolygonFromEllipse(mappedCenter, mappedSize.getX(), mappedSize.getY()))); if (type == EmfPlusRecordTypeFillEllipse) { @@ -1163,7 +1163,7 @@ namespace emfplushelper if (aSize.Width() > 0 && aSize.Height() > 0) { // create correct transform matrix - basegfx::B2DHomMatrix aTransformMatrix = basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::B2DHomMatrix aTransformMatrix = basegfx::utils::createScaleTranslateB2DHomMatrix( aDstSize.getX(), aDstSize.getY(), aDstPoint.getX(), @@ -1237,7 +1237,7 @@ namespace emfplushelper LanguageTag aLanguageTag(static_cast< LanguageType >(stringFormat->language)); css::lang::Locale locale = aLanguageTag.getLocale(); - basegfx::B2DHomMatrix transformMatrix = basegfx::tools::createScaleTranslateB2DHomMatrix(MapSize(font->emSize,font->emSize),Map(lx,ly+font->emSize)); + basegfx::B2DHomMatrix transformMatrix = basegfx::utils::createScaleTranslateB2DHomMatrix(MapSize(font->emSize,font->emSize),Map(lx,ly+font->emSize)); basegfx::BColor color; if (flags & 0x8000) // we use a color @@ -1504,7 +1504,7 @@ namespace emfplushelper ::basegfx::B2DPolyPolygon polyPolygon( ::basegfx::B2DPolygon( - ::basegfx::tools::createPolygonFromRect( + ::basegfx::utils::createPolygonFromRect( ::basegfx::B2DRectangle( mappedPoint.getX(), mappedPoint.getY(), @@ -1650,7 +1650,7 @@ namespace emfplushelper aDXArray.push_back(0); // prepare transform matrix - basegfx::B2DHomMatrix transformMatrix = basegfx::tools::createScaleTranslateB2DHomMatrix( + basegfx::B2DHomMatrix transformMatrix = basegfx::utils::createScaleTranslateB2DHomMatrix( MapSize(font->emSize,font->emSize),Map(charsPosX[pos],charsPosY[pos])); if (hasMatrix) transformMatrix *= transform; diff --git a/drawinglayer/source/tools/emfpimage.cxx b/drawinglayer/source/tools/emfpimage.cxx index 9e1cc8ac3551..3c8409658cf7 100644 --- a/drawinglayer/source/tools/emfpimage.cxx +++ b/drawinglayer/source/tools/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/drawinglayer/source/tools/emfppath.cxx b/drawinglayer/source/tools/emfppath.cxx index 1cd1276f9120..72ccd9409873 100644 --- a/drawinglayer/source/tools/emfppath.cxx +++ b/drawinglayer/source/tools/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> @@ -102,7 +102,7 @@ namespace emfplushelper 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/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx index 686cac184254..04ab09811156 100644 --- a/drawinglayer/source/tools/emfppen.cxx +++ b/drawinglayer/source/tools/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/drawinglayer/source/tools/emfpregion.cxx b/drawinglayer/source/tools/emfpregion.cxx index 65fc1e88b1c8..c610e65d2e6f 100644 --- a/drawinglayer/source/tools/emfpregion.cxx +++ b/drawinglayer/source/tools/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/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 39b39071b287..be6c6a272edc 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -935,7 +935,7 @@ namespace wmfemfhelper const basegfx::BColor& rColor, PropertyHolder const & rPropertyHolder) { - basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(rRange)); + basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(rRange)); aOutline.transform(rPropertyHolder.getTransformation()); return new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( @@ -1279,7 +1279,7 @@ namespace wmfemfhelper aSequence[1] = drawinglayer::primitive2d::Primitive2DReference(pResult); // prepare filled polygon - basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aTextRange)); + basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aTextRange)); aOutline.transform(aTextTransform); aSequence[0] = drawinglayer::primitive2d::Primitive2DReference( @@ -1626,7 +1626,7 @@ namespace wmfemfhelper if(!aRange.isEmpty()) { - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aRange)); createHairlineAndFillPrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current()); } } @@ -1664,11 +1664,11 @@ namespace wmfemfhelper fRadiusX = std::max(0.0, std::min(1.0, fRadiusX)); fRadiusY = std::max(0.0, std::min(1.0, fRadiusY)); - aOutline = basegfx::tools::createPolygonFromRect(aRange, fRadiusX, fRadiusY); + aOutline = basegfx::utils::createPolygonFromRect(aRange, fRadiusX, fRadiusY); } else { - aOutline = basegfx::tools::createPolygonFromRect(aRange); + aOutline = basegfx::utils::createPolygonFromRect(aRange); } createHairlineAndFillPrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current()); @@ -1692,7 +1692,7 @@ namespace wmfemfhelper if(!aRange.isEmpty()) { - const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromEllipse( + const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromEllipse( aRange.getCenter(), aRange.getWidth() * 0.5, aRange.getHeight() * 0.5)); createHairlineAndFillPrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current()); @@ -2135,7 +2135,7 @@ namespace wmfemfhelper { const Gradient& rGradient = pA->GetGradient(); const drawinglayer::attribute::FillGradientAttribute aAttribute(createFillGradientAttribute(rGradient)); - basegfx::B2DPolyPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); + basegfx::B2DPolyPolygon aOutline(basegfx::utils::createPolygonFromRect(aRange)); if(aAttribute.getStartColor() == aAttribute.getEndColor()) { @@ -2323,7 +2323,7 @@ namespace wmfemfhelper if(aOriginalPolyPolygon.count()) { - aClippedPolyPolygon = basegfx::tools::clipPolyPolygonOnRange( + aClippedPolyPolygon = basegfx::utils::clipPolyPolygonOnRange( aOriginalPolyPolygon, aClipRange, true, @@ -2344,7 +2344,7 @@ namespace wmfemfhelper { // start new clipping with ClipRange const basegfx::B2DPolyPolygon aNewClipPolyPolygon( - basegfx::tools::createPolygonFromRect(aClipRange)); + basegfx::utils::createPolygonFromRect(aClipRange)); HandleNewClipRegion(aNewClipPolyPolygon, rTargetHolders, rPropertyHolders); } @@ -2388,7 +2388,7 @@ namespace wmfemfhelper if(aOriginalPolyPolygon.count()) { - aClippedPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon( + aClippedPolyPolygon = basegfx::utils::clipPolyPolygonOnPolyPolygon( aOriginalPolyPolygon, aNewClipPolyPolygon, true, false); } @@ -2430,7 +2430,7 @@ namespace wmfemfhelper basegfx::B2DVector aVector(pA->GetHorzMove(), pA->GetVertMove()); aVector *= rPropertyHolders.Current().getTransformation(); basegfx::B2DHomMatrix aTransform( - basegfx::tools::createTranslateB2DHomMatrix(aVector)); + basegfx::utils::createTranslateB2DHomMatrix(aVector)); // transform existing region basegfx::B2DPolyPolygon aClipPolyPolygon( |