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 /emfio | |
| 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 'emfio')
| -rw-r--r-- | emfio/inc/mtftools.hxx | 4 | ||||
| -rw-r--r-- | emfio/source/emfuno/xemfparser.cxx | 4 | ||||
| -rw-r--r-- | emfio/source/reader/mtftools.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index d9f9dd62ea22..cc7361a360d7 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_EMFIO_INC_MTFTOOLS_HXX #define INCLUDED_EMFIO_INC_MTFTOOLS_HXX -#include <basegfx/tools/b2dclipstate.hxx> +#include <basegfx/utils/b2dclipstate.hxx> #include <tools/poly.hxx> #include <vcl/font.hxx> #include <vcl/bitmap.hxx> @@ -267,7 +267,7 @@ namespace emfio { class WinMtfClipPath { - basegfx::tools::B2DClipState maClip; + basegfx::utils::B2DClipState maClip; public: WinMtfClipPath() : maClip() {}; diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx index 32a2bc1a86ef..0e96b0515856 100644 --- a/emfio/source/emfuno/xemfparser.cxx +++ b/emfio/source/emfuno/xemfparser.cxx @@ -172,7 +172,7 @@ namespace emfio // use size const basegfx::B2DHomMatrix aMetafileTransform( - basegfx::tools::createScaleB2DHomMatrix( + basegfx::utils::createScaleB2DHomMatrix( aSize.Width(), aSize.Height())); @@ -198,7 +198,7 @@ namespace emfio // // for test, just create some graphic data that will get visualized // const basegfx::B2DRange aRange(1000, 1000, 5000, 5000); // const basegfx::BColor aColor(1.0, 0.0, 0.0); - // const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); + // const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(aRange)); // // aRetval.push_back(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aOutline), aColor)); // } diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 9fec82543f2a..212b93fc5b9f 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -104,7 +104,7 @@ namespace emfio maClip.intersectPolyPolygon(rB2DPoly); break; case RGN_COPY : - maClip = basegfx::tools::B2DClipState(rB2DPoly); + maClip = basegfx::utils::B2DClipState(rB2DPoly); break; } } @@ -119,7 +119,7 @@ namespace emfio void WinMtfClipPath::setDefaultClipPath() { // Empty clip region - everything visible - maClip = basegfx::tools::B2DClipState(); + maClip = basegfx::utils::B2DClipState(); } basegfx::B2DPolyPolygon WinMtfClipPath::getClipPath() const @@ -923,7 +923,7 @@ namespace emfio const basegfx::B2DPolyPolygon& rClipPoly( maClipPath.getClipPath() ); mbComplexClip = rClipPoly.count() > 1 - || !basegfx::tools::isRectangle(rClipPoly); + || !basegfx::utils::isRectangle(rClipPoly); static bool bEnableComplexClipViaRegion = getenv("SAL_WMF_COMPLEXCLIP_VIA_REGION") != nullptr; |