summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-07-31 17:52:07 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-07-31 17:52:07 +0200
commit268fe75e3326d7f2d105c9b915c82f9e6f510348 (patch)
tree75a1fa8956075ef994725ee2dafcb3c8151ac3dc /drawinglayer
parent040b8f46cc3757e03ebd9c8462653949efeda7b5 (diff)
Some cppcheck cleaning
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx6
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx3
-rw-r--r--drawinglayer/source/processor2d/canvasprocessor.cxx2
3 files changed, 5 insertions, 6 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 9b35f8109ddb..e2e0c5994142 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -234,7 +234,7 @@ namespace
maPropertyHolders.push_back(new PropertyHolder());
}
- sal_uInt32 size()
+ sal_uInt32 size() const
{
return maPropertyHolders.size();
}
@@ -450,7 +450,7 @@ namespace
}
}
- sal_uInt32 size()
+ sal_uInt32 size() const
{
return aTargets.size();
}
@@ -515,7 +515,7 @@ namespace
maTargetHolders.push_back(new TargetHolder());
}
- sal_uInt32 size()
+ sal_uInt32 size() const
{
return maTargetHolders.size();
}
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index b33bb0038a43..8cedcd107777 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -67,7 +67,6 @@ namespace drawinglayer
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());
- double fRelativeTextureWidth(1.0);
basegfx::B2DHomMatrix aTexTransform;
if(!getSdrLFSAttribute().getFill().isDefault() && (bCreateTextureCoordiantesX || bCreateTextureCoordiantesY))
@@ -76,7 +75,7 @@ namespace drawinglayer
const double fFrontLength(basegfx::tools::getLength(aFirstPolygon));
const double fFrontArea(basegfx::tools::getArea(aFirstPolygon));
const double fSqrtFrontArea(sqrt(fFrontArea));
- fRelativeTextureWidth = basegfx::fTools::equalZero(fSqrtFrontArea) ? 1.0 : fFrontLength / fSqrtFrontArea;
+ double fRelativeTextureWidth = basegfx::fTools::equalZero(fSqrtFrontArea) ? 1.0 : fFrontLength / fSqrtFrontArea;
fRelativeTextureWidth = (double)((sal_uInt32)(fRelativeTextureWidth - 0.5));
if(fRelativeTextureWidth < 1.0)
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index dce0b8533e68..58c5631af232 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -399,11 +399,11 @@ namespace drawinglayer
{
// adapt object's transformation to the correct scale
basegfx::B2DVector aScale, aTranslate;
- double fRotate, fShearX;
const Size aSizePixel(aModifiedBitmapEx.GetSizePixel());
if(0 != aSizePixel.Width() && 0 != aSizePixel.Height())
{
+ double fRotate, fShearX;
rBitmapCandidate.getTransform().decompose(aScale, aTranslate, fRotate, fShearX);
const basegfx::B2DHomMatrix aNewMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aScale.getX() / aSizePixel.Width(), aScale.getY() / aSizePixel.Height(),