diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-04 06:55:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-04 08:27:23 +0300 |
| commit | 66aed6f470c795f172fa85b89ae9d25c76eb38bd (patch) | |
| tree | 533a5f471583737dc068e365d57cec7c5a5e33ab /cppcanvas/source/mtfrenderer/bitmapaction.cxx | |
| parent | better drawing support for borders of different width, fdo#33634 (diff) | |
| download | core-66aed6f470c795f172fa85b89ae9d25c76eb38bd.tar.gz core-66aed6f470c795f172fa85b89ae9d25c76eb38bd.zip | |
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.
Diffstat (limited to 'cppcanvas/source/mtfrenderer/bitmapaction.cxx')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/bitmapaction.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
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 |