summaryrefslogtreecommitdiff
path: root/cppcanvas/source/mtfrenderer
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /cppcanvas/source/mtfrenderer
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
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 157a3c4a3cf1..b233d43328e1 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const override;
uno::Reference< rendering::XBitmap > mxBitmap;
CanvasSharedPtr mpCanvas;
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 2b9a3645be93..fb69778b183b 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 SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
protected:
using Action::render;
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index a35eea36e2f5..abda71d5c2c7 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 SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
::basegfx::B2DPoint maStartPoint;
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index c73f7309662f..b8e37885c8da 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 SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
::basegfx::B2DPoint maPoint;
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index aab931606148..06bde882fb09 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const 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 d744dd3f368c..41a53c48f815 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -629,15 +629,15 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TODO(P2): This is potentially a real mass object
@@ -795,19 +795,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
/// Interface TextRenderer
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const override;
// TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction),
@@ -1025,15 +1025,15 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TODO(P2): This is potentially a real mass object
@@ -1215,19 +1215,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const override;
// TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction),
@@ -1379,7 +1379,7 @@ namespace cppcanvas
}
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const override
{
mrCanvas->fillPolyPolygon( mrLinePolygon,
mrViewState,
@@ -1553,19 +1553,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const 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 35fb98b11374..f516ee8ff419 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -97,15 +97,15 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
MtfAutoPtr mpGroupMtf;
generated by cgit (git 2.34.1) at 2024-07-11 21:47:04 +0000