summaryrefslogtreecommitdiff
path: root/sc
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 /sc
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 'sc')
-rw-r--r--sc/source/core/data/drwlayer.cxx4
-rw-r--r--sc/source/core/tool/detfunc.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconrec.cxx2
-rw-r--r--sc/source/ui/view/hintwin.cxx6
-rw-r--r--sc/source/ui/view/overlayobject.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx2
7 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 0d84f78ff146..77693f874bc4 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -627,7 +627,7 @@ namespace
tools::Rectangle lcl_UpdateCalcPoly(basegfx::B2DPolygon &rCalcPoly, int nWhichPoint, const Point &rPos)
{
rCalcPoly.setB2DPoint(nWhichPoint, basegfx::B2DPoint(rPos.X(), rPos.Y()));
- basegfx::B2DRange aRange(basegfx::tools::getRange(rCalcPoly));
+ basegfx::B2DRange aRange(basegfx::utils::getRange(rCalcPoly));
return tools::Rectangle(static_cast<long>(aRange.getMinX()), static_cast<long>(aRange.getMinY()),
static_cast<long>(aRange.getMaxX()), static_cast<long>(aRange.getMaxY()));
}
@@ -856,7 +856,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
pObj->TRGetBaseGeometry(aOriginalMatrix, aPolyPolygon);
aOriginalMatrix.decompose(aScale, aTranslate, fRotate, fShearX);
aTranslate += ::basegfx::B2DTuple(aPoint.X(), aPoint.Y());
- aOriginalMatrix = basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
+ aOriginalMatrix = basegfx::utils::createScaleShearXRotateTranslateB2DHomMatrix(
aScale,
fShearX,
fRotate,
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index c0ea9f4626d0..d8259f12835b 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -161,7 +161,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
aSquare.append(basegfx::B2DPoint(0.0, 10.0));
aSquare.setClosed(true);
- basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromEllipse(basegfx::B2DPoint(0.0, 0.0), 100.0, 100.0));
+ basegfx::B2DPolygon aCircle(basegfx::utils::createPolygonFromEllipse(basegfx::B2DPoint(0.0, 0.0), 100.0, 100.0));
aCircle.setClosed(true);
OUString aName = SC_LINEEND_NAME;
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index ca0406a5b59d..ba0cddb6de18 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -246,7 +246,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, const SdrObject* pObj, sal
if( !aCircle.count() )
{
::basegfx::B2DPolygon aNewCircle;
- aNewCircle = ::basegfx::tools::createPolygonFromEllipse(::basegfx::B2DPoint(0.0, 0.0), 250.0, 250.0);
+ aNewCircle = ::basegfx::utils::createPolygonFromEllipse(::basegfx::B2DPoint(0.0, 0.0), 250.0, 250.0);
aNewCircle.setClosed(true);
aCircle.append(aNewCircle);
}
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index 816bb40281f5..2d9d86527f91 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -78,7 +78,7 @@ drawinglayer::primitive2d::Primitive2DContainer ScOverlayHint::createOverlaySequ
Point aTextPos(nLeft + aHintMargin.Width() , nTextOffsetY);
rRange = basegfx::B2DRange(nLeft, nTop, nLeft + aHintMargin.Width(), nTop + aHintMargin.Height());
- basegfx::B2DHomMatrix aTextMatrix(basegfx::tools::createScaleTranslateB2DHomMatrix(
+ basegfx::B2DHomMatrix aTextMatrix(basegfx::utils::createScaleTranslateB2DHomMatrix(
aFontSize.getX(), aFontSize.getY(),
aTextPos.X(), aTextPos.Y()));
@@ -112,7 +112,7 @@ drawinglayer::primitive2d::Primitive2DContainer ScOverlayHint::createOverlaySequ
{
OUString aLine = m_aMessage.getToken( 0, '\r', nIndex );
- aTextMatrix = basegfx::tools::createScaleTranslateB2DHomMatrix(
+ aTextMatrix = basegfx::utils::createScaleTranslateB2DHomMatrix(
aFontSize.getX(), aFontSize.getY(),
aLineStart.X(), aLineStart.Y() + nTextOffsetY);
@@ -134,7 +134,7 @@ drawinglayer::primitive2d::Primitive2DContainer ScOverlayHint::createOverlaySequ
rRange.expand(basegfx::B2DTuple(rRange.getMaxX() + aHintMargin.Width(),
rRange.getMaxY() + aHintMargin.Height()));
- basegfx::B2DPolygon aPoly(basegfx::tools::createPolygonFromRect(rRange));
+ basegfx::B2DPolygon aPoly(basegfx::utils::createPolygonFromRect(rRange));
const drawinglayer::primitive2d::Primitive2DReference aBg(
new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPoly), getBaseColor().getBColor()));
diff --git a/sc/source/ui/view/overlayobject.cxx b/sc/source/ui/view/overlayobject.cxx
index cc688f4301e0..07ea2d0f5b64 100644
--- a/sc/source/ui/view/overlayobject.cxx
+++ b/sc/source/ui/view/overlayobject.cxx
@@ -77,7 +77,7 @@ drawinglayer::primitive2d::Primitive2DContainer ScOverlayDashedBorder::createOve
if (!mbToggle)
::std::swap(aColorA, aColorB);
- const basegfx::B2DPolygon aPoly = basegfx::tools::createPolygonFromRect(maRange);
+ const basegfx::B2DPolygon aPoly = basegfx::utils::createPolygonFromRect(maRange);
B2DPolyPolygon aPolygon(aPoly);
const drawinglayer::primitive2d::Primitive2DReference aReference(
new drawinglayer::primitive2d::PolyPolygonMarkerPrimitive2D(
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 6d86d188e7fb..adb5b964b01a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -65,7 +65,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <basegfx/tools/zoomtools.hxx>
+#include <basegfx/utils/zoomtools.hxx>
#include <svx/zoom_def.hxx>
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index bd963bc0d438..d30b3ed28a06 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -53,7 +53,7 @@
#include <algorithm>
-#include <basegfx/tools/zoomtools.hxx>
+#include <basegfx/utils/zoomtools.hxx>
#define SPLIT_MARGIN 30
#define SPLIT_HANDLE_SIZE 5