From 66aed6f470c795f172fa85b89ae9d25c76eb38bd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 4 Apr 2012 06:55:01 +0300 Subject: New try to sort out the overloaded virtual method weirdness Revert "Clang WaE: -Woverloaded-virtual weirdness, this seems to help" as that broke tinderboxes. Try another way instead, renaming two versions of the overloaded render() method, so that there is no longer any overloading. Compiles -Werror-clean with Clang, hopefully no problem with other compilers either. This reverts commit 86b99ab408c7235604a1a02d7bc531fe5d5f97f6. --- cppcanvas/source/inc/action.hxx | 4 +- cppcanvas/source/mtfrenderer/bitmapaction.cxx | 20 ++++---- .../source/mtfrenderer/cachedprimitivebase.cxx | 4 +- .../source/mtfrenderer/cachedprimitivebase.hxx | 4 +- cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 +- cppcanvas/source/mtfrenderer/lineaction.cxx | 8 +-- cppcanvas/source/mtfrenderer/pointaction.cxx | 8 +-- cppcanvas/source/mtfrenderer/polypolyaction.cxx | 60 ++++++++++------------ .../source/mtfrenderer/rendergraphicaction.cxx | 20 ++++---- cppcanvas/source/mtfrenderer/textaction.cxx | 50 +++++++++--------- .../source/mtfrenderer/transparencygroupaction.cxx | 14 ++--- 11 files changed, 93 insertions(+), 103 deletions(-) (limited to 'cppcanvas') diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx index 971cfcb4609f..c961f82a900c 100644 --- a/cppcanvas/source/inc/action.hxx +++ b/cppcanvas/source/inc/action.hxx @@ -114,8 +114,8 @@ namespace cppcanvas specified subset is invalid for this action, or if rendering failed for other reasons, false is returned. */ - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const = 0; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const = 0; /** Query bounds of this action on the associated canvas diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index 39f240acf9e6..83e7a0aac296 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -60,8 +60,6 @@ namespace cppcanvas class BitmapAction : public CachedPrimitiveBase { public: - using CachedPrimitiveBase::render; - BitmapAction( const ::BitmapEx&, const ::basegfx::B2DPoint& rDstPoint, const CanvasSharedPtr&, @@ -72,8 +70,8 @@ namespace cppcanvas const CanvasSharedPtr&, const OutDevState& ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -83,8 +81,8 @@ namespace cppcanvas private: using Action::render; - virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const; uno::Reference< rendering::XBitmap > mxBitmap; CanvasSharedPtr mpCanvas; @@ -152,10 +150,10 @@ namespace cppcanvas NULL ); } - bool BitmapAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const + bool BitmapAction::renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::BitmapAction::render()" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::BitmapAction::renderPrimitive()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::BitmapAction: 0x%X", this ); rendering::RenderState aLocalState( maState ); @@ -168,8 +166,8 @@ namespace cppcanvas return true; } - bool BitmapAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool BitmapAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { // bitmap only contains a single action, fail if subset // requests different range diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx index e2448f66161a..19e8badfbec3 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx @@ -85,8 +85,8 @@ namespace cppcanvas maLastTransformation = aTotalTransform; // delegate rendering to derived classes - return render( mxCachedPrimitive, - rTransformation ); + return renderPrimitive( mxCachedPrimitive, + rTransformation ); } } } diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx index 4e72caedcfc5..2b105a48cc93 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx @@ -79,11 +79,11 @@ namespace cppcanvas protected: using Action::render; - virtual bool render( ::com::sun::star::uno::Reference< + private: + virtual bool renderPrimitive( ::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/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 9413c9ea3e36..c23ae8525b32 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2755,8 +2755,8 @@ namespace cppcanvas { // ANDing the result. We want to fail if at least // one action failed. - mbRet &= rAction.mpAction->render( maTransformation, - rSubset ); + mbRet &= rAction.mpAction->renderSubset( maTransformation, + rSubset ); } private: diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx index 47032d060a5f..f27eab0706b2 100644 --- a/cppcanvas/source/mtfrenderer/lineaction.cxx +++ b/cppcanvas/source/mtfrenderer/lineaction.cxx @@ -65,8 +65,8 @@ namespace cppcanvas const OutDevState& ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -110,8 +110,8 @@ namespace cppcanvas return true; } - bool LineAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool LineAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { // line only contains a single action, fail if subset // requests different range diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx index 1ac22a01ca76..5f4fec511bdf 100644 --- a/cppcanvas/source/mtfrenderer/pointaction.cxx +++ b/cppcanvas/source/mtfrenderer/pointaction.cxx @@ -66,8 +66,8 @@ namespace cppcanvas const ::Color& ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -125,8 +125,8 @@ namespace cppcanvas return true; } - bool PointAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool PointAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { // point only contains a single action, fail if subset // requests different range diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx index 2ff531635f90..9f480f5acfc7 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx @@ -61,8 +61,6 @@ namespace cppcanvas class PolyPolyAction : public CachedPrimitiveBase { public: - using CachedPrimitiveBase::render; - PolyPolyAction( const ::basegfx::B2DPolyPolygon&, const CanvasSharedPtr&, const OutDevState&, @@ -75,8 +73,8 @@ namespace cppcanvas bool bStroke, int nTransparency ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -86,8 +84,8 @@ namespace cppcanvas private: using Action::render; - virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const; const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly; const ::basegfx::B2DRange maBounds; @@ -160,10 +158,10 @@ namespace cppcanvas } } - bool PolyPolyAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const + bool PolyPolyAction::renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::PolyPolyAction::render()" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::PolyPolyAction::renderPrimitive()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::PolyPolyAction: 0x%X", this ); rendering::RenderState aLocalState( maState ); @@ -193,8 +191,8 @@ namespace cppcanvas return true; } - bool PolyPolyAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool PolyPolyAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { // TODO(F1): Split up poly-polygon into polygons, or even // line segments, when subsets are requested. @@ -247,15 +245,13 @@ namespace cppcanvas class TexturedPolyPolyAction : public CachedPrimitiveBase { public: - using CachedPrimitiveBase::render; - TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly, const CanvasSharedPtr& rCanvas, const OutDevState& rState, const rendering::Texture& rTexture ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -265,8 +261,8 @@ namespace cppcanvas private: using Action::render; - virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const; const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly; const ::basegfx::B2DRectangle maBounds; @@ -291,10 +287,10 @@ namespace cppcanvas tools::initRenderState(maState,rState); } - bool TexturedPolyPolyAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const + bool TexturedPolyPolyAction::renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::PolyPolyAction::render()" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::PolyPolyAction::renderPrimitive()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::PolyPolyAction: 0x%X", this ); rendering::RenderState aLocalState( maState ); @@ -310,8 +306,8 @@ namespace cppcanvas return true; } - bool TexturedPolyPolyAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool TexturedPolyPolyAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { // TODO(F1): Split up poly-polygon into polygons, or even // line segments, when subsets are requested. @@ -363,15 +359,13 @@ namespace cppcanvas class StrokedPolyPolyAction : public CachedPrimitiveBase { public: - using CachedPrimitiveBase::render; - StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly, const CanvasSharedPtr& rCanvas, const OutDevState& rState, const rendering::StrokeAttributes& rStrokeAttributes ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -381,8 +375,8 @@ namespace cppcanvas private: using Action::render; - virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const; const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly; const ::basegfx::B2DRectangle maBounds; @@ -406,10 +400,10 @@ namespace cppcanvas maState.DeviceColor = rState.lineColor; } - bool StrokedPolyPolyAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const + bool StrokedPolyPolyAction::renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::PolyPolyAction::render()" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::PolyPolyAction::renderPrimitive()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::PolyPolyAction: 0x%X", this ); rendering::RenderState aLocalState( maState ); @@ -422,8 +416,8 @@ namespace cppcanvas return true; } - bool StrokedPolyPolyAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool StrokedPolyPolyAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { // TODO(F1): Split up poly-polygon into polygons, or even // line segments, when subsets are requested. diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx index 237f781baadc..6ef35869529a 100644 --- a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx +++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx @@ -60,16 +60,14 @@ namespace cppcanvas class RenderGraphicAction : public CachedPrimitiveBase { public: - using CachedPrimitiveBase::render; - RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic, const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DVector& rDstSize, const CanvasSharedPtr&, const OutDevState& ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -79,8 +77,8 @@ namespace cppcanvas private: using Action::render; - virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const; ::vcl::RenderGraphic maRenderGraphic; uno::Reference< rendering::XBitmap > mxBitmap; @@ -119,10 +117,10 @@ namespace cppcanvas } } - bool RenderGraphicAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const + bool RenderGraphicAction::renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, + const ::basegfx::B2DHomMatrix& rTransformation ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::RenderGraphicAction::render()" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::RenderGraphicAction::renderPrimitive()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::RenderGraphicAction: 0x%X", this ); if( mxBitmap.is() ) @@ -138,8 +136,8 @@ namespace cppcanvas return true; } - bool RenderGraphicAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool RenderGraphicAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { // rendergraphic only contains a single action, fail if subset // requests different range diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index d6da081d06e1..13b283760522 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -644,8 +644,8 @@ namespace cppcanvas const ::basegfx::B2DHomMatrix& rTextTransform ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -723,10 +723,10 @@ namespace cppcanvas return true; } - bool TextAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& /*rSubset*/ ) const + bool TextAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& /*rSubset*/ ) const { - OSL_FAIL( "TextAction::render(): Subset not supported by this object" ); + OSL_FAIL( "TextAction::renderSubset(): Subset not supported by this object" ); // TODO(P1): Retrieve necessary font metric info for // TextAction from XCanvas. Currently, the @@ -810,8 +810,8 @@ namespace cppcanvas const ::basegfx::B2DHomMatrix& rTextTransform ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -959,10 +959,10 @@ namespace cppcanvas maReliefOffset ); } - bool EffectTextAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& /*rSubset*/ ) const + bool EffectTextAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& /*rSubset*/ ) const { - OSL_FAIL( "EffectTextAction::render(): Subset not supported by this object" ); + OSL_FAIL( "EffectTextAction::renderSubset(): Subset not supported by this object" ); // TODO(P1): Retrieve necessary font metric info for // TextAction from XCanvas. Currently, the @@ -1040,8 +1040,8 @@ namespace cppcanvas const ::basegfx::B2DHomMatrix& rTextTransform ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -1123,10 +1123,10 @@ namespace cppcanvas return true; } - bool TextArrayAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool TextArrayAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TextArrayAction::render( subset )" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TextArrayAction::renderSubset()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TextArrayAction: 0x%X", this ); rendering::RenderState aLocalState( maState ); @@ -1230,8 +1230,8 @@ namespace cppcanvas const ::basegfx::B2DHomMatrix& rTextTransform ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -1413,10 +1413,10 @@ namespace cppcanvas const rendering::ViewState& mrViewState; }; - bool EffectTextArrayAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool EffectTextArrayAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::EffectTextArrayAction::render( subset )" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::EffectTextArrayAction::renderSubset()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction: 0x%X", this ); rendering::RenderState aLocalState( maState ); @@ -1568,8 +1568,8 @@ namespace cppcanvas const ::basegfx::B2DHomMatrix& rTextTransform ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -1843,10 +1843,10 @@ namespace cppcanvas const rendering::ViewState& mrViewState; }; - bool OutlineAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool OutlineAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::OutlineAction::render( subset )" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::OutlineAction::renderSubset()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::OutlineAction: 0x%X", this ); if( rSubset.mnSubsetBegin == rSubset.mnSubsetEnd ) diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 076ff08d0832..ce295854649f 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -136,8 +136,8 @@ namespace cppcanvas const OutDevState& rState ); virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, @@ -255,10 +255,10 @@ namespace cppcanvas // into the direction of having a direct GDIMetaFile2XCanvas // renderer, and maybe a separate metafile XCanvas // implementation. - bool TransparencyGroupAction::render( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const + bool TransparencyGroupAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, + const Subset& rSubset ) const { - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TransparencyGroupAction::render()" ); + RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TransparencyGroupAction::renderSubset()" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TransparencyGroupAction: 0x%X", this ); // determine overall transformation matrix (render, view, @@ -288,7 +288,7 @@ namespace cppcanvas nRotate, nShearX ) ) { - OSL_FAIL( "TransparencyGroupAction::render(): non-decomposable transformation" ); + OSL_FAIL( "TransparencyGroupAction::renderSubset(): non-decomposable transformation" ); return false; } @@ -509,7 +509,7 @@ namespace cppcanvas aSubset.mnSubsetBegin = 0; aSubset.mnSubsetEnd = -1; - return render( rTransformation, aSubset ); + return renderSubset( rTransformation, aSubset ); } ::basegfx::B2DRange TransparencyGroupAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const -- cgit v1.2.3