diff options
6 files changed, 34 insertions, 33 deletions
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx index 5ffe14f6d4f4..f281742a7311 100644 --- a/drawinglayer/source/animation/animationtiming.cxx +++ b/drawinglayer/source/animation/animationtiming.cxx @@ -4,9 +4,9 @@ * * $RCSfile: animationtiming.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-08-09 16:47:02 $ + * last change: $Author: aw $ $Date: 2006-09-27 16:32:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -88,7 +88,7 @@ namespace drawinglayer return mfDuration; } - double animationEntryFixed::getStateAtTime(double fTime) const + double animationEntryFixed::getStateAtTime(double /*fTime*/) const { return mfState; } diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 6f470c5870b2..7b18f2b4030a 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: polygontubeprimitive3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-08-09 16:51:15 $ + * last change: $Author: aw $ $Date: 2006-09-27 16:33:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -191,7 +191,7 @@ namespace drawinglayer sal_uInt32 nSegments, const attribute::materialAttribute3D& rMaterial, double fAngle, - double fDegreeStepWidth, + double /*fDegreeStepWidth*/, double fMiterMinimumAngle, basegfx::tools::B2DLineJoin aLineJoin) { diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index 574e2c5ea982..98148757edf4 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrextrudelathetools3d.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2006-08-09 16:51:15 $ + * last change: $Author: aw $ $Date: 2006-09-27 16:33:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -160,8 +160,8 @@ namespace if(nPointCount) { const sal_uInt32 nEdgeCount(aSubA.isClosed() ? nPointCount : nPointCount - 1L); - double fTexHorMultiplicatorA, fTexHorMultiplicatorB; - double fPolygonPosA, fPolygonPosB; + double fTexHorMultiplicatorA(0.0), fTexHorMultiplicatorB(0.0); + double fPolygonPosA(0.0), fPolygonPosB(0.0); if(bCreateTextureCoordinates) { @@ -170,8 +170,6 @@ namespace const double fPolygonLengthB(basegfx::tools::getLength(aSubB)); fTexHorMultiplicatorB = basegfx::fTools::equalZero(fPolygonLengthB) ? 1.0 : 1.0 / fPolygonLengthB; - - fPolygonPosA = fPolygonPosB = 0.0; } for(sal_uInt32 b(0L); b < nEdgeCount; b++) diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index 66f31f67deb8..7c299a1215ca 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrsphereprimitive3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-08-09 16:51:16 $ + * last change: $Author: aw $ $Date: 2006-09-27 16:33:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,7 +105,7 @@ namespace drawinglayer if(bSphereX || bObjectSpecificX || bSphereY || bObjectSpecificY) { - double fRelativeAngle; + double fRelativeAngle(0.0); if(bObjectSpecificX) { diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 4d11f2bd8fb7..1ec617b0a944 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: defaultprocessor3d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-08-09 16:57:47 $ + * last change: $Author: aw $ $Date: 2006-09-27 16:33:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -431,6 +431,10 @@ namespace basegfx { } + virtual ~B3DPolyPolygonRasterConverter() + { + } + void addPolygon(const B3DPolygon& rPolygon, const B3DHomMatrix& rInvEyeToView) { const sal_uInt32 nPointCount(rPolygon.count()); @@ -879,7 +883,6 @@ namespace drawinglayer } else { - const sal_uInt32 nScanlineIndexLine(mrBuffer.getIndexFromXY(0L, (sal_uInt32)nLine)); double fZStart(rEntry.getZInterpolator().getVal()); double fZStop(fZStart + rEntry.getZInterpolator().getInc()); @@ -973,12 +976,12 @@ namespace drawinglayer && mfOpacity == pCompare->mfOpacity); } - void geoTexSvxMono::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvxMono::modifyBColor(const basegfx::B2DPoint& /*rUV*/, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { rBColor = maSingleColor; } - void geoTexSvxMono::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const + void geoTexSvxMono::modifyOpacity(const basegfx::B2DPoint& /*rUV*/, double& rfOpacity) const { rfOpacity = mfOpacity; } @@ -1743,7 +1746,7 @@ namespace drawinglayer // directdraw of polygonHairlinePrimitive3D const primitive3d::polygonHairlinePrimitive3D& rPrimitive = static_cast< const primitive3d::polygonHairlinePrimitive3D& >(rCandidate.getBasePrimitive()); - if(mbProcessTransparent == (0L != mpTransparenceGeoTexSvx)) + if((bool)mbProcessTransparent == (0L != mpTransparenceGeoTexSvx)) { impRender_POH3(rPrimitive); } @@ -1756,7 +1759,7 @@ namespace drawinglayer // directdraw of polyPolygonMaterialPrimitive3D const primitive3d::polyPolygonMaterialPrimitive3D& rPrimitive = static_cast< const primitive3d::polyPolygonMaterialPrimitive3D& >(rCandidate.getBasePrimitive()); - if(mbProcessTransparent == (0L != mpTransparenceGeoTexSvx)) + if((bool)mbProcessTransparent == (0L != mpTransparenceGeoTexSvx)) { impRender_POM3(rPrimitive); } diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index afc6e63071ce..60e3042f6b31 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -4,9 +4,9 @@ * * $RCSfile: texture.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-08-09 16:58:20 $ + * last change: $Author: aw $ $Date: 2006-09-27 16:33:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,18 +55,18 @@ namespace drawinglayer { } - bool geoTexSvx::operator==(const geoTexSvx& rGeoTexSvx) const + bool geoTexSvx::operator==(const geoTexSvx& /*rGeoTexSvx*/) const { // default implementation says yes (no data -> no difference) return true; } - void geoTexSvx::appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices) + void geoTexSvx::appendTransformations(::std::vector< basegfx::B2DHomMatrix >& /*rMatrices*/) { // default implementation does nothing } - void geoTexSvx::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvx::modifyBColor(const basegfx::B2DPoint& /*rUV*/, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { // base implementation creates random color (for testing only, may also be pure virtual) rBColor.setRed((rand() & 0x7fff) / 32767.0); @@ -236,7 +236,7 @@ namespace drawinglayer } } - void geoTexSvxGradientLinear::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvxGradientLinear::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); @@ -363,7 +363,7 @@ namespace drawinglayer } } - void geoTexSvxGradientAxial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvxGradientAxial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const double fAbsY(fabs(aCoor.getY())); @@ -483,7 +483,7 @@ namespace drawinglayer impAppendColorsRadial(rColors); } - void geoTexSvxGradientRadial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvxGradientRadial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const double fDist(aCoor.getX() * aCoor.getX() + aCoor.getY() * aCoor.getY()); @@ -613,7 +613,7 @@ namespace drawinglayer impAppendColorsRadial(rColors); } - void geoTexSvxGradientElliptical::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvxGradientElliptical::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const double fDist(aCoor.getX() * aCoor.getX() + aCoor.getY() * aCoor.getY()); @@ -758,7 +758,7 @@ namespace drawinglayer impAppendColorsRadial(rColors); } - void geoTexSvxGradientSquare::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvxGradientSquare::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const double fAbsX(fabs(aCoor.getX())); @@ -896,7 +896,7 @@ namespace drawinglayer impAppendColorsRadial(rColors); } - void geoTexSvxGradientRect::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void geoTexSvxGradientRect::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const { const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const double fAbsX(fabs(aCoor.getX())); |