diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-04 00:57:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-04 01:05:50 +0300 |
| commit | 86b99ab408c7235604a1a02d7bc531fe5d5f97f6 (patch) | |
| tree | 79cb65f57eb5cb159a79e595c53b7262dee6f0f9 /cppcanvas | |
| parent | 558d34fef7327317a42eb76320fd28cd361a3f9a (diff) | |
Clang WaE: -Woverloaded-virtual weirdness, this seems to help
Diffstat (limited to 'cppcanvas')
4 files changed, 11 insertions, 1 deletions
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index 2129ca528ab6..39f240acf9e6 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -60,6 +60,8 @@ namespace cppcanvas class BitmapAction : public CachedPrimitiveBase { public: + using CachedPrimitiveBase::render; + BitmapAction( const ::BitmapEx&, const ::basegfx::B2DPoint& rDstPoint, const CanvasSharedPtr&, diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx index 8cef77f1dd26..4e72caedcfc5 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx @@ -79,11 +79,11 @@ namespace cppcanvas protected: using Action::render; - private: virtual bool render( ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >& rCachedPrimitive, const ::basegfx::B2DHomMatrix& rTransformation ) const = 0; + private: CanvasSharedPtr mpCanvas; mutable ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > mxCachedPrimitive; diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx index dcfe33c29a93..2ff531635f90 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx @@ -61,6 +61,8 @@ namespace cppcanvas class PolyPolyAction : public CachedPrimitiveBase { public: + using CachedPrimitiveBase::render; + PolyPolyAction( const ::basegfx::B2DPolyPolygon&, const CanvasSharedPtr&, const OutDevState&, @@ -245,6 +247,8 @@ namespace cppcanvas class TexturedPolyPolyAction : public CachedPrimitiveBase { public: + using CachedPrimitiveBase::render; + TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly, const CanvasSharedPtr& rCanvas, const OutDevState& rState, @@ -359,6 +363,8 @@ namespace cppcanvas class StrokedPolyPolyAction : public CachedPrimitiveBase { public: + using CachedPrimitiveBase::render; + StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly, const CanvasSharedPtr& rCanvas, const OutDevState& rState, diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx index f5ce0eeead49..237f781baadc 100644 --- a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx +++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx @@ -60,6 +60,8 @@ namespace cppcanvas class RenderGraphicAction : public CachedPrimitiveBase { public: + using CachedPrimitiveBase::render; + RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic, const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DVector& rDstSize, |