summaryrefslogtreecommitdiff
path: root/sd/source/ui/presenter
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 /sd/source/ui/presenter
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 'sd/source/ui/presenter')
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 67154a396bc8..4d893c704215 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -24,7 +24,7 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolygonclipper.hxx>
#include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <canvas/canvastools.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
@@ -528,7 +528,7 @@ css::rendering::ViewState PresenterCanvas::MergeViewState (
// transformation.
aViewState.Clip = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
xDevice,
- ::basegfx::B2DPolyPolygon(::basegfx::tools::createPolygonFromRect(aWindowRange)));
+ ::basegfx::B2DPolyPolygon(::basegfx::utils::createPolygonFromRect(aWindowRange)));
}
else
{
@@ -540,7 +540,7 @@ css::rendering::ViewState PresenterCanvas::MergeViewState (
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(
aViewState.Clip));
const ::basegfx::B2DPolyPolygon aClippedClipPolygon (
- ::basegfx::tools::clipPolyPolygonOnRange(
+ ::basegfx::utils::clipPolyPolygonOnRange(
aClipPolygon,
aWindowRange,
true, /* bInside */
@@ -646,7 +646,7 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip (
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rxOriginalClip));
::basegfx::B2DRectangle aWindowRange (nMinX, nMinY, nMaxX, nMaxY);
const ::basegfx::B2DPolyPolygon aClippedClipPolygon (
- ::basegfx::tools::clipPolyPolygonOnRange(
+ ::basegfx::utils::clipPolyPolygonOnRange(
aOriginalClip,
aWindowRange,
true, /* bInside */