diff options
Diffstat (limited to 'include/drawinglayer')
76 files changed, 271 insertions, 271 deletions
diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx index 00cc2543380b..2d07106843fc 100644 --- a/include/drawinglayer/animation/animationtiming.hxx +++ b/include/drawinglayer/animation/animationtiming.hxx @@ -60,12 +60,12 @@ namespace drawinglayer public: AnimationEntryFixed(double fDuration, double fState = 0.0); virtual ~AnimationEntryFixed(); - virtual AnimationEntry* clone() const SAL_OVERRIDE; + virtual AnimationEntry* clone() const override; - virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; - virtual double getDuration() const SAL_OVERRIDE; - virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; - virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; + virtual bool operator==(const AnimationEntry& rCandidate) const override; + virtual double getDuration() const override; + virtual double getStateAtTime(double fTime) const override; + virtual double getNextEventTime(double fTime) const override; }; @@ -81,12 +81,12 @@ namespace drawinglayer public: AnimationEntryLinear(double fDuration, double fFrequency = 250.0, double fStart = 0.0, double fStop = 1.0); virtual ~AnimationEntryLinear(); - virtual AnimationEntry* clone() const SAL_OVERRIDE; + virtual AnimationEntry* clone() const override; - virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; - virtual double getDuration() const SAL_OVERRIDE; - virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; - virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; + virtual bool operator==(const AnimationEntry& rCandidate) const override; + virtual double getDuration() const override; + virtual double getStateAtTime(double fTime) const override; + virtual double getNextEventTime(double fTime) const override; }; @@ -103,13 +103,13 @@ namespace drawinglayer public: AnimationEntryList(); virtual ~AnimationEntryList(); - virtual AnimationEntry* clone() const SAL_OVERRIDE; + virtual AnimationEntry* clone() const override; - virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; + virtual bool operator==(const AnimationEntry& rCandidate) const override; void append(const AnimationEntry& rCandidate); - virtual double getDuration() const SAL_OVERRIDE; - virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; - virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; + virtual double getDuration() const override; + virtual double getStateAtTime(double fTime) const override; + virtual double getNextEventTime(double fTime) const override; }; @@ -122,12 +122,12 @@ namespace drawinglayer public: AnimationEntryLoop(sal_uInt32 nRepeat = 0xffffffff); virtual ~AnimationEntryLoop(); - virtual AnimationEntry* clone() const SAL_OVERRIDE; + virtual AnimationEntry* clone() const override; - virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; - virtual double getDuration() const SAL_OVERRIDE; - virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; - virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; + virtual bool operator==(const AnimationEntry& rCandidate) const override; + virtual double getDuration() const override; + virtual double getStateAtTime(double fTime) const override; + virtual double getNextEventTime(double fTime) const override; }; diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 3c8155b9f391..9e13a8e60584 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -92,7 +92,7 @@ namespace drawinglayer depends on the point in time, so the default implementation is not useful here, it needs to be handled locally */ - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -120,7 +120,7 @@ namespace drawinglayer bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -157,7 +157,7 @@ namespace drawinglayer bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index def2b431c48d..e58d31c5fbdc 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -55,7 +55,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -68,16 +68,16 @@ namespace drawinglayer double getTransparency() const { return mfTransparency; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() /// Override standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 1de6c828feda..a9f03c8437b3 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -36,7 +36,7 @@ */ #define DeclPrimitive2DIDBlock() \ - virtual sal_uInt32 getPrimitive2DID() const SAL_OVERRIDE; + virtual sal_uInt32 getPrimitive2DID() const 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 ) SAL_OVERRIDE; + 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 ) 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 ) SAL_OVERRIDE; + 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 ) override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -250,7 +250,7 @@ namespace drawinglayer overridden 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 SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index ada3de9aadb3..df0e60d0709f 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index f59cf4816a71..8bc905348891 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -134,7 +134,7 @@ namespace drawinglayer double getPatternScale() const { return mfPatternScale; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx index 6861b352a2cc..62bd9813698a 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 SAL_OVERRIDE; + const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -50,7 +50,7 @@ namespace drawinglayer double fPatternScale = 1.0 ); /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index 5bcbf8b9f845..5134e30b100d 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx index 1a814d3eb965..ec2d46929db0 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index aa9a51084510..61657dc77cae 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index 20fb1faa6899..c080c633b86f 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -103,10 +103,10 @@ namespace drawinglayer const DiscreteShadow& getDiscreteShadow() const { return maDiscreteShadow; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 354705577f0b..72ada3d42488 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index d8a711f1229d..af740af1c083 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -61,10 +61,10 @@ namespace drawinglayer const GDIMetaFile& getMetaFile() const { return maMetaFile; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 1bf2260327b0..92104cd9a172 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -83,7 +83,7 @@ namespace drawinglayer Primitive2DSequence createFill(bool bOverlapping) const; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -101,10 +101,10 @@ namespace drawinglayer const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index dedd26fe7c4e..22acf73e9e65 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 51240df45c98..76916853e328 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -87,13 +87,13 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index 8546c6ba84c3..20c3da3e7ca6 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor(s) @@ -79,10 +79,10 @@ namespace drawinglayer const GraphicAttr& getGraphicAttr() const { return maGraphicAttr; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index de2f8de14613..83067a98bd01 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -98,16 +98,16 @@ namespace drawinglayer const BitmapEx& getCrossMarker() const { return maCrossMarker; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get 2d range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index d44e84eefc38..0cb63500e769 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 SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// local decomposition. Implementation will just return children - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index d460a418bb25..dc3fb972dc8a 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -96,13 +96,13 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index 628ceb43d4f5..ed2cfa27aee2 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 SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// local decomposition. Implementation will return empty Primitive2DSequence - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 92dab7cb070a..966cc86e935a 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -70,10 +70,10 @@ namespace drawinglayer const BitmapEx& getMarker() const { return maMarker; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 1e74b8228a7e..042097e3eb25 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index a160ba2dd1c4..4d4cce6fcc27 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -79,10 +79,10 @@ namespace drawinglayer sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index 679f681fe74e..adb14339de21 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index cfb7e1a5c07c..d5f84b04af8c 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 8cf76f6aad25..d9c9a92a4f6e 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -56,7 +56,7 @@ namespace drawinglayer const OUString& getDesc() const { return maDesc; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index e4e66be83963..8eadd93da7cd 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -86,10 +86,10 @@ namespace drawinglayer bool getKeepAspectRatio() const { return mbKeepAspectRatio; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// own getB2DRange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index 9776978c6fae..e9d8b388cbf0 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index 2407a7f883c4..46a2e39d806d 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index cc08349873b0..4d8d05a4923d 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -110,7 +110,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -127,13 +127,13 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -168,7 +168,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -220,7 +220,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -243,10 +243,10 @@ namespace drawinglayer double getWaveHeight() const { return mfWaveHeight; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -276,7 +276,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index f01357d14f43..7698f1359e81 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -107,7 +107,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -124,10 +124,10 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -162,7 +162,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -263,7 +263,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -281,7 +281,7 @@ namespace drawinglayer const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -319,7 +319,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -340,7 +340,7 @@ namespace drawinglayer const attribute::FillHatchAttribute& getFillHatch() const { return maFillHatch; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -375,7 +375,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -393,7 +393,7 @@ namespace drawinglayer const attribute::FillGraphicAttribute& getFillGraphic() const { return maFillGraphic; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -435,7 +435,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -454,10 +454,10 @@ namespace drawinglayer bool getFill() const { return mbFill; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index 993cab84caa0..26e60d10d071 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer double getDiscreteUnit() const { return mfDiscreteUnit; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -105,7 +105,7 @@ namespace drawinglayer const basegfx::B2DRange& getViewport() const { return maViewport; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -144,7 +144,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getViewTransformation() const { return maViewTransformation; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -187,7 +187,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index c5a9cdebf540..9c3fb8e9d846 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() /// get local decomposition. Override since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index c7b9424a0219..d4bcc7189710 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index be827f4c4843..85fbcc3c7ca9 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 SAL_OVERRIDE; - virtual void checkPreconditions() SAL_OVERRIDE; + sal_Int32 nOffset) const override; + virtual void checkPreconditions() override; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -262,11 +262,11 @@ namespace drawinglayer Primitive2DVector& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, - sal_Int32 nOffset) const SAL_OVERRIDE; - virtual void checkPreconditions() SAL_OVERRIDE; + sal_Int32 nOffset) const override; + virtual void checkPreconditions() override; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -287,10 +287,10 @@ namespace drawinglayer bool isFocalSet() const { return mbFocalSet; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -321,7 +321,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -336,7 +336,7 @@ namespace drawinglayer double getOffsetB() const { return mfOffsetB; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -383,7 +383,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index d996fb9b77e4..f557142369a0 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -75,7 +75,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -124,10 +124,10 @@ namespace drawinglayer bool decoratedIsNeeded() const; /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx index 31ff15f76e24..c7c1d24fba97 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// construcor @@ -82,19 +82,19 @@ namespace drawinglayer TextEffectStyle2D getTextEffectStyle2D() const { return meTextEffectStyle2D; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const 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 its own basegfx::B2DRange */ - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index e77287a84f7f..a21e36490f50 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx index 48f41978382f..b465c008513c 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 311ec94e71ae..80c2bc7fe923 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -136,7 +136,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -173,10 +173,10 @@ namespace drawinglayer long getWidthToFill() const { return mnWidthToFill; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 82b455a54123..627a2b34bee0 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 SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -119,7 +119,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -137,7 +137,7 @@ namespace drawinglayer TextStrikeout getTextStrikeout() const { return meTextStrikeout; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index 7656bddb8601..c0f7cf89fa21 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 76aaea6d761e..af932ed07354 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 95db70985f4a..2b23527cda56 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// own getB2DRange implementation to include transparent geometries to BoundRect calculations - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index ccb4a950f00c..5fc00a5d53d9 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -69,10 +69,10 @@ namespace drawinglayer WallpaperStyle getWallpaperStyle() const { return meWallpaperStyle; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index 320a3576a55c..aa530dae845d 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 SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const 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 SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 3ec831324fd8..48454ba8f5db 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -36,7 +36,7 @@ */ #define DeclPrimitive3DIDBlock() \ - virtual sal_uInt32 getPrimitive3DID() const SAL_OVERRIDE; + virtual sal_uInt32 getPrimitive3DID() const override; #define ImplPrimitive3DIDBlock(TheClass, TheID) \ sal_uInt32 TheClass::getPrimitive3DID() const { return TheID; } @@ -117,12 +117,12 @@ namespace drawinglayer /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It will get the ViewInformation from the ViewParameters for that purpose */ - virtual Primitive3DSequence 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; + virtual Primitive3DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** the getRange default implementation will use getDecomposition to create the range information from merging getRange results from the single local decomposition primitives. */ - virtual ::com::sun::star::geometry::RealRectangle3D 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; + virtual ::com::sun::star::geometry::RealRectangle3D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -171,7 +171,7 @@ namespace drawinglayer overridden and the ViewInformation for the last decomposition needs to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx index 0fae848618b7..1637a0c85ff1 100644 --- a/include/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -63,10 +63,10 @@ namespace drawinglayer Primitive3DSequence getChildren() const { return maChildren; } /// compare operator - virtual bool operator==( const BasePrimitive3D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive3D& rPrimitive ) const override; /// local decomposition. Implementation will just return children - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index 33055b5ae6b5..6be6c2eeae0e 100644 --- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -68,10 +68,10 @@ namespace drawinglayer const attribute::FillHatchAttribute& getHatch() const { return maHatch; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// local decomposition. - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index f9f6db3dd01a..afd1b218edde 100644 --- a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -48,10 +48,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::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// The default implementation returns an empty sequence - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; // provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index 5c0eecea7355..9e1235dc7c97 100644 --- a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer const basegfx::BColorModifierSharedPtr& getColorModifier() const { return maColorModifier; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx index a258eb1edcab..2201b67b1563 100644 --- a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -62,10 +62,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() @@ -99,7 +99,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; public: /// constructor @@ -114,7 +114,7 @@ namespace drawinglayer const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index cfd092c1d8ae..ac9ad6cf0293 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -88,12 +88,12 @@ namespace drawinglayer com::sun::star::drawing::LineCap getLineCap() const { return maLineCap; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /** local decomposition. Use own buffering since we are not derived from BufferedDecompositionPrimitive3D */ - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 41337ac3a564..7d3476a3553d 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -65,10 +65,10 @@ namespace drawinglayer bool getDoubleSided() const { return mbDoubleSided; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index 01064d958a7f..7d94dcb62c5e 100644 --- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -40,7 +40,7 @@ namespace drawinglayer { protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; public: /// constructor @@ -51,10 +51,10 @@ namespace drawinglayer const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 62457b4f074f..3f3dfec55443 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -74,7 +74,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; public: /// constructor @@ -108,13 +108,13 @@ namespace drawinglayer bool getCloseBack() const { return mbCloseBack; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// Overridden to allow for reduced line mode to decide if to buffer decomposition or not - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 6b4c9228a8b9..785022928dbf 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -76,7 +76,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; public: /// constructor @@ -114,13 +114,13 @@ namespace drawinglayer bool getCloseBack() const { return mbCloseBack; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// Overridden to allow for reduced line mode to decide if to buffer decomposition or not - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 906ec31da96b..8d2d1aab2aef 100644 --- a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; public: /// constructor @@ -63,10 +63,10 @@ namespace drawinglayer const basegfx::B3DPolyPolygon& getPolyPolygon3D() const { return maPolyPolygon3D; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx index c8a2d329a0f3..460fd458591d 100644 --- a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -76,7 +76,7 @@ namespace drawinglayer const attribute::Sdr3DObjectAttribute getSdr3DObjectAttribute() const { return maSdr3DObjectAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index 653fd37f7074..d33b5960bf9f 100644 --- a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; public: /// constructor @@ -62,10 +62,10 @@ namespace drawinglayer sal_uInt32 getVerticalSegments() const { return mnVerticalSegments; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx index 1e58bbbde5b6..5b10da20bca4 100644 --- a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -69,7 +69,7 @@ namespace drawinglayer bool getShadow3D() const { return mbShadow3D; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx index 8ee487e6b7b9..242bb55a43ef 100644 --- a/include/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -67,7 +67,7 @@ namespace drawinglayer bool getFilter() const { return mbFilter; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -100,13 +100,13 @@ namespace drawinglayer double getTransparence() const { return mfTransparence; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// own getB3DRange implementation to include transparent geometries to BoundRect calculations - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// local decomposition. - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() @@ -145,7 +145,7 @@ namespace drawinglayer const attribute::FillGradientAttribute& getGradient() const { return maGradient; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// provide unique ID DeclPrimitive3DIDBlock() @@ -184,7 +184,7 @@ namespace drawinglayer const attribute::FillGraphicAttribute& getFillGraphicAttribute() const { return maFillGraphicAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// provide unique ID DeclPrimitive3DIDBlock() @@ -215,7 +215,7 @@ namespace drawinglayer const basegfx::B2DVector& rTextureSize); /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx index 2751f03b7eff..35bb4ceaa60e 100644 --- a/include/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -56,10 +56,10 @@ namespace drawinglayer const basegfx::B3DHomMatrix& getTransformation() const { return maTransformation; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx index 7fcf6d332fa9..0bab96cd7ca9 100644 --- a/include/drawinglayer/processor2d/contourextractor2d.hxx +++ b/include/drawinglayer/processor2d/contourextractor2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer bool mbExtractFillOnly : 1; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) override; public: explicit ContourExtractor2D( diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx index b79187c0fcc5..96e9d9cabf8e 100644 --- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer bool mbTiledRendering; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) override; bool checkHairlineHitWithTolerance( const basegfx::B2DPolygon& rPolygon, double fDiscreteHitTolerance); diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx index e7d64e0d9c11..1afe0debd3a0 100644 --- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer bool mbInLineGeometry : 1; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) override; public: LineGeometryExtractor2D(const geometry::ViewInformation2D& rViewInformation); diff --git a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx index 9e117795816d..32d204fb8a1e 100644 --- a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx +++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx @@ -40,7 +40,7 @@ namespace drawinglayer const primitive2d::ObjectInfoPrimitive2D* mpFound; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) override; public: ObjectInfoPrimitiveExtractor2D(const geometry::ViewInformation2D& rViewInformation); diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 2cb798a39197..97982f75e70f 100644 --- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -79,7 +79,7 @@ namespace drawinglayer sal_uInt32 mnInText; // tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) override; public: explicit TextAsPolygonExtractor2D(const geometry::ViewInformation2D& rViewInformation); diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index 23cd58a8e678..bc4279f8ede7 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -62,7 +62,7 @@ namespace drawinglayer /* as tooling, the process() implementation takes over API handling and calls this virtual render method when the primitive implementation is BasePrimitive3D-based. */ - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) SAL_OVERRIDE; + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) override; public: CutFindProcessor(const geometry::ViewInformation3D& rViewInformation, diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index 6ccc3224c78a..a40e129d6bda 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -121,7 +121,7 @@ namespace drawinglayer virtual void rasterconvertB3DPolyPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rFill) const = 0; // the processing method for a single, known primitive - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rBasePrimitive) SAL_OVERRIDE; + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rBasePrimitive) override; public: DefaultProcessor3D( diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx index a09d5e7f469e..d900139184cc 100644 --- a/include/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx @@ -55,7 +55,7 @@ namespace drawinglayer /* as tooling, the process() implementation takes over API handling and calls this virtual render method when the primitive implementation is BasePrimitive3D-based. */ - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) SAL_OVERRIDE; + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) override; public: Geometry2DExtractingProcessor( diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 12710b3f327a..8919f51f3729 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -85,7 +85,7 @@ namespace drawinglayer /* as tooling, the process() implementation takes over API handling and calls this virtual render method when the primitive implementation is BasePrimitive3D-based. */ - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) SAL_OVERRIDE; + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) override; public: Shadow3DExtractingProcessor( diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx index 5f6403081b73..8e3f6d4f3ac1 100644 --- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -76,8 +76,8 @@ namespace drawinglayer // rasterconversions for filled and non-filled polygons - virtual void rasterconvertB3DPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolygon& rHairline) const SAL_OVERRIDE; - virtual void rasterconvertB3DPolyPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rFill) const SAL_OVERRIDE; + virtual void rasterconvertB3DPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolygon& rHairline) const override; + virtual void rasterconvertB3DPolyPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rFill) const override; public: ZBufferProcessor3D( diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index f9ec11ff11a6..3f1d6d07adc0 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 SAL_OVERRIDE; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const override; // virtual base methods virtual void appendTransformationsAndColors( @@ -127,8 +127,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOuterColor) SAL_OVERRIDE; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + basegfx::BColor& rOuterColor) override; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -158,8 +158,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOuterColor) SAL_OVERRIDE; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + basegfx::BColor& rOuterColor) override; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -185,8 +185,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOuterColor) SAL_OVERRIDE; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + basegfx::BColor& rOuterColor) override; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -213,8 +213,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOuterColor) SAL_OVERRIDE; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + basegfx::BColor& rOuterColor) override; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -241,8 +241,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOuterColor) SAL_OVERRIDE; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + basegfx::BColor& rOuterColor) override; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -269,8 +269,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOuterColor) SAL_OVERRIDE; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + basegfx::BColor& rOuterColor) override; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -303,7 +303,7 @@ namespace drawinglayer virtual ~GeoTexSvxHatch(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const override; void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices); double getDistanceToHatch(const basegfx::B2DPoint& rUV) const; @@ -342,7 +342,7 @@ namespace drawinglayer virtual ~GeoTexSvxTiled(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const override; void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices); }; diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx index e92eb78a9c8c..adbc809262ac 100644 --- a/include/drawinglayer/texture/texture3d.hxx +++ b/include/drawinglayer/texture/texture3d.hxx @@ -45,9 +45,9 @@ namespace drawinglayer double fOpacity); // compare operator - 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; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const override; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -82,8 +82,8 @@ namespace drawinglayer const basegfx::B2DRange& rRange); virtual ~GeoTexSvxBitmapEx(); - 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; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -112,8 +112,8 @@ namespace drawinglayer double fOffsetX = 0.0, double fOffsetY = 0.0); - 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; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer @@ -140,8 +140,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 SAL_OVERRIDE; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; } // end of namespace texture } // end of namespace drawinglayer |