basegfx/source/polygon/b3dpolygon.cxx | 114 +++++------ basegfx/source/polygon/b3dpolypolygon.cxx | 8 chart2/source/model/template/AreaChartTypeTemplate.cxx | 2 chart2/source/model/template/BarChartTypeTemplate.cxx | 2 chart2/source/model/template/BubbleChartTypeTemplate.cxx | 2 chart2/source/model/template/ChartTypeTemplate.cxx | 2 chart2/source/model/template/ChartTypeTemplate.hxx | 2 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 4 chart2/source/model/template/LineChartTypeTemplate.cxx | 2 chart2/source/model/template/NetChartTypeTemplate.cxx | 2 chart2/source/model/template/PieChartTypeTemplate.cxx | 2 chart2/source/model/template/ScatterChartTypeTemplate.cxx | 2 chart2/source/model/template/StockChartTypeTemplate.cxx | 2 drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx | 2 drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx | 2 drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 2 drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 8 drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 8 drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx | 2 include/basegfx/polygon/b3dpolygon.hxx | 2 include/basegfx/polygon/b3dpolypolygon.hxx | 2 21 files changed, 87 insertions(+), 87 deletions(-)
New commits: commit 93e7870f31065ceda3485cb9390374d240587a78 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Jul 8 11:43:35 2015 +0300 s/Coordiante/Coordinate Change-Id: Iac584b09844b5877586061e9a44b1f7473bffed4 diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx index 3458770..020b6c6 100644 --- a/basegfx/source/polygon/b3dpolygon.cxx +++ b/basegfx/source/polygon/b3dpolygon.cxx @@ -753,7 +753,7 @@ class ImplB3DPolygon // The TextureCoordinates vector. This vectors are created on demand // and may be zero. - TextureCoordinate2D* mpTextureCoordiantes; + TextureCoordinate2D* mpTextureCoordinates; // The calculated plane normal. mbPlaneNormalValid says if it's valid. ::basegfx::B3DVector maPlaneNormal; @@ -781,7 +781,7 @@ public: : maPoints(0L), mpBColors(0L), mpNormals(0L), - mpTextureCoordiantes(0L), + mpTextureCoordinates(0L), maPlaneNormal(::basegfx::B3DVector::getEmptyVector()), mbIsClosed(false), mbPlaneNormalValid(true) @@ -793,7 +793,7 @@ public: : maPoints(rToBeCopied.maPoints), mpBColors(0L), mpNormals(0L), - mpTextureCoordiantes(0L), + mpTextureCoordinates(0L), maPlaneNormal(rToBeCopied.maPlaneNormal), mbIsClosed(rToBeCopied.mbIsClosed), mbPlaneNormalValid(rToBeCopied.mbPlaneNormalValid) @@ -809,9 +809,9 @@ public: mpNormals = new NormalsArray3D(*rToBeCopied.mpNormals); } - if(rToBeCopied.mpTextureCoordiantes && rToBeCopied.mpTextureCoordiantes->isUsed()) + if(rToBeCopied.mpTextureCoordinates && rToBeCopied.mpTextureCoordinates->isUsed()) { - mpTextureCoordiantes = new TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes); + mpTextureCoordinates = new TextureCoordinate2D(*rToBeCopied.mpTextureCoordinates); } } @@ -819,7 +819,7 @@ public: : maPoints(rToBeCopied.maPoints, nIndex, nCount), mpBColors(0L), mpNormals(0L), - mpTextureCoordiantes(0L), + mpTextureCoordinates(0L), maPlaneNormal(::basegfx::B3DVector::getEmptyVector()), mbIsClosed(rToBeCopied.mbIsClosed), mbPlaneNormalValid(false) @@ -847,14 +847,14 @@ public: } } - if(rToBeCopied.mpTextureCoordiantes && rToBeCopied.mpTextureCoordiantes->isUsed()) + if(rToBeCopied.mpTextureCoordinates && rToBeCopied.mpTextureCoordinates->isUsed()) { - mpTextureCoordiantes = new TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes, nIndex, nCount); + mpTextureCoordinates = new TextureCoordinate2D(*rToBeCopied.mpTextureCoordinates, nIndex, nCount); - if(!mpTextureCoordiantes->isUsed()) + if(!mpTextureCoordinates->isUsed()) { - delete mpTextureCoordiantes; - mpTextureCoordiantes = 0L; + delete mpTextureCoordinates; + mpTextureCoordinates = 0L; } } } @@ -873,10 +873,10 @@ public: mpNormals = 0L; } - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - delete mpTextureCoordiantes; - mpTextureCoordiantes = 0L; + delete mpTextureCoordinates; + mpTextureCoordinates = 0L; } } @@ -918,7 +918,7 @@ public: { if(rCandidate.mpBColors) { - // we have no TextureCoordiantes, so it's assumed all unused. + // we have no TextureCoordinates, so it's assumed all unused. bBColorsAreEqual = !rCandidate.mpBColors->isUsed(); } } @@ -958,24 +958,24 @@ public: { bool bTextureCoordinatesAreEqual(true); - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - if(rCandidate.mpTextureCoordiantes) + if(rCandidate.mpTextureCoordinates) { - bTextureCoordinatesAreEqual = (*mpTextureCoordiantes == *rCandidate.mpTextureCoordiantes); + bTextureCoordinatesAreEqual = (*mpTextureCoordinates == *rCandidate.mpTextureCoordinates); } else { // candidate has no TextureCoordinates, so it's assumed all unused. - bTextureCoordinatesAreEqual = !mpTextureCoordiantes->isUsed(); + bTextureCoordinatesAreEqual = !mpTextureCoordinates->isUsed(); } } else { - if(rCandidate.mpTextureCoordiantes) + if(rCandidate.mpTextureCoordinates) { - // we have no TextureCoordiantes, so it's assumed all unused. - bTextureCoordinatesAreEqual = !rCandidate.mpTextureCoordiantes->isUsed(); + // we have no TextureCoordinates, so it's assumed all unused. + bTextureCoordinatesAreEqual = !rCandidate.mpTextureCoordinates->isUsed(); } } @@ -1033,9 +1033,9 @@ public: mpNormals->insert(nIndex, ::basegfx::B3DVector::getEmptyVector(), nCount); } - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - mpTextureCoordiantes->insert(nIndex, ::basegfx::B2DPoint::getEmptyPoint(), nCount); + mpTextureCoordinates->insert(nIndex, ::basegfx::B2DPoint::getEmptyPoint(), nCount); } } } @@ -1157,9 +1157,9 @@ public: const ::basegfx::B2DPoint& getTextureCoordinate(sal_uInt32 nIndex) const { - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - return mpTextureCoordiantes->getTextureCoordinate(nIndex); + return mpTextureCoordinates->getTextureCoordinate(nIndex); } else { @@ -1169,45 +1169,45 @@ public: void setTextureCoordinate(sal_uInt32 nIndex, const ::basegfx::B2DPoint& rValue) { - if(!mpTextureCoordiantes) + if(!mpTextureCoordinates) { if(!rValue.equalZero()) { - mpTextureCoordiantes = new TextureCoordinate2D(maPoints.count()); - mpTextureCoordiantes->setTextureCoordinate(nIndex, rValue); + mpTextureCoordinates = new TextureCoordinate2D(maPoints.count()); + mpTextureCoordinates->setTextureCoordinate(nIndex, rValue); } } else { - mpTextureCoordiantes->setTextureCoordinate(nIndex, rValue); + mpTextureCoordinates->setTextureCoordinate(nIndex, rValue); - if(!mpTextureCoordiantes->isUsed()) + if(!mpTextureCoordinates->isUsed()) { - delete mpTextureCoordiantes; - mpTextureCoordiantes = 0L; + delete mpTextureCoordinates; + mpTextureCoordinates = 0L; } } } bool areTextureCoordinatesUsed() const { - return (mpTextureCoordiantes && mpTextureCoordiantes->isUsed()); + return (mpTextureCoordinates && mpTextureCoordinates->isUsed()); } void clearTextureCoordinates() { - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - delete mpTextureCoordiantes; - mpTextureCoordiantes = 0L; + delete mpTextureCoordinates; + mpTextureCoordinates = 0L; } } void transformTextureCoordinates(const ::basegfx::B2DHomMatrix& rMatrix) { - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - mpTextureCoordiantes->transform(rMatrix); + mpTextureCoordinates->transform(rMatrix); } } @@ -1254,20 +1254,20 @@ public: } } - if(rSource.mpTextureCoordiantes && rSource.mpTextureCoordiantes->isUsed()) + if(rSource.mpTextureCoordinates && rSource.mpTextureCoordinates->isUsed()) { - if(!mpTextureCoordiantes) + if(!mpTextureCoordinates) { - mpTextureCoordiantes = new TextureCoordinate2D(maPoints.count()); + mpTextureCoordinates = new TextureCoordinate2D(maPoints.count()); } - mpTextureCoordiantes->insert(nIndex, *rSource.mpTextureCoordiantes); + mpTextureCoordinates->insert(nIndex, *rSource.mpTextureCoordinates); } else { - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - mpTextureCoordiantes->insert(nIndex, ::basegfx::B2DPoint::getEmptyPoint(), nCount); + mpTextureCoordinates->insert(nIndex, ::basegfx::B2DPoint::getEmptyPoint(), nCount); } } } @@ -1302,14 +1302,14 @@ public: } } - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - mpTextureCoordiantes->remove(nIndex, nCount); + mpTextureCoordinates->remove(nIndex, nCount); - if(!mpTextureCoordiantes->isUsed()) + if(!mpTextureCoordinates->isUsed()) { - delete mpTextureCoordiantes; - mpTextureCoordiantes = 0L; + delete mpTextureCoordinates; + mpTextureCoordinates = 0L; } } } @@ -1337,9 +1337,9 @@ public: mpNormals->flip(); } - if(mpTextureCoordiantes) + if(mpTextureCoordinates) { - mpTextureCoordiantes->flip(); + mpTextureCoordinates->flip(); } } } @@ -1361,7 +1361,7 @@ public: if(bNormalsEqual) { - const bool bTextureCoordinatesEqual(!mpTextureCoordiantes || (mpTextureCoordiantes->getTextureCoordinate(0L) == mpTextureCoordiantes->getTextureCoordinate(nIndex))); + const bool bTextureCoordinatesEqual(!mpTextureCoordinates || (mpTextureCoordinates->getTextureCoordinate(0L) == mpTextureCoordinates->getTextureCoordinate(nIndex))); if(bTextureCoordinatesEqual) { @@ -1385,7 +1385,7 @@ public: if(bNormalsEqual) { - const bool bTextureCoordinatesEqual(!mpTextureCoordiantes || (mpTextureCoordiantes->getTextureCoordinate(a) == mpTextureCoordiantes->getTextureCoordinate(a + 1L))); + const bool bTextureCoordinatesEqual(!mpTextureCoordinates || (mpTextureCoordinates->getTextureCoordinate(a) == mpTextureCoordinates->getTextureCoordinate(a + 1L))); if(bTextureCoordinatesEqual) { @@ -1425,7 +1425,7 @@ public: bRemove = false; } - if(bRemove && mpTextureCoordiantes && !(mpTextureCoordiantes->getTextureCoordinate(0L) == mpTextureCoordiantes->getTextureCoordinate(nIndex))) + if(bRemove && mpTextureCoordinates && !(mpTextureCoordinates->getTextureCoordinate(0L) == mpTextureCoordinates->getTextureCoordinate(nIndex))) { bRemove = false; } @@ -1461,7 +1461,7 @@ public: bRemove = false; } - if(bRemove && mpTextureCoordiantes && !(mpTextureCoordiantes->getTextureCoordinate(nIndex) == mpTextureCoordiantes->getTextureCoordinate(nNextIndex))) + if(bRemove && mpTextureCoordinates && !(mpTextureCoordinates->getTextureCoordinate(nIndex) == mpTextureCoordinates->getTextureCoordinate(nNextIndex))) { bRemove = false; } @@ -1629,7 +1629,7 @@ namespace basegfx mpPolygon->setTextureCoordinate(nIndex, rValue); } - void B3DPolygon::transformTextureCoordiantes(const B2DHomMatrix& rMatrix) + void B3DPolygon::transformTextureCoordinates(const B2DHomMatrix& rMatrix) { if(mpPolygon->areTextureCoordinatesUsed() && !rMatrix.isIdentity()) mpPolygon->transformTextureCoordinates(rMatrix); diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx index 9cfc8f8f..3c6e672 100644 --- a/basegfx/source/polygon/b3dpolypolygon.cxx +++ b/basegfx/source/polygon/b3dpolypolygon.cxx @@ -151,11 +151,11 @@ public: } } - void transformTextureCoordiantes(const ::basegfx::B2DHomMatrix& rMatrix) + void transformTextureCoordinates(const ::basegfx::B2DHomMatrix& rMatrix) { for(size_t a(0L); a < maPolygons.size(); a++) { - maPolygons[a].transformTextureCoordiantes(rMatrix); + maPolygons[a].transformTextureCoordinates(rMatrix); } } @@ -307,10 +307,10 @@ namespace basegfx mpPolyPolygon->clearNormals(); } - void B3DPolyPolygon::transformTextureCoordiantes(const B2DHomMatrix& rMatrix) + void B3DPolyPolygon::transformTextureCoordinates(const B2DHomMatrix& rMatrix) { if(!rMatrix.isIdentity()) - mpPolyPolygon->transformTextureCoordiantes(rMatrix); + mpPolyPolygon->transformTextureCoordinates(rMatrix); } bool B3DPolyPolygon::areTextureCoordinatesUsed() const diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 37c6c16..1537c3f 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -238,7 +238,7 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 971f666..190ed23 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -222,7 +222,7 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index e070942..0f4276d 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -195,7 +195,7 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo xResult.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ), uno::UNO_QUERY_THROW ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); } catch( const uno::Exception & ex ) { diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index f42adad..2fb754b 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -872,7 +872,7 @@ void ChartTypeTemplate::createChartTypes( } } -void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( +void ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( const Sequence< Reference< XChartType > > & rOldChartTypesSeq, const Reference< XChartType > & xNewChartType ) { diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index fe6f2c9..1ea7bb2 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -244,7 +244,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const { return m_xContext;} - static void copyPropertiesFromOldToNewCoordianteSystem( + static void copyPropertiesFromOldToNewCoordinateSystem( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > & rOldChartTypesSeq, diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 8e741fb..7f36308 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -205,7 +205,7 @@ void ColumnLineChartTypeTemplate::createChartTypes( Reference< XChartType > xCT( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ), uno::UNO_QUERY_THROW ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aOldChartTypesSeq, xCT ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aOldChartTypesSeq, xCT ); Reference< XChartTypeContainer > xCTCnt( rCoordSys[ 0 ], uno::UNO_QUERY_THROW ); xCTCnt->setChartTypes( Sequence< Reference< chart2::XChartType > >( &xCT, 1 )); @@ -385,7 +385,7 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew GetComponentContext()->getServiceManager(), uno::UNO_QUERY_THROW ); xResult.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_LINE ), uno::UNO_QUERY_THROW ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); } catch( const uno::Exception & ex ) { diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index a7c1814..42441a7 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -331,7 +331,7 @@ Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForN xResult.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_LINE ), uno::UNO_QUERY_THROW ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); Reference< beans::XPropertySet > xCTProp( xResult, uno::UNO_QUERY ); if( xCTProp.is()) diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index ecf7435..c8ce8c2 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -190,7 +190,7 @@ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNe throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); return xResult; } diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index dc337df..3385df7 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -430,7 +430,7 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe GetComponentContext()->getServiceManager(), uno::UNO_QUERY_THROW ); xResult.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_PIE ), uno::UNO_QUERY_THROW ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); Reference< beans::XPropertySet > xCTProp( xResult, uno::UNO_QUERY ); if( xCTProp.is()) { diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 781cefd..35f974d 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -365,7 +365,7 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF xResult.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ), uno::UNO_QUERY_THROW ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); Reference< beans::XPropertySet > xCTProp( xResult, uno::UNO_QUERY ); if( xCTProp.is()) diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index e1f5d9f..0e28bf7 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -497,7 +497,7 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie GetComponentContext()->getServiceManager(), uno::UNO_QUERY_THROW ); xResult.set( xFact->createInstance( CHART2_SERVICE_NAME_CHARTTYPE_LINE ), uno::UNO_QUERY_THROW ); - ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); + ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); } catch( const uno::Exception & ex ) { diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 05f47fa..4fbd849 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -124,7 +124,7 @@ namespace drawinglayer // transform texture coordinates to texture size basegfx::B2DHomMatrix aTexMatrix; aTexMatrix.scale(getTextureSize().getX(), getTextureSize().getY()); - aFill.transformTextureCoordiantes(aTexMatrix); + aFill.transformTextureCoordinates(aTexMatrix); } // build vector of PolyPolygons diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index 9a92be0..95b992c 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx @@ -129,7 +129,7 @@ namespace drawinglayer for(a = 0; a < rFill.size(); a++) { - rFill[a].transformTextureCoordiantes(aTexMatrix); + rFill[a].transformTextureCoordinates(aTexMatrix); } } diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index cf20b03..56e8b55 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -883,7 +883,7 @@ namespace drawinglayer if(bCreateTextureCoordinates) { - aEdgeRounding.transformTextureCoordiantes(rTexTransform); + aEdgeRounding.transformTextureCoordinates(rTexTransform); } for(a = 0L; a < aEdgeRounding.count(); a++) diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index ddbc224..a7ea6e2 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -53,11 +53,11 @@ namespace drawinglayer // decide what to create const ::com::sun::star::drawing::NormalsKind eNormalsKind(getSdr3DObjectAttribute().getNormalsKind()); const bool bCreateNormals(::com::sun::star::drawing::NormalsKind_SPECIFIC == eNormalsKind); - const bool bCreateTextureCoordiantesX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bCreateTextureCoordiantesY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); + const bool bCreateTextureCoordinatesX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bCreateTextureCoordinatesY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); basegfx::B2DHomMatrix aTexTransform; - if(!getSdrLFSAttribute().getFill().isDefault() && (bCreateTextureCoordiantesX || bCreateTextureCoordiantesY)) + if(!getSdrLFSAttribute().getFill().isDefault() && (bCreateTextureCoordinatesX || bCreateTextureCoordinatesY)) { const basegfx::B2DPolygon aFirstPolygon(maCorrectedPolyPolygon.getB2DPolygon(0L)); const double fFrontLength(basegfx::tools::getLength(aFirstPolygon)); @@ -81,7 +81,7 @@ namespace drawinglayer ::std::vector< basegfx::B3DPolyPolygon > aFill; extractPlanesFromSlice(aFill, rSliceVector, bCreateNormals, getSmoothHorizontalNormals(), getSmoothNormals(), getSmoothLids(), false, - 0.5, 0.6, bCreateTextureCoordiantesX || bCreateTextureCoordiantesY, aTexTransform); + 0.5, 0.6, bCreateTextureCoordinatesX || bCreateTextureCoordinatesY, aTexTransform); // get full range const basegfx::B3DRange aRange(getRangeFrom3DGeometry(aFill)); diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index aff06d3..b12413f 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -55,12 +55,12 @@ namespace drawinglayer // decide what to create const ::com::sun::star::drawing::NormalsKind eNormalsKind(getSdr3DObjectAttribute().getNormalsKind()); const bool bCreateNormals(::com::sun::star::drawing::NormalsKind_SPECIFIC == eNormalsKind); - const bool bCreateTextureCoordiantesX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bCreateTextureCoordiantesY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); + const bool bCreateTextureCoordinatesX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bCreateTextureCoordinatesY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); basegfx::B2DHomMatrix aTexTransform; if(!getSdrLFSAttribute().getFill().isDefault() - && (bCreateTextureCoordiantesX || bCreateTextureCoordiantesY)) + && (bCreateTextureCoordinatesX || bCreateTextureCoordinatesY)) { aTexTransform.set(0, 0, 0.0); aTexTransform.set(0, 1, 1.0); @@ -76,7 +76,7 @@ namespace drawinglayer ::std::vector< basegfx::B3DPolyPolygon > aFill; extractPlanesFromSlice(aFill, rSliceVector, bCreateNormals, getSmoothHorizontalNormals(), getSmoothNormals(), getSmoothLids(), bClosedRotation, - 0.85, 0.6, bCreateTextureCoordiantesX || bCreateTextureCoordiantesY, aTexTransform); + 0.85, 0.6, bCreateTextureCoordinatesX || bCreateTextureCoordinatesY, aTexTransform); // get full range const basegfx::B3DRange aRange(getRangeFrom3DGeometry(aFill)); diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index c9ea3b4..0e2c143 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -113,7 +113,7 @@ namespace drawinglayer // transform texture coordinates to texture size basegfx::B2DHomMatrix aTexMatrix; aTexMatrix.scale(getTextureSize().getX(), getTextureSize().getY()); - aFill.transformTextureCoordiantes(aTexMatrix); + aFill.transformTextureCoordinates(aTexMatrix); } // build vector of PolyPolygons diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx index 58a4c0c..8e29d3a 100644 --- a/include/basegfx/polygon/b3dpolygon.hxx +++ b/include/basegfx/polygon/b3dpolygon.hxx @@ -87,7 +87,7 @@ namespace basegfx // TextureCoordinate interface B2DPoint getTextureCoordinate(sal_uInt32 nIndex) const; void setTextureCoordinate(sal_uInt32 nIndex, const B2DPoint& rValue); - void transformTextureCoordiantes(const B2DHomMatrix& rMatrix); + void transformTextureCoordinates(const B2DHomMatrix& rMatrix); bool areTextureCoordinatesUsed() const; void clearTextureCoordinates(); diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx index 040990f..ea47e33 100644 --- a/include/basegfx/polygon/b3dpolypolygon.hxx +++ b/include/basegfx/polygon/b3dpolypolygon.hxx @@ -73,7 +73,7 @@ namespace basegfx void clearNormals(); // TextureCoordinate interface - void transformTextureCoordiantes(const B2DHomMatrix& rMatrix); + void transformTextureCoordinates(const B2DHomMatrix& rMatrix); bool areTextureCoordinatesUsed() const; void clearTextureCoordinates(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits