[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer
Noel Grandin
noel.grandin at collabora.co.uk
Mon Nov 6 06:12:50 UTC 2017
drawinglayer/source/processor2d/vclpixelprocessor2d.hxx | 4 ---
include/drawinglayer/animation/animationtiming.hxx | 9 ++-----
include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx | 4 ---
include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx | 4 ---
include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx | 3 --
include/drawinglayer/primitive3d/shadowprimitive3d.hxx | 3 --
include/drawinglayer/texture/texture.hxx | 13 +++--------
include/drawinglayer/texture/texture3d.hxx | 9 ++-----
8 files changed, 15 insertions(+), 34 deletions(-)
New commits:
commit 149247ec64b558244f8d94834ead37a1354029f4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Nov 3 15:13:24 2017 +0200
loplugin:finalclasses in drawinglayer
Change-Id: I8922fc85ab23453791e3ce0b639d4ffafd31e967
Reviewed-on: https://gerrit.libreoffice.org/44315
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index fb7cc5280c64..0190fed7dfe7 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -47,13 +47,11 @@ namespace drawinglayer
all feeded primitives to a VCL Window. It is the currently used renderer
for all VCL editing output from the DrawingLayer.
*/
- class VclPixelProcessor2D : public VclProcessor2D
+ class VclPixelProcessor2D final : public VclProcessor2D
{
- private:
struct Impl;
std::unique_ptr<Impl> m_pImpl;
- protected:
/* the local processor for BasePrimitive2D-Implementation based primitives,
called from the common process()-implementation
*/
diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx
index f98136d1621a..6925994d8f61 100644
--- a/include/drawinglayer/animation/animationtiming.hxx
+++ b/include/drawinglayer/animation/animationtiming.hxx
@@ -50,9 +50,8 @@ namespace drawinglayer
};
- class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry
+ class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed final : public AnimationEntry
{
- protected:
double mfDuration;
double mfState;
@@ -68,9 +67,8 @@ namespace drawinglayer
};
- class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry
+ class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear final : public AnimationEntry
{
- protected:
double mfDuration;
double mfFrequency;
double mfStart;
@@ -112,9 +110,8 @@ namespace drawinglayer
};
- class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop : public AnimationEntryList
+ class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop final : public AnimationEntryList
{
- protected:
sal_uInt32 mnRepeat;
public:
diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
index 6203b58f3407..b46051be91bd 100644
--- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
@@ -37,16 +37,14 @@ namespace drawinglayer
primitive has no default buffering, it is necessary here to add a local
buffering mechanism for the decomposition
*/
- class DRAWINGLAYER_DLLPUBLIC HatchTexturePrimitive3D : public TexturePrimitive3D
+ class DRAWINGLAYER_DLLPUBLIC HatchTexturePrimitive3D final : public TexturePrimitive3D
{
- private:
/// the hatch definition
attribute::FillHatchAttribute maHatch;
/// the buffered decomposed hatch
Primitive3DContainer maBuffered3DDecomposition;
- protected:
/// helper: local decomposition
Primitive3DContainer impCreate3DDecomposition() const;
diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
index 76429400ee16..ed0732e48d70 100644
--- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
@@ -44,9 +44,8 @@ namespace drawinglayer
3D objects needed for the line tubes and the edge roundings
in full 3D.
*/
- class DRAWINGLAYER_DLLPUBLIC PolygonTubePrimitive3D : public PolygonHairlinePrimitive3D
+ class DRAWINGLAYER_DLLPUBLIC PolygonTubePrimitive3D final : public PolygonHairlinePrimitive3D
{
- private:
/// hold the last decomposition since it's expensive
Primitive3DContainer maLast3DDecomposition;
@@ -57,7 +56,6 @@ namespace drawinglayer
basegfx::B2DLineJoin maLineJoin;
css::drawing::LineCap maLineCap;
- protected:
/** access methods to maLast3DDecomposition. The usage of this methods may allow
later thread-safe stuff to be added if needed. Only to be used by getDecomposition()
implementations for buffering the last decomposition.
diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index fc7a9e9bd4ff..8a296b9a334f 100644
--- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -47,9 +47,8 @@ namespace drawinglayer
};
/// class to hold one Slice3D
- class DRAWINGLAYER_DLLPUBLIC Slice3D
+ class DRAWINGLAYER_DLLPUBLIC Slice3D final
{
- protected:
basegfx::B3DPolyPolygon maPolyPolygon;
SliceType3D maSliceType;
diff --git a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx
index b9a43cf9c1ea..ff120847ae8b 100644
--- a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx
@@ -41,9 +41,8 @@ namespace drawinglayer
combined with the scene and camera definition to create the correct
projected shadow 2D-Polygons.
*/
- class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive3D : public GroupPrimitive3D
+ class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive3D final : public GroupPrimitive3D
{
- protected:
/// 2D shadow definition
basegfx::B2DHomMatrix maShadowTransform;
basegfx::BColor maShadowColor;
diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx
index 6cfe73613baf..ed7b6ac594e2 100644
--- a/include/drawinglayer/texture/texture.hxx
+++ b/include/drawinglayer/texture/texture.hxx
@@ -103,9 +103,8 @@ namespace drawinglayer
{
namespace texture
{
- class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear final : public GeoTexSvxGradient
{
- protected:
double mfUnitMinX;
double mfUnitWidth;
double mfUnitMaxY;
@@ -134,9 +133,8 @@ namespace drawinglayer
{
namespace texture
{
- class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial final : public GeoTexSvxGradient
{
- protected:
double mfUnitMinX;
double mfUnitWidth;
@@ -271,9 +269,8 @@ namespace drawinglayer
{
namespace texture
{
- class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch : public GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch final : public GeoTexSvx
{
- protected:
basegfx::B2DRange maOutputRange;
basegfx::B2DHomMatrix maTextureTransform;
basegfx::B2DHomMatrix maBackTextureTransform;
@@ -315,14 +312,12 @@ namespace drawinglayer
// given percentage value (offsetX has to be 0.0 <= offsetX <= 1.0).
// Accordingly to offsetY. If both are given, offsetX is preferred
// and offsetY is ignored.
- class DRAWINGLAYER_DLLPUBLIC GeoTexSvxTiled : public GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxTiled final : public GeoTexSvx
{
- protected:
basegfx::B2DRange maRange;
double mfOffsetX;
double mfOffsetY;
- private:
sal_Int32 iterateTiles(::std::vector< basegfx::B2DHomMatrix >* pMatrices) const;
public:
diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx
index 9d05122f373a..1c197473824a 100644
--- a/include/drawinglayer/texture/texture3d.hxx
+++ b/include/drawinglayer/texture/texture3d.hxx
@@ -33,9 +33,8 @@ namespace drawinglayer
{
namespace texture
{
- class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMono : public GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMono final : public GeoTexSvx
{
- protected:
basegfx::BColor maSingleColor;
double mfOpacity;
@@ -92,9 +91,8 @@ namespace drawinglayer
{
namespace texture
{
- class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmapExTiled : public GeoTexSvxBitmapEx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmapExTiled final : public GeoTexSvxBitmapEx
{
- protected:
double mfOffsetX;
double mfOffsetY;
@@ -121,9 +119,8 @@ namespace drawinglayer
{
namespace texture
{
- class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMultiHatch : public GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMultiHatch final : public GeoTexSvx
{
- protected:
basegfx::BColor maColor;
double mfLogicPixelSize;
GeoTexSvxHatch* mp0;
More information about the Libreoffice-commits
mailing list