diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /svgio | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'svgio')
29 files changed, 80 insertions, 80 deletions
diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx index 23d780951ed0..e37145e4dddc 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx @@ -154,7 +154,7 @@ namespace svgio const OUString& rText); virtual ~SvgCharacterNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; void decomposeText(drawinglayer::primitive2d::Primitive2DSequence& rTarget, SvgTextPosition& rSvgTextPosition) const; void whiteSpaceHandling(); void addGap(); diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgio/svgreader/svgcirclenode.hxx index faccfaed78b0..6d411d7bca07 100644 --- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx +++ b/svgio/inc/svgio/svgreader/svgcirclenode.hxx @@ -45,9 +45,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgCircleNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// Cx content, set if found in current context const SvgNumber& getCx() const { return maCx; } diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgio/svgreader/svgclippathnode.hxx index 36586d8df95f..ab9a5c573093 100644 --- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx @@ -43,9 +43,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgClipPathNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// apply contained clipPath to given geometry #i124852# transform may be needed void apply( diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx index bbd71d33dc38..560dee3ef370 100644 --- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx +++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx @@ -49,14 +49,14 @@ namespace svgio virtual ~SvgDocHdl(); // Methods XDocumentHandler - virtual void SAL_CALL startDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; const SvgDocument& getSvgDocument() const { return maDocument; } }; diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgio/svgreader/svgellipsenode.hxx index 23c04eb278a9..82f267d0d55d 100644 --- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx +++ b/svgio/inc/svgio/svgreader/svgellipsenode.hxx @@ -46,9 +46,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgEllipseNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// Cx content, set if found in current context const SvgNumber& getCx() const { return maCx; } diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svgio/svgreader/svggnode.hxx index 86a835989460..e6211b4e93f9 100644 --- a/svgio/inc/svgio/svgreader/svggnode.hxx +++ b/svgio/inc/svgio/svgreader/svggnode.hxx @@ -43,9 +43,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgGNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// transform content const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; } diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svgio/svgreader/svggradientnode.hxx index 8c298482cd64..0b52be079e9d 100644 --- a/svgio/inc/svgio/svgreader/svggradientnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientnode.hxx @@ -68,8 +68,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgGradientNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// collect gradient stop entries void collectGradientEntries(drawinglayer::primitive2d::SvgGradientEntryVector& aVector) const; diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx index c32025757f5f..5bd60db1749b 100644 --- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx @@ -42,8 +42,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgGradientStopNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// offset content const SvgNumber getOffset() const { return maOffset; } diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgio/svgreader/svgimagenode.hxx index d5ce8c6d7a94..1a19c5711de0 100644 --- a/svgio/inc/svgio/svgreader/svgimagenode.hxx +++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx @@ -53,9 +53,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgImageNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// SvgAspectRatio content const SvgAspectRatio& getSvgAspectRatio() const { return maSvgAspectRatio; } diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svgio/svgreader/svglinenode.hxx index b7704b8a32f3..8c5c32fcea1c 100644 --- a/svgio/inc/svgio/svgreader/svglinenode.hxx +++ b/svgio/inc/svgio/svgreader/svglinenode.hxx @@ -46,9 +46,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgLineNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// X1 content, set if found in current context const SvgNumber& getX1() const { return maX1; } diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgio/svgreader/svgmarkernode.hxx index 6e3b4f732228..6f30f19f960e 100644 --- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx +++ b/svgio/inc/svgio/svgreader/svgmarkernode.hxx @@ -62,14 +62,14 @@ namespace svgio SvgNode* pParent); virtual ~SvgMarkerNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// get marker primitives buffered, uses decomposeSvgNode internally const drawinglayer::primitive2d::Primitive2DSequence& getMarkerPrimitives() const; /// InfoProvider support for % values - virtual const basegfx::B2DRange getCurrentViewPort() const SAL_OVERRIDE; + virtual const basegfx::B2DRange getCurrentViewPort() const override; /// viewBox content const basegfx::B2DRange* getViewBox() const { return mpViewBox; } diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgio/svgreader/svgmasknode.hxx index 897401fd9290..fff7c667f9dc 100644 --- a/svgio/inc/svgio/svgreader/svgmasknode.hxx +++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx @@ -48,9 +48,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgMaskNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// apply contained clipPath to given geometry #i124852# transform may be needed void apply( diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx index 34a1505b4c45..043add38cf0d 100644 --- a/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgnode.hxx @@ -156,9 +156,9 @@ namespace svgio const SvgNodeVector& getChildren() const { return maChildren; } /// InfoProvider support for %, em and ex values - virtual const basegfx::B2DRange getCurrentViewPort() const SAL_OVERRIDE; - virtual double getCurrentFontSizeInherited() const SAL_OVERRIDE; - virtual double getCurrentXHeightInherited() const SAL_OVERRIDE; + virtual const basegfx::B2DRange getCurrentViewPort() const override; + virtual double getCurrentFontSizeInherited() const override; + virtual double getCurrentXHeightInherited() const override; double getCurrentFontSize() const; double getCurrentXHeight() const; diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgio/svgreader/svgpathnode.hxx index 78e218bd9d14..978454c8ac7e 100644 --- a/svgio/inc/svgio/svgreader/svgpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpathnode.hxx @@ -46,9 +46,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgPathNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// path content, set if found in current context const basegfx::B2DPolyPolygon* getPath() const { return mpPolyPolygon; } diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgio/svgreader/svgpatternnode.hxx index 61a97765c5c4..368aeb82a669 100644 --- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpatternnode.hxx @@ -62,8 +62,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgPatternNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// global helpers void getValuesRelative(double& rfX, double& rfY, double& rfW, double& rfH, const basegfx::B2DRange& rGeoRange, SvgNode& rUser) const; @@ -72,7 +72,7 @@ namespace svgio const drawinglayer::primitive2d::Primitive2DSequence& getPatternPrimitives() const; /// InfoProvider support for % values - virtual const basegfx::B2DRange getCurrentViewPort() const SAL_OVERRIDE; + virtual const basegfx::B2DRange getCurrentViewPort() const override; /// viewBox content const basegfx::B2DRange* getViewBox() const; diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgio/svgreader/svgpolynode.hxx index 991a4078cf43..50c96d03070e 100644 --- a/svgio/inc/svgio/svgreader/svgpolynode.hxx +++ b/svgio/inc/svgio/svgreader/svgpolynode.hxx @@ -48,9 +48,9 @@ namespace svgio bool bIsPolyline); virtual ~SvgPolyNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// type read access bool isPolyline() const { return mbIsPolyline; } diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgio/svgreader/svgrectnode.hxx index 526cef06e31e..f3a70cfe8678 100644 --- a/svgio/inc/svgio/svgreader/svgrectnode.hxx +++ b/svgio/inc/svgio/svgreader/svgrectnode.hxx @@ -48,9 +48,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgRectNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// x content, set if found in current context const SvgNumber& getX() const { return maX; } diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx index d2f9e60f61b1..8ee7fceec3c2 100644 --- a/svgio/inc/svgio/svgreader/svgstylenode.hxx +++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx @@ -43,9 +43,9 @@ namespace svgio virtual ~SvgStyleNode(); /// #i125258# tell if this node is allowed to have a parent style (e.g. defs do not) - virtual bool supportsParentStyle() const SAL_OVERRIDE; + virtual bool supportsParentStyle() const override; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// CssStyleSheet add helpers void addCssStyleSheet(const OUString& aSelectors, const SvgStyleAttributes& rNewStyle); diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx index 0ad83bc07212..c4de23dd908d 100644 --- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx @@ -54,9 +54,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgSvgNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// Seeks width and height of viewport, which is current before the new viewport is set. // needed for percentage unit in x, y, width or height @@ -67,7 +67,7 @@ namespace svgio // The returned 'CurrentViewPort' is the viewport as it is set by this svg element // and as it is needed to resolve relative values in children // The method does not check for invalid width and height - virtual const basegfx::B2DRange getCurrentViewPort() const SAL_OVERRIDE; + virtual const basegfx::B2DRange getCurrentViewPort() const override; /// viewBox content const basegfx::B2DRange* getViewBox() const { return mpViewBox; } diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx index 8e6157cb39dc..91a6f405f699 100644 --- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx @@ -42,8 +42,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgSymbolNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// viewBox content void setViewBox(const basegfx::B2DRange* pViewBox = 0) { if(mpViewBox) delete mpViewBox; mpViewBox = 0; if(pViewBox) mpViewBox = new basegfx::B2DRange(*pViewBox); } diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgio/svgreader/svgtextnode.hxx index 6560efa15452..af8247672399 100644 --- a/svgio/inc/svgio/svgreader/svgtextnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextnode.hxx @@ -54,9 +54,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgTextNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// transform content, set if found in current context const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; } diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx index ce6a2a0fd41d..93ed9f82825e 100644 --- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx @@ -51,8 +51,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgTextPathNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; void decomposePathNode( const drawinglayer::primitive2d::Primitive2DSequence& rPathContent, drawinglayer::primitive2d::Primitive2DSequence& rTarget, diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgio/svgreader/svgtrefnode.hxx index 04173f28f9a2..2440e88bf267 100644 --- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtrefnode.hxx @@ -44,8 +44,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgTrefNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// access to referenced SvgTextNode const SvgTextNode* getReferencedSvgTextNode() const; diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgio/svgreader/svgtspannode.hxx index 2e552f438c00..53532c65663e 100644 --- a/svgio/inc/svgio/svgreader/svgtspannode.hxx +++ b/svgio/inc/svgio/svgreader/svgtspannode.hxx @@ -43,8 +43,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgTspanNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; /// access to SvgTextPositions const SvgTextPositions& getSvgTextPositions() const { return maSvgTextPositions; } diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgio/svgreader/svgusenode.hxx index fe6517afb14e..9501218e3ead 100644 --- a/svgio/inc/svgio/svgreader/svgusenode.hxx +++ b/svgio/inc/svgio/svgreader/svgusenode.hxx @@ -50,9 +50,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgUseNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const SAL_OVERRIDE; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const override; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; + virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const override; /// transform content const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; } diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index e756a1a89156..2027ab704f67 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -41,8 +41,8 @@ class Test : public test::BootstrapFixture, public XmlTestTools css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > parseSvg(const char* aSource); public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(testStyles); diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 411518bde006..618943716a4b 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -163,7 +163,7 @@ namespace svgio protected: /// allow user callback to allow changes to the new TextTransformation. Default /// does nothing. - virtual bool allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength) SAL_OVERRIDE; + virtual bool allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength) override; public: localTextBreakupHelper( diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index cc2a576c7379..a645126e954e 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -51,7 +51,7 @@ namespace svgio protected: /// allow user callback to allow changes to the new TextTransformation. Default /// does nothing. - virtual bool allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength) SAL_OVERRIDE; + virtual bool allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength) override; void freeB2DCubicBezierHelper(); basegfx::B2DCubicBezierHelper* getB2DCubicBezierHelper(); diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index ce2e0a81d49e..7c6141308294 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -53,12 +53,12 @@ namespace svgio // XSvgParser virtual uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > SAL_CALL getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, - const OUString& aAbsolutePath) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + const OUString& aAbsolutePath) throw (uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException, std::exception) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception) override; }; } // end of namespace svgreader } // end of namespace svgio |