diff options
Diffstat (limited to 'include/drawinglayer/primitive2d')
47 files changed, 170 insertions, 170 deletions
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 371b07bbac2d..486434f26ef2 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -83,7 +83,7 @@ namespace drawinglayer bool isGraphicAnimation() const { return !isTextAnimation(); } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -91,7 +91,7 @@ namespace drawinglayer /** The getDecomposition is overloaded here since the decompose is dependent of the point in time, so the default implementation is nut useful here, it needs to be handled locally */ - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -119,7 +119,7 @@ namespace drawinglayer bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -156,7 +156,7 @@ namespace drawinglayer bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 3cffeaafb69e..2df84d4f5d4d 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -65,16 +65,16 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 74ba4034fc67..94280d46f1dc 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -36,7 +36,7 @@ */ #define DeclPrimitive2DIDBlock() \ - virtual sal_uInt32 getPrimitive2DID() const; + virtual sal_uInt32 getPrimitive2DID() const SAL_OVERRIDE; #define ImplPrimitive2DIDBlock(TheClass, TheID) \ sal_uInt32 TheClass::getPrimitive2DID() const { return TheID; } @@ -174,12 +174,12 @@ namespace drawinglayer /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It will construct a ViewInformation2D from the ViewParameters for that purpose */ - virtual Primitive2DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual Primitive2DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** The getRange implementation for UNO API will use getRange from this implementation. It will construct a ViewInformation2D from the ViewParameters for that purpose */ - virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -250,7 +250,7 @@ namespace drawinglayer overloaded and the ViewInformation2D for the last decomposition need to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index 922c479a638a..ada3de9aadb3 100644 --- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -62,10 +62,10 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 5650ee09cf0e..f59cf4816a71 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -95,7 +95,7 @@ namespace drawinglayer const geometry::ViewInformation2D& rViewInformation) const; /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -134,7 +134,7 @@ namespace drawinglayer double getPatternScale() const { return mfPatternScale; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx index aaa2095fb9d3..6861b352a2cc 100644 --- a/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx @@ -31,7 +31,7 @@ namespace drawinglayer protected: virtual basegfx::B2DPolyPolygon getClipPolygon( - const geometry::ViewInformation2D& rViewInformation) const; + const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -50,7 +50,7 @@ namespace drawinglayer double fPatternScale = 1.0 ); /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index e93a65bbf296..38a6d87b1f31 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -64,7 +64,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -92,16 +92,16 @@ namespace drawinglayer const com::sun::star::uno::Reference< com::sun::star::awt::XControl >& getXControl() const; /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx index 969bb86b8c5b..01c63499197a 100644 --- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx @@ -84,10 +84,10 @@ namespace drawinglayer double getCropBottom() const { return mfCropBottom; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 2cfcd9ad5870..aa9a51084510 100644 --- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -50,7 +50,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -63,7 +63,7 @@ namespace drawinglayer const basegfx::B2DPoint& getTopLeft() const { return maTopLeft; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index b7f94cd58fb5..20fb1faa6899 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -90,7 +90,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -103,10 +103,10 @@ namespace drawinglayer const DiscreteShadow& getDiscreteShadow() const { return maDiscreteShadow; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 55a5e44f22f6..354705577f0b 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -83,7 +83,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -104,10 +104,10 @@ namespace drawinglayer const basegfx::B3DRange& getScene3DRange() const { return maScene3DRange; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index 08b282730927..d8a711f1229d 100644 --- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -46,7 +46,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -61,10 +61,10 @@ namespace drawinglayer const GDIMetaFile& getMetaFile() const { return maMetaFile; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 690028b3b38a..515d1f60934d 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -79,7 +79,7 @@ namespace drawinglayer Primitive2DSequence createFill(bool bOverlapping) const; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -92,10 +92,10 @@ namespace drawinglayer const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index d5e6bb765a89..dedd26fe7c4e 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -56,7 +56,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -69,10 +69,10 @@ namespace drawinglayer const attribute::FillGraphicAttribute& getFillGraphic() const { return maFillGraphic; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 78454281ef51..9234cec15857 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -62,7 +62,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -77,13 +77,13 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index f87ab2441e43..1446412c0081 100644 --- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -61,7 +61,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor(s) @@ -80,10 +80,10 @@ namespace drawinglayer bool isTransparent() const; /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index 0ff6a44198bc..bf2976619e00 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -71,7 +71,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -98,16 +98,16 @@ namespace drawinglayer const BitmapEx& getCrossMarker() const { return maCrossMarker; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get 2d range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index a4b1680b36fe..d44e84eefc38 100644 --- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -77,10 +77,10 @@ namespace drawinglayer const Primitive2DSequence& getChildren() const { return maChildren; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// local decomposition. Implementation will just return children - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index 6e4b9afe56c5..9b101d946794 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -75,7 +75,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -96,13 +96,13 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index d9ad23dd937e..0da0052c70b3 100644 --- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -46,10 +46,10 @@ namespace drawinglayer // despite returning an empty decomposition since it's no visualisation data, // range calculation is intended to use hidden geometry, so // the local implementation will return the children's range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// local decomposition. Implementation will return empty Primitive2DSequence - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 1862b0ef89d5..92dab7cb070a 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -57,7 +57,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -70,10 +70,10 @@ namespace drawinglayer const BitmapEx& getMarker() const { return maMarker; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index ba988a6c974d..e2111c79b26a 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -61,10 +61,10 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& getMask() const { return maMask; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index 56b348437b29..9998633e2256 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -61,7 +61,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -79,10 +79,10 @@ namespace drawinglayer sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index 726b6b24f9bc..7b75a21a441a 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -64,7 +64,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor MetafilePrimitive2D( @@ -76,10 +76,10 @@ namespace drawinglayer const GDIMetaFile& getMetaFile() const { return maMetaFile; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index 761feb907b57..1f37fbcfc819 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer const basegfx::BColorModifierSharedPtr& getColorModifier() const { return maColorModifier; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 79f9213406b3..164cbd5d0c77 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer const OUString& getDesc() const { return maDesc; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/openglprimitive2d.hxx b/include/drawinglayer/primitive2d/openglprimitive2d.hxx index 832a657c46ef..386b6c4a362d 100644 --- a/include/drawinglayer/primitive2d/openglprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/openglprimitive2d.hxx @@ -24,7 +24,7 @@ public: const Point& getPos() const { return m_aPos; } - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index cbaff76db65c..4b39b204d833 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer protected: /// local decomposition. Implementation will just return children - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -86,10 +86,10 @@ namespace drawinglayer bool getKeepAspectRatio() const { return mbKeepAspectRatio; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// own getB2DRange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index b35c2d96262d..a22a891206a6 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -63,10 +63,10 @@ namespace drawinglayer const basegfx::B2DRange& getReferenceRange() const { return maReferenceRange; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index daccdc9bed2f..9b01e4278057 100644 --- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -65,10 +65,10 @@ namespace drawinglayer const basegfx::BColor& getRGBColor() const { return maRGBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index e92de81f7cbc..53d86fc477ab 100644 --- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -65,10 +65,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -110,7 +110,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -127,13 +127,13 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -168,7 +168,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -188,10 +188,10 @@ namespace drawinglayer const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -220,7 +220,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -243,10 +243,10 @@ namespace drawinglayer double getWaveHeight() const { return mfWaveHeight; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -276,7 +276,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -299,10 +299,10 @@ namespace drawinglayer const attribute::LineStartEndAttribute& getEnd() const { return maEnd; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 71163f44f149..972972727f91 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -57,7 +57,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -68,10 +68,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -107,7 +107,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -124,10 +124,10 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -162,7 +162,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -181,10 +181,10 @@ namespace drawinglayer const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -225,10 +225,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -260,7 +260,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -273,7 +273,7 @@ namespace drawinglayer const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -308,7 +308,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -323,7 +323,7 @@ namespace drawinglayer const attribute::FillHatchAttribute& getFillHatch() const { return maFillHatch; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -355,7 +355,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -368,7 +368,7 @@ namespace drawinglayer const attribute::FillGraphicAttribute& getFillGraphic() const { return maFillGraphic; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -410,7 +410,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -429,10 +429,10 @@ namespace drawinglayer bool getFill() const { return mbFill; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index 7e5cbbf03c4c..e592a956f8f8 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer double getDiscreteUnit() const { return mfDiscreteUnit; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -105,7 +105,7 @@ namespace drawinglayer const basegfx::B2DRange& getViewport() const { return maViewport; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -144,7 +144,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getViewTransformation() const { return maViewTransformation; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -187,7 +187,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index fb65285bc8ec..e0f6ca506aa5 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -100,7 +100,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// public helpers @@ -138,16 +138,16 @@ namespace drawinglayer const geometry::ViewInformation3D& getViewInformation3D() const { return maViewInformation3D; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index f8f0769cbabc..c7b9424a0219 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -67,13 +67,13 @@ namespace drawinglayer const basegfx::BColor& getShadowColor() const { return maShadowColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 84b6cec8266f..8c3b32a3d2d8 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -193,11 +193,11 @@ namespace drawinglayer Primitive2DVector& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, - sal_Int32 nOffset) const; - virtual void checkPreconditions(); + sal_Int32 nOffset) const SAL_OVERRIDE; + virtual void checkPreconditions() SAL_OVERRIDE; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -215,10 +215,10 @@ namespace drawinglayer const basegfx::B2DPoint& getEnd() const { return maEnd; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -262,11 +262,11 @@ namespace drawinglayer Primitive2DVector& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, - sal_Int32 nOffset) const; - virtual void checkPreconditions(); + sal_Int32 nOffset) const SAL_OVERRIDE; + virtual void checkPreconditions() SAL_OVERRIDE; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -287,10 +287,10 @@ namespace drawinglayer bool isFocalSet() const { return mbFocalSet; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -321,7 +321,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -336,7 +336,7 @@ namespace drawinglayer double getOffsetB() const { return mfOffsetB; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -383,7 +383,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -405,7 +405,7 @@ namespace drawinglayer basegfx::B2DVector getTranslateB() const { if(mpTranslate) return mpTranslate->maTranslateB; return basegfx::B2DVector(); } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index a14ce4ba788e..05f062142ba8 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -80,7 +80,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -128,10 +128,10 @@ namespace drawinglayer bool decoratedIsNeeded() const; /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx index abf001c7a3dd..1bef85e02bad 100644 --- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// construcor @@ -82,19 +82,19 @@ namespace drawinglayer TextEffectStyle2D getTextEffectStyle2D() const { return meTextEffectStyle2D; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /** own get range implementation to solve more effective. Content is by definition displaced by a fixed discrete unit, thus the contained geometry needs only once be asked for it's own basegfx::B2DRange */ - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index 2a64e3b74bbb..4553aa9a8094 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -168,7 +168,7 @@ namespace drawinglayer const OUString& getString() const { return maString; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx index 170c151119fc..48f41978382f 100644 --- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -69,7 +69,7 @@ namespace drawinglayer const basegfx::BColor& getLineColor() const { return maLineColor; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index db2087e8f51b..da5b665587b3 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -124,7 +124,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -159,10 +159,10 @@ namespace drawinglayer long getWidthToFill() const { return mnWidthToFill; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index bf1b5da11b42..82b455a54123 100644 --- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer const basegfx::BColor& getFontColor() const { return maFontColor; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -78,7 +78,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -96,7 +96,7 @@ namespace drawinglayer const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -119,7 +119,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -137,7 +137,7 @@ namespace drawinglayer TextStrikeout getTextStrikeout() const { return meTextStrikeout; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index 0f8f043b04b6..efc9fa318e7f 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -66,10 +66,10 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getTransformation() const { return maTransformation; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 7646bdcb4675..76aaea6d761e 100644 --- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -73,7 +73,7 @@ namespace drawinglayer const Primitive2DSequence& getTransparence() const { return maTransparence; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 7f86ee1a9b9f..95db70985f4a 100644 --- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -55,13 +55,13 @@ namespace drawinglayer double getTransparence() const { return mfTransparence; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// own getB2DRange implementation to include transparent geometries to BoundRect calculations - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index d528ffd91e2d..ccb4a950f00c 100644 --- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -69,10 +69,10 @@ namespace drawinglayer WallpaperStyle getWallpaperStyle() const { return meWallpaperStyle; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index 9410fb7f8d94..b3971108d558 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -60,7 +60,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -77,7 +77,7 @@ namespace drawinglayer const basegfx::BColor& getColor() const { return maColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() |