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/transparencygroupaction.cxx | |
| parent | 2c91cb08d65cd35fa8ef6eaca3677aa82fb58cbe (diff) | |
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/transparencygroupaction.cxx')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
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 |