summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-09-22 14:12:07 +0300
committerTor Lillqvist <tml@collabora.com>2017-09-26 14:18:41 +0200
commit8e7897588d7185ef1964e8120669c1de3d1ce734 (patch)
tree8f48598670a5dc22703371943c05789d60b9a07d /filter
parent0b4135ec9945ea627318ecf5fccc4b7d0940ff0d (diff)
Rename the basegfx::tools namespace to basegfx::utils
Reduce potential confusion with the global tools namespace. Will hopefully make it possible to remove the annoying initial :: when referring to the global tools namespace. Unless we have even more tools subnamespaces somewhere. Thorsten said it was OK. Change-Id: Id088dfe8f4244cb79df9aa988995b31a1758c996 Reviewed-on: https://gerrit.libreoffice.org/42644 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/flash/swfwriter.cxx2
-rw-r--r--filter/source/flash/swfwriter1.cxx2
-rw-r--r--filter/source/flash/swfwriter2.cxx2
-rw-r--r--filter/source/graphicfilter/ipict/shape.cxx6
-rw-r--r--filter/source/pdf/pdfexport.cxx2
-rw-r--r--filter/source/svg/parserfragments.cxx2
-rw-r--r--filter/source/svg/svgreader.cxx18
7 files changed, 17 insertions, 17 deletions
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 92a2d8627a62..aa288915ae8f 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -222,7 +222,7 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int
mpTag->addUI16( nID ); // character Id
// #i73264#
- const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix(
+ const basegfx::B2DHomMatrix aMatrix(basegfx::utils::createTranslateB2DHomMatrix(
Int16_(static_cast<long>(map100thmm(x)*mnDocXScale)),
Int16_(static_cast<long>(map100thmm(y)*mnDocYScale))));
mpTag->addMatrix( aMatrix ); // transformation matrix
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 75b4e4c5904b..429fcb7e1ca2 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -594,7 +594,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
scale = (double)n1 / (double)n2;
}
- basegfx::B2DHomMatrix m(basegfx::tools::createRotateB2DHomMatrix(static_cast<double>(nOrientation) * F_PI1800));
+ basegfx::B2DHomMatrix m(basegfx::utils::createRotateB2DHomMatrix(static_cast<double>(nOrientation) * F_PI1800));
m.translate( double(aPt.X() / scale), double(aPt.Y()) );
m.scale( scale, scale );
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 9fa89c3aa01e..3bbc4afe83bc 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -551,7 +551,7 @@ struct GradRecord
void FillStyle::Impl_addGradient( Tag* pTag ) const
{
std::vector< struct GradRecord > aGradientRecords;
- basegfx::B2DHomMatrix m(basegfx::tools::createRotateB2DHomMatrix((maGradient.GetAngle() - 900) * F_PI1800));
+ basegfx::B2DHomMatrix m(basegfx::utils::createRotateB2DHomMatrix((maGradient.GetAngle() - 900) * F_PI1800));
switch( maGradient.GetStyle() )
{
diff --git a/filter/source/graphicfilter/ipict/shape.cxx b/filter/source/graphicfilter/ipict/shape.cxx
index c7ab3ba2f8a0..7b74a5a16a02 100644
--- a/filter/source/graphicfilter/ipict/shape.cxx
+++ b/filter/source/graphicfilter/ipict/shape.cxx
@@ -151,7 +151,7 @@ namespace PictReaderShape {
long const X[2] = { oval.Left(), oval.Right() };
long const Y[2] = { oval.Top(), oval.Bottom() };
B2DPoint center(0.5*(X[1]+X[0]), 0.5*(Y[1]+Y[0]));
- B2DPolygon poly = basegfx::tools::createPolygonFromEllipse(center, 0.5*(X[1]-X[0]), 0.5*(Y[1]-Y[0]));
+ B2DPolygon poly = basegfx::utils::createPolygonFromEllipse(center, 0.5*(X[1]-X[0]), 0.5*(Y[1]-Y[0]));
if (drawFrame)
dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE);
else
@@ -184,7 +184,7 @@ namespace PictReaderShape {
while (angl2 < 0.0) angl2 += F_2PI;
while (angl2 >= F_2PI) angl2 -= F_2PI;
- B2DPolygon poly = basegfx::tools::createPolygonFromEllipseSegment(center, 0.5*(X[1]-X[0]), 0.5*(Y[1]-Y[0]), angl1, angl2);
+ B2DPolygon poly = basegfx::utils::createPolygonFromEllipseSegment(center, 0.5*(X[1]-X[0]), 0.5*(Y[1]-Y[0]), angl1, angl2);
if (drawFrame)
dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE);
else {
@@ -207,7 +207,7 @@ namespace PictReaderShape {
if (ovalH > height) ovalH = static_cast< int >( height );
B2DRectangle rect(B2DPoint(X[0],Y[0]), B2DPoint(X[1],Y[1]));
- B2DPolygon poly = basegfx::tools::createPolygonFromRect(rect, (width != 0.0) ? ovalW/width : 0.0, (height != 0.0) ? ovalH/height : 0.0);
+ B2DPolygon poly = basegfx::utils::createPolygonFromRect(rect, (width != 0.0) ? ovalW/width : 0.0, (height != 0.0) ? ovalH/height : 0.0);
if (drawFrame)
dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE);
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 818946bd69df..cc5369a61db1 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -1031,7 +1031,7 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData&
basegfx::B2DRectangle aB2DRect( aPageRect.Left(), aPageRect.Top(), aPageRect.Right(), aPageRect.Bottom() );
- rWriter.SetClipRegion( basegfx::B2DPolyPolygon( basegfx::tools::createPolygonFromRect( aB2DRect ) ) );
+ rWriter.SetClipRegion( basegfx::B2DPolyPolygon( basegfx::utils::createPolygonFromRect( aB2DRect ) ) );
rWriter.PlayMetafile( aMtf, aCtx, &rPDFExtOutDevData );
diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx
index 94ccdab42b49..abeac1137442 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -11,7 +11,7 @@
#include "spirit_supplements.hxx"
#include "gfxtypes.hxx"
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <com/sun/star/geometry/AffineMatrix2D.hpp>
#include <limits.h>
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 778dc1a42f45..4bb7afbcc4a8 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1459,7 +1459,7 @@ struct ShapeWritingVisitor
+OUString::number(y1)+"L"+OUString::number(x2)+","
+OUString::number(y2);
basegfx::B2DPolyPolygon aPoly;
- basegfx::tools::importFromSvgD(aPoly, sLinePath, false, nullptr);
+ basegfx::utils::importFromSvgD(aPoly, sLinePath, false, nullptr);
writePathShape(xAttrs,
xUnoAttrs,
@@ -1474,7 +1474,7 @@ struct ShapeWritingVisitor
{
OUString sPoints = xElem->hasAttribute("points") ? xElem->getAttribute("points") : "";
basegfx::B2DPolygon aPoly;
- (void)basegfx::tools::importFromSvgPoints(aPoly, sPoints);
+ (void)basegfx::utils::importFromSvgPoints(aPoly, sPoints);
if( nTokenId == XML_POLYGON || maCurrState.meFillType != NONE )
aPoly.setClosed(true);
@@ -1531,7 +1531,7 @@ struct ShapeWritingVisitor
rx = ry;
basegfx::B2DPolygon aPoly;
- aPoly = basegfx::tools::createPolygonFromRect(
+ aPoly = basegfx::utils::createPolygonFromRect(
basegfx::B2DRange(x,y,x+width,y+height),
rx/(0.5*width), ry/(0.5*height) );
@@ -1546,7 +1546,7 @@ struct ShapeWritingVisitor
{
OUString sPath = xElem->hasAttribute("d") ? xElem->getAttribute("d") : "";
basegfx::B2DPolyPolygon aPoly;
- basegfx::tools::importFromSvgD(aPoly, sPath, false, nullptr);
+ basegfx::utils::importFromSvgD(aPoly, sPath, false, nullptr);
if ((maCurrState.meStrokeType == NONE) &&
(maCurrState.meFillType != NONE) &&
@@ -1831,7 +1831,7 @@ struct ShapeWritingVisitor
xAttrs->Clear();
- basegfx::B2DPolygon aPoly = basegfx::tools::createPolygonFromEllipse(rEllipse.getB2DEllipseCenter(),
+ basegfx::B2DPolygon aPoly = basegfx::utils::createPolygonFromEllipse(rEllipse.getB2DEllipseCenter(),
rEllipse.getB2DEllipseRadius().getX(), rEllipse.getB2DEllipseRadius().getY());
writePathShape(xAttrs, xUnoAttrs, rStyleId, basegfx::B2DPolyPolygon(aPoly));
}
@@ -1860,9 +1860,9 @@ struct ShapeWritingVisitor
{
const basegfx::B2DRange aBounds(
aPoly.areControlPointsUsed() ?
- basegfx::tools::getRange(
- basegfx::tools::adaptiveSubdivideByAngle(aPoly)) :
- basegfx::tools::getRange(aPoly));
+ basegfx::utils::getRange(
+ basegfx::utils::adaptiveSubdivideByAngle(aPoly)) :
+ basegfx::utils::getRange(aPoly));
fillShapeProperties(xAttrs,
aBounds,
"svggraphicstyle"+rStyleId);
@@ -1876,7 +1876,7 @@ struct ShapeWritingVisitor
aNormalize.scale(2540.0/72.0,2540.0/72.0);
aPoly.transform(aNormalize);
- xAttrs->AddAttribute( "svg:d", basegfx::tools::exportToSvgD(
+ xAttrs->AddAttribute( "svg:d", basegfx::utils::exportToSvgD(
aPoly,
false, // no relative coords. causes rounding errors
false, // no quad bezier detection. crashes older versions.