diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /include/drawinglayer/texture | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
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 'include/drawinglayer/texture')
-rw-r--r-- | include/drawinglayer/texture/texture.hxx | 30 | ||||
-rw-r--r-- | include/drawinglayer/texture/texture3d.hxx | 18 |
2 files changed, 24 insertions, 24 deletions
diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 896685ce97e3..0fa666d19411 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -91,7 +91,7 @@ namespace drawinglayer virtual ~GeoTexSvxGradient(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; // virtual base methods virtual void appendTransformationsAndColors( @@ -125,8 +125,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -151,8 +151,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -178,8 +178,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -206,8 +206,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -234,8 +234,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -262,8 +262,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -291,7 +291,7 @@ namespace drawinglayer virtual ~GeoTexSvxHatch(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices); double getDistanceToHatch(const basegfx::B2DPoint& rUV) const; @@ -330,7 +330,7 @@ namespace drawinglayer virtual ~GeoTexSvxTiled(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices); }; diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx index ec5925ed46ca..2068218d5354 100644 --- a/include/drawinglayer/texture/texture3d.hxx +++ b/include/drawinglayer/texture/texture3d.hxx @@ -50,9 +50,9 @@ namespace drawinglayer double fOpacity); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -89,8 +89,8 @@ namespace drawinglayer const basegfx::B2DRange& rRange); virtual ~GeoTexSvxBitmapEx(); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -121,8 +121,8 @@ namespace drawinglayer double fOffsetX = 0.0, double fOffsetY = 0.0); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -151,8 +151,8 @@ namespace drawinglayer public: GeoTexSvxMultiHatch(const primitive3d::HatchTexturePrimitive3D& rPrimitive, double fLogicPixelSize); virtual ~GeoTexSvxMultiHatch(); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; // dada access bool getFillBackground() const { return mbFillBackground; } |