mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New try to sort out the overloaded virtual method weirdness

Browse Source 
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 86b99ab408.
This commit is contained in:
Tor Lillqvist
2012-04-04 06:55:01 +03:00
parent 2c91cb08d6
commit 66aed6f470
11 changed files with 93 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
View File

@@ -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;