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 /svx/source/unodraw | |
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 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/XPropertyTable.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 14 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 10 |
4 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 92bf5d6e396b..983f3ab9a671 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -37,7 +37,7 @@ #include "svx/unoapi.hxx" #include <editeng/unoprnms.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/tools/unotools.hxx> +#include <basegfx/utils/unotools.hxx> using namespace com::sun::star; using namespace ::cppu; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 5ed67a209371..3a13bdf8dedd 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -58,7 +58,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/tools/unotools.hxx> +#include <basegfx/utils/unotools.hxx> #include <comphelper/servicehelper.hxx> #include <com/sun/star/awt/XBitmap.hpp> #include <svx/svdograf.hxx> @@ -960,7 +960,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c } // check for closed state flag - basegfx::tools::checkClosed(aNewPolygon); + basegfx::utils::checkClosed(aNewPolygon); // add new subpolygon aRetval.append(aNewPolygon); @@ -1018,7 +1018,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx } // check for closed state flag - basegfx::tools::checkClosed(aNewPolygon); + basegfx::utils::checkClosed(aNewPolygon); // set polygon SetPolygon(basegfx::B2DPolyPolygon(aNewPolygon)); diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index db8a29d4a08c..a9604f6b766e 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -722,7 +722,7 @@ bool PolyPolygonShape3D_to_B3dPolyPolygon( // see callers if(bCorrectPolygon) { - basegfx::tools::checkClosed(aNewPolygon); + basegfx::utils::checkClosed(aNewPolygon); } rResultPolygon.append(aNewPolygon); @@ -797,7 +797,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte // set polygon const basegfx::B3DHomMatrix aIdentity; - const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity)); + const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity)); static_cast<E3dLatheObj*>(mpObj.get())->SetPolyPoly2D(aB2DPolyPolygon); const sal_uInt32 nPostVerticalSegs(static_cast<E3dLatheObj*>(mpObj.get())->GetVerticalSegments()); @@ -851,7 +851,7 @@ bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxIte case OWN_ATTR_3D_VALUE_POLYPOLYGON3D: { const basegfx::B2DPolyPolygon& rPolyPoly = static_cast<E3dLatheObj*>(mpObj.get())->GetPolyPoly2D(); - const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly)); + const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::utils::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly)); B3dPolyPolygon_to_PolyPolygonShape3D(aB3DPolyPolygon, rValue); break; @@ -903,7 +903,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI { // set polygon const basegfx::B3DHomMatrix aIdentity; - const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity)); + const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity)); static_cast<E3dExtrudeObj*>(mpObj.get())->SetExtrudePolygon(aB2DPolyPolygon); return true; } @@ -952,7 +952,7 @@ bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxI { // pack polygon definition const basegfx::B2DPolyPolygon& rPolyPoly = static_cast<E3dExtrudeObj*>(mpObj.get())->GetExtrudePolygon(); - const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly)); + const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::utils::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly)); B3dPolyPolygon_to_PolyPolygonShape3D(aB3DPolyPolygon, rValue); break; @@ -1032,7 +1032,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI { // set polygon const basegfx::B3DHomMatrix aIdentity; - const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity)); + const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity)); static_cast<E3dPolygonObj*>(mpObj.get())->SetPolyTexture2D(aB2DPolyPolygon); return true; } @@ -1081,7 +1081,7 @@ bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxI { // pack texture definition const basegfx::B2DPolyPolygon& rPolyPoly = static_cast<E3dPolygonObj*>(mpObj.get())->GetPolyTexture2D(); - const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly)); + const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::utils::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly)); B3dPolyPolygon_to_PolyPolygonShape3D(aB3DPolyPolygon,rValue); break; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 3c5b88860df4..031707e1d8d4 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -83,7 +83,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/tools/unotools.hxx> +#include <basegfx/utils/unotools.hxx> #include "gluepts.hxx" #include "shapeimpl.hxx" #include <sal/log.hxx> @@ -2221,13 +2221,13 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl if( auto s = o3tl::tryAccess<drawing::PointSequenceSequence>(rValue) ) { // get polygpon data from PointSequenceSequence - aNewPolyPolygon = basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon( + aNewPolyPolygon = basegfx::utils::UnoPointSequenceSequenceToB2DPolyPolygon( *s); } else if( auto cs = o3tl::tryAccess<drawing::PolyPolygonBezierCoords>(rValue) ) { // get polygpon data from PolyPolygonBezierCoords - aNewPolyPolygon = basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( + aNewPolyPolygon = basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( *cs); } @@ -2238,7 +2238,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl if( mpModel->IsWriter() ) { Point aPoint( mpObj->GetAnchorPos() ); - aNewPolyPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(aPoint.X(), aPoint.Y())); + aNewPolyPolygon.transform(basegfx::utils::createTranslateB2DHomMatrix(aPoint.X(), aPoint.Y())); } pEdgeObj->SetEdgeTrackPath( aNewPolyPolygon ); return true; @@ -2682,7 +2682,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl if( mpModel->IsWriter() ) { Point aPoint( mpObj->GetAnchorPos() ); - aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y())); + aPolyPoly.transform(basegfx::utils::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y())); } // Reintroduction of fix for issue #i59051# (#i108851#) ForceMetricTo100th_mm( aPolyPoly ); |