strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i39532# changes after resync to m185

Browse source
This commit is contained in:
Armin Weiss 2006-09-27 15:33:43 +00:00
parent 4db120a0a1
commit 747de98357
6 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drawinglayer/source/animation/animationtiming.cxx
View file

@ -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;
}

6
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
View file

@ -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)
{

10
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
View file

@ -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++)

6
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
View file

@ -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)
{

17
drawinglayer/source/processor3d/defaultprocessor3d.cxx
View file

@ -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);
}

22
drawinglayer/source/texture/texture.cxx
View file

@ -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()));