summaryrefslogtreecommitdiffstats
path: root/cppcanvas/source/mtfrenderer
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /cppcanvas/source/mtfrenderer
parentcp#1000044 DOC import: fProtEnabled means document is not totally read-only (diff)
downloadcore-70cc2b191b95fbc210bc1f0f6a7159f341894f0f.tar.gz
core-70cc2b191b95fbc210bc1f0f6a7159f341894f0f.zip
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'cppcanvas/source/mtfrenderer')
-rw-r--r--cppcanvas/source/mtfrenderer/bitmapaction.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/lineaction.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/pointaction.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/polypolyaction.cxx30
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx58
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.cxx10
7 files changed, 65 insertions, 65 deletions
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index d3b61fa1d4a4..14fea4effaec 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -61,18 +61,18 @@ namespace cppcanvas
const OutDevState& );
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
uno::Reference< rendering::XBitmap > mxBitmap;
CanvasSharedPtr mpCanvas;
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index e7b4248473eb..5a86f5af804d 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -65,7 +65,7 @@ namespace cppcanvas
bool bOnlyRedrawWithSameTransform );
virtual ~CachedPrimitiveBase() {}
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
protected:
using Action::render;
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index 6553f34657a1..b6d6ca7de2ad 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -54,15 +54,15 @@ namespace cppcanvas
const CanvasSharedPtr&,
const OutDevState& );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
::basegfx::B2DPoint maStartPoint;
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 3349e57996b5..6e6a048b4b81 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -55,15 +55,15 @@ namespace cppcanvas
const OutDevState&,
const ::Color& );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
// default: disabled copy/assignment
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index c86757847652..5aad2993db81 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -63,18 +63,18 @@ namespace cppcanvas
int nTransparency );
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly;
const ::basegfx::B2DRange maBounds;
@@ -240,18 +240,18 @@ namespace cppcanvas
const rendering::Texture& rTexture );
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly;
const ::basegfx::B2DRectangle maBounds;
@@ -354,18 +354,18 @@ namespace cppcanvas
const rendering::StrokeAttributes& rStrokeAttributes );
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly;
const ::basegfx::B2DRectangle maBounds;
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 2bab8aaa7629..f001f67b7bb3 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -631,15 +631,15 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
// TODO(P2): This is potentially a real mass object
@@ -797,19 +797,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
/// Interface TextRenderer
- virtual bool operator()( const rendering::RenderState& rRenderState ) const;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
// TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction),
@@ -1027,15 +1027,15 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
// TODO(P2): This is potentially a real mass object
@@ -1217,19 +1217,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
// TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction),
@@ -1381,7 +1381,7 @@ namespace cppcanvas
}
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE
{
mrCanvas->fillPolyPolygon( mrLinePolygon,
mrViewState,
@@ -1555,19 +1555,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
// TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction),
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 8254320de978..ee1281bb1cb1 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -95,15 +95,15 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const;
+ const Subset& rSubset ) const SAL_OVERRIDE;
- virtual sal_Int32 getActionCount() const;
+ virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
private:
MtfAutoPtr mpGroupMtf;
generated by cgit (git 2.34.1) at 2024-10-06 11:20:37 +0000