diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /svgio | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'svgio')
27 files changed, 74 insertions, 74 deletions
diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx index bc5aea68e1ad..b37e18ee4993 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx @@ -162,7 +162,7 @@ namespace svgio const OUString& rText); virtual ~SvgCharacterNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; virtual 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 f210d29eda4d..50f59450ece2 100644 --- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx +++ b/svgio/inc/svgio/svgreader/svgcirclenode.hxx @@ -47,9 +47,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgCircleNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 a40033906dd2..ad8c59c9dce0 100644 --- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx @@ -45,9 +45,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgClipPathNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// apply contained clipPath to given geometry void apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) const; diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx index 6779708972a3..35b4cf75969d 100644 --- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx +++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx @@ -51,14 +51,14 @@ namespace svgio ~SvgDocHdl(); // Methods XDocumentHandler - virtual void SAL_CALL startDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); - 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); - virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); - 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); - 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); + 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; const SvgDocument& getSvgDocument() const { return maDocument; } }; diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgio/svgreader/svgellipsenode.hxx index 7b2c8973da9b..655bd2c96f7f 100644 --- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx +++ b/svgio/inc/svgio/svgreader/svgellipsenode.hxx @@ -48,9 +48,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgEllipseNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 96996af1d0f0..f19a3c59a200 100644 --- a/svgio/inc/svgio/svgreader/svggnode.hxx +++ b/svgio/inc/svgio/svgreader/svggnode.hxx @@ -45,9 +45,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgGNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 948e41a2974c..00752e6fbb92 100644 --- a/svgio/inc/svgio/svgreader/svggradientnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientnode.hxx @@ -70,8 +70,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgGradientNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_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 729026682ad3..d5156ecce0e1 100644 --- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx @@ -44,8 +44,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgGradientStopNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_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 9dbb624dcf13..fcfe4073aab2 100644 --- a/svgio/inc/svgio/svgreader/svgimagenode.hxx +++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx @@ -55,9 +55,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgImageNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 daf45e0e0b30..12036f95bcae 100644 --- a/svgio/inc/svgio/svgreader/svglinenode.hxx +++ b/svgio/inc/svgio/svgreader/svglinenode.hxx @@ -48,9 +48,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgLineNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 f820c0740a12..4871009895d1 100644 --- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx +++ b/svgio/inc/svgio/svgreader/svgmarkernode.hxx @@ -64,14 +64,14 @@ namespace svgio SvgNode* pParent); virtual ~SvgMarkerNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; /// get marker primitives buffered, uses decomposeSvgNode internally const drawinglayer::primitive2d::Primitive2DSequence& getMarkerPrimitives() const; /// InfoProvider support for % values - virtual const basegfx::B2DRange getCurrentViewPort() const; + virtual const basegfx::B2DRange getCurrentViewPort() const SAL_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 578d5fccff3b..c885fec3694f 100644 --- a/svgio/inc/svgio/svgreader/svgmasknode.hxx +++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx @@ -50,9 +50,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgMaskNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// apply contained clipPath to given geometry void apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) const; diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgio/svgreader/svgpathnode.hxx index 2d13c2d05ea5..2a2c4bd115ee 100644 --- a/svgio/inc/svgio/svgreader/svgpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpathnode.hxx @@ -48,9 +48,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgPathNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 d1a64b903e2f..98bb7a9efb56 100644 --- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpatternnode.hxx @@ -64,8 +64,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgPatternNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; /// global helpers void getValuesRelative(double& rfX, double& rfY, double& rfW, double& rfH, const basegfx::B2DRange& rGeoRange, SvgNode& rUser) const; @@ -74,7 +74,7 @@ namespace svgio const drawinglayer::primitive2d::Primitive2DSequence& getPatternPrimitives() const; /// InfoProvider support for % values - virtual const basegfx::B2DRange getCurrentViewPort() const; + virtual const basegfx::B2DRange getCurrentViewPort() const SAL_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 b6b4730c458b..a1363bf64c2a 100644 --- a/svgio/inc/svgio/svgreader/svgpolynode.hxx +++ b/svgio/inc/svgio/svgreader/svgpolynode.hxx @@ -50,9 +50,9 @@ namespace svgio bool bIsPolyline); virtual ~SvgPolyNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 abaf2d82dc13..7fcde285c221 100644 --- a/svgio/inc/svgio/svgreader/svgrectnode.hxx +++ b/svgio/inc/svgio/svgreader/svgrectnode.hxx @@ -50,9 +50,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgRectNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 51bd8856a0a6..b9dca8326247 100644 --- a/svgio/inc/svgio/svgreader/svgstylenode.hxx +++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx @@ -44,7 +44,7 @@ namespace svgio SvgNode* pParent); virtual ~SvgStyleNode(); - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; void addCssStyleSheet(const OUString& aContent); /// textCss access diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx index 834b2414a23b..07694ab7023c 100644 --- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx @@ -49,9 +49,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgSvgNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 @@ -62,7 +62,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; + virtual const basegfx::B2DRange getCurrentViewPort() const SAL_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 ecc12cb19cc3..0e0b58ded149 100644 --- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx @@ -44,8 +44,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgSymbolNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE; /// viewBox content const basegfx::B2DRange* getViewBox() const { return mpViewBox; } diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgio/svgreader/svgtextnode.hxx index ee21ac085313..f336701a1654 100644 --- a/svgio/inc/svgio/svgreader/svgtextnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextnode.hxx @@ -56,9 +56,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgTextNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// 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 20ca0a5b1e22..525c0f7c3560 100644 --- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx @@ -53,8 +53,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgTextPathNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_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 9460bab3b00f..e1d936065d22 100644 --- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtrefnode.hxx @@ -46,8 +46,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgTrefNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_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 d6582e1a1483..14ca5b381269 100644 --- a/svgio/inc/svgio/svgreader/svgtspannode.hxx +++ b/svgio/inc/svgio/svgreader/svgtspannode.hxx @@ -45,8 +45,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgTspanNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_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 a8b91ea60117..8eb13efa4c9d 100644 --- a/svgio/inc/svgio/svgreader/svgusenode.hxx +++ b/svgio/inc/svgio/svgreader/svgusenode.hxx @@ -52,9 +52,9 @@ namespace svgio SvgNode* pParent); virtual ~SvgUseNode(); - virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); - virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; + 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; /// transform content const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; } diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 93bc1c35cbcc..31c47bbea57f 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -165,7 +165,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); + virtual bool allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength) SAL_OVERRIDE; public: localTextBreakupHelper( diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index 8b58cb657290..23b30d7a5129 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -53,7 +53,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); + virtual bool allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength) SAL_OVERRIDE; void freeB2DCubicBezierHelper(); basegfx::B2DCubicBezierHelper* getB2DCubicBezierHelper(); diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index a3433e022e2c..e3ab48b8bd2d 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -55,12 +55,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); + const OUString& aAbsolutePath) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException, std::exception); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception); + 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; }; } // end of namespace svgreader } // end of namespace svgio |