From 6f06230da10c6a51c5538f1b5515b341475ea043 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:24:47 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: I0164a67073395b865fa3e3ce342665f6497dc5b8 --- svgio/source/svgreader/svgcharacternode.cxx | 4 +- svgio/source/svgreader/svgcirclenode.cxx | 4 +- svgio/source/svgreader/svgclippathnode.cxx | 2 +- svgio/source/svgreader/svgdocument.cxx | 4 +- svgio/source/svgreader/svgdocumenthandler.cxx | 12 +++--- svgio/source/svgreader/svgellipsenode.cxx | 4 +- svgio/source/svgreader/svggnode.cxx | 2 +- svgio/source/svgreader/svggradientnode.cxx | 12 +++--- svgio/source/svgreader/svgimagenode.cxx | 2 +- svgio/source/svgreader/svglinenode.cxx | 4 +- svgio/source/svgreader/svgmarkernode.cxx | 2 +- svgio/source/svgreader/svgmasknode.cxx | 2 +- svgio/source/svgreader/svgnode.cxx | 16 ++++---- svgio/source/svgreader/svgpathnode.cxx | 4 +- svgio/source/svgreader/svgpatternnode.cxx | 18 ++++----- svgio/source/svgreader/svgpolynode.cxx | 6 +-- svgio/source/svgreader/svgrectnode.cxx | 4 +- svgio/source/svgreader/svgstyleattributes.cxx | 54 +++++++++++++-------------- svgio/source/svgreader/svgsvgnode.cxx | 6 +-- svgio/source/svgreader/svgsymbolnode.cxx | 2 +- svgio/source/svgreader/svgtextnode.cxx | 4 +- svgio/source/svgreader/svgtextpathnode.cxx | 6 +-- svgio/source/svgreader/svgusenode.cxx | 2 +- svgio/source/svguno/svguno.cxx | 4 +- 24 files changed, 90 insertions(+), 90 deletions(-) (limited to 'svgio/source') diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 1ad92ee2461f..3e09e9ec5c8b 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -222,7 +222,7 @@ namespace svgio } else { - return 0; + return nullptr; } } @@ -231,7 +231,7 @@ namespace svgio const SvgStyleAttributes& rSvgStyleAttributes) const { // prepare retval, index and length - drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pRetval = 0; + drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pRetval = nullptr; sal_uInt32 nIndex(0); sal_uInt32 nLength(getText().getLength()); diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx index 9c38c27bc68a..14988eae9760 100644 --- a/svgio/source/svgreader/svgcirclenode.cxx +++ b/svgio/source/svgreader/svgcirclenode.cxx @@ -33,7 +33,7 @@ namespace svgio maCx(0), maCy(0), maR(0), - mpaTransform(0) + mpaTransform(nullptr) { } @@ -132,7 +132,7 @@ namespace svgio drawinglayer::primitive2d::Primitive2DSequence aNewTarget; - pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, 0); + pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, nullptr); if(aNewTarget.hasElements()) { diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index 711c158e2f11..5064933a97b0 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -35,7 +35,7 @@ namespace svgio SvgNode* pParent) : SvgNode(SVGTokenClipPathNode, rDocument, pParent), maSvgStyleAttributes(*this), - mpaTransform(0), + mpaTransform(nullptr), maClipPathUnits(userSpaceOnUse) { } diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx index 60bd2c6a8284..28b69a1de8a8 100644 --- a/svgio/source/svgreader/svgdocument.cxx +++ b/svgio/source/svgreader/svgdocument.cxx @@ -69,7 +69,7 @@ namespace svgio if(aResult == maIdTokenMapperList.end()) { - return 0; + return nullptr; } else { @@ -91,7 +91,7 @@ namespace svgio if(aResult == maIdStyleTokenMapperList.end()) { - return 0; + return nullptr; } else { diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx index 166e942fe6a0..05f6d4146343 100644 --- a/svgio/source/svgreader/svgdocumenthandler.cxx +++ b/svgio/source/svgreader/svgdocumenthandler.cxx @@ -136,7 +136,7 @@ namespace svgio { SvgDocHdl::SvgDocHdl(const OUString& aAbsolutePath) : maDocument(aAbsolutePath), - mpTarget(0), + mpTarget(nullptr), maCssContents(), bSkip(false) { @@ -407,9 +407,9 @@ namespace svgio if(!aName.isEmpty()) { const SVGToken aSVGToken(StrToSVGToken(aName, false)); - SvgNode* pWhitespaceCheck(SVGTokenText == aSVGToken ? mpTarget : 0); - SvgStyleNode* pCssStyle(SVGTokenStyle == aSVGToken ? static_cast< SvgStyleNode* >(mpTarget) : 0); - SvgTitleDescNode* pSvgTitleDescNode(SVGTokenTitle == aSVGToken || SVGTokenDesc == aSVGToken ? static_cast< SvgTitleDescNode* >(mpTarget) : 0); + SvgNode* pWhitespaceCheck(SVGTokenText == aSVGToken ? mpTarget : nullptr); + SvgStyleNode* pCssStyle(SVGTokenStyle == aSVGToken ? static_cast< SvgStyleNode* >(mpTarget) : nullptr); + SvgTitleDescNode* pSvgTitleDescNode(SVGTokenTitle == aSVGToken || SVGTokenDesc == aSVGToken ? static_cast< SvgTitleDescNode* >(mpTarget) : nullptr); // if we are in skipping mode and we reach the flowRoot end tag: stop skipping mode if(bSkip && aSVGToken == SVGTokenFlowRoot) @@ -537,7 +537,7 @@ namespace svgio if(pWhitespaceCheck) { // cleanup read strings - whiteSpaceHandling(pWhitespaceCheck, 0); + whiteSpaceHandling(pWhitespaceCheck, nullptr); } } } @@ -555,7 +555,7 @@ namespace svgio case SVGTokenTextPath: { const SvgNodeVector& rChilds = mpTarget->getChildren(); - SvgCharacterNode* pTarget = 0; + SvgCharacterNode* pTarget = nullptr; if(rChilds.size()) { diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx index 4e68e2a0c5d8..571f8aac6e1c 100644 --- a/svgio/source/svgreader/svgellipsenode.cxx +++ b/svgio/source/svgreader/svgellipsenode.cxx @@ -34,7 +34,7 @@ namespace svgio maCy(0), maRx(0), maRy(0), - mpaTransform(0) + mpaTransform(nullptr) { } @@ -147,7 +147,7 @@ namespace svgio drawinglayer::primitive2d::Primitive2DSequence aNewTarget; - pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, 0); + pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, nullptr); if(aNewTarget.hasElements()) { diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx index 6cd30c3c25d6..d59865a92f0c 100644 --- a/svgio/source/svgreader/svggnode.cxx +++ b/svgio/source/svgreader/svggnode.cxx @@ -31,7 +31,7 @@ namespace svgio SvgNode* pParent) : SvgNode(aType, rDocument, pParent), maSvgStyleAttributes(*this), - mpaTransform(0) + mpaTransform(nullptr) { OSL_ENSURE(aType == SVGTokenDefs || aType == SVGTokenG, "SvgGNode should ony be used for Group and Defs (!)"); } diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx index 6357650985b8..51362b80e471 100644 --- a/svgio/source/svgreader/svggradientnode.cxx +++ b/svgio/source/svgreader/svggradientnode.cxx @@ -50,9 +50,9 @@ namespace svgio maFy(), maGradientUnits(objectBoundingBox), maSpreadMethod(drawinglayer::primitive2d::Spread_pad), - mpaGradientTransform(0), + mpaGradientTransform(nullptr), maXLink(), - mpXLink(0) + mpXLink(nullptr) { OSL_ENSURE(aType == SVGTokenLinearGradient || aType == SVGTokenRadialGradient, "SvgGradientNode should ony be used for Linear and Radial gradient (!)"); } @@ -448,7 +448,7 @@ namespace svgio return mpXLink->getFx(); } - return 0; + return nullptr; } const SvgNumber* SvgGradientNode::getFy() const @@ -465,7 +465,7 @@ namespace svgio return mpXLink->getFy(); } - return 0; + return nullptr; } const basegfx::B2DHomMatrix* SvgGradientNode::getGradientTransform() const @@ -482,7 +482,7 @@ namespace svgio return mpXLink->getGradientTransform(); } - return 0; + return nullptr; } void SvgGradientNode::setGradientTransform(const basegfx::B2DHomMatrix* pMatrix) @@ -490,7 +490,7 @@ namespace svgio if(mpaGradientTransform) { delete mpaGradientTransform; - mpaGradientTransform = 0; + mpaGradientTransform = nullptr; } if(pMatrix) diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx index 6f752726d7a4..91286fa0b199 100644 --- a/svgio/source/svgreader/svgimagenode.cxx +++ b/svgio/source/svgreader/svgimagenode.cxx @@ -43,7 +43,7 @@ namespace svgio : SvgNode(SVGTokenRect, rDocument, pParent), maSvgStyleAttributes(*this), maSvgAspectRatio(), - mpaTransform(0), + mpaTransform(nullptr), maX(0), maY(0), maWidth(0), diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx index 5557c0c2ef21..5c2327c5111a 100644 --- a/svgio/source/svgreader/svglinenode.cxx +++ b/svgio/source/svgreader/svglinenode.cxx @@ -34,7 +34,7 @@ namespace svgio maY1(0), maX2(0), maY2(0), - mpaTransform(0) + mpaTransform(nullptr) { } @@ -143,7 +143,7 @@ namespace svgio drawinglayer::primitive2d::Primitive2DSequence aNewTarget; - pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, 0); + pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, nullptr); if(aNewTarget.hasElements()) { diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx index 6ecedf3c1d15..031b35c7c377 100644 --- a/svgio/source/svgreader/svgmarkernode.cxx +++ b/svgio/source/svgreader/svgmarkernode.cxx @@ -29,7 +29,7 @@ namespace svgio : SvgNode(SVGTokenMarker, rDocument, pParent), aPrimitives(), maSvgStyleAttributes(*this), - mpViewBox(0), + mpViewBox(nullptr), maSvgAspectRatio(), maRefX(0), maRefY(0), diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index 3c0f832d36da..ae2068be98eb 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -40,7 +40,7 @@ namespace svgio maY(SvgNumber(-10.0, Unit_percent, true)), maWidth(SvgNumber(120.0, Unit_percent, true)), maHeight(SvgNumber(120.0, Unit_percent, true)), - mpaTransform(0), + mpaTransform(nullptr), maMaskUnits(objectBoundingBox), maMaskContentUnits(userSpaceOnUse) { diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index 623a1e4cdfb3..d2b6532f2319 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -37,7 +37,7 @@ namespace svgio const SvgStyleAttributes* SvgNode::getSvgStyleAttributes() const { - return 0; + return nullptr; } void SvgNode::fillCssStyleVectorUsingHierarchyAndSelectors( @@ -232,7 +232,7 @@ namespace svgio // for the element containing the hierarchy) in a vector of pointers and to use that. // Resetting the CssStyleParent on rOriginal is probably not needed // but simply safer to do. - const_cast< SvgStyleAttributes& >(rOriginal).setCssStyleParent(0); + const_cast< SvgStyleAttributes& >(rOriginal).setCssStyleParent(nullptr); // loop over the existing CssStyles and link them. There is a first one, take // as current @@ -262,14 +262,14 @@ namespace svgio : maType(aType), mrDocument(rDocument), mpParent(pParent), - mpAlternativeParent(0), + mpAlternativeParent(nullptr), maChildren(), - mpId(0), - mpClass(0), + mpId(nullptr), + mpClass(nullptr), maXmlSpace(XmlSpace_notset), maDisplay(Display_inline), maCssStyleVector(), - mpLocalCssStyle(0), + mpLocalCssStyle(nullptr), mbCssStyleVectorBuilt(false) { OSL_ENSURE(SVGTokenUnknown != maType, "SvgNode with unknown type created (!)"); @@ -656,7 +656,7 @@ namespace svgio { mrDocument.removeSvgNodeFromMapper(*mpId); delete mpId; - mpId = 0; + mpId = nullptr; } if(pfId) @@ -672,7 +672,7 @@ namespace svgio { mrDocument.removeSvgNodeFromMapper(*mpClass); delete mpClass; - mpClass = 0; + mpClass = nullptr; } if(pfClass) diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx index 34d1b28338dd..54ae47137689 100644 --- a/svgio/source/svgreader/svgpathnode.cxx +++ b/svgio/source/svgreader/svgpathnode.cxx @@ -29,8 +29,8 @@ namespace svgio SvgNode* pParent) : SvgNode(SVGTokenPath, rDocument, pParent), maSvgStyleAttributes(*this), - mpPolyPolygon(0), - mpaTransform(0), + mpPolyPolygon(nullptr), + mpaTransform(nullptr), maPathLength() { } diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx index 5bf90ab23154..4167da883361 100644 --- a/svgio/source/svgreader/svgpatternnode.cxx +++ b/svgio/source/svgreader/svgpatternnode.cxx @@ -38,17 +38,17 @@ namespace svgio : SvgNode(SVGTokenPattern, rDocument, pParent), aPrimitives(), maSvgStyleAttributes(*this), - mpViewBox(0), + mpViewBox(nullptr), maSvgAspectRatio(), maX(), maY(), maWidth(), maHeight(), - mpPatternUnits(0), - mpPatternContentUnits(0), - mpaPatternTransform(0), + mpPatternUnits(nullptr), + mpPatternContentUnits(nullptr), + mpaPatternTransform(nullptr), maXLink(), - mpXLink(0) + mpXLink(nullptr) { } @@ -310,7 +310,7 @@ namespace svgio return mpXLink->getViewBox(); } - return 0; + return nullptr; } const SvgAspectRatio& SvgPatternNode::getSvgAspectRatio() const @@ -412,7 +412,7 @@ namespace svgio return mpXLink->getPatternUnits(); } - return 0; + return nullptr; } const SvgUnits* SvgPatternNode::getPatternContentUnits() const @@ -429,7 +429,7 @@ namespace svgio return mpXLink->getPatternContentUnits(); } - return 0; + return nullptr; } const basegfx::B2DHomMatrix* SvgPatternNode::getPatternTransform() const @@ -446,7 +446,7 @@ namespace svgio return mpXLink->getPatternTransform(); } - return 0; + return nullptr; } } // end of namespace svgreader diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx index dfea1ea3976f..6b3ebb1562c7 100644 --- a/svgio/source/svgreader/svgpolynode.cxx +++ b/svgio/source/svgreader/svgpolynode.cxx @@ -32,8 +32,8 @@ namespace svgio bool bIsPolyline) : SvgNode(SVGTokenPolygon, rDocument, pParent), maSvgStyleAttributes(*this), - mpPolygon(0), - mpaTransform(0), + mpPolygon(nullptr), + mpaTransform(nullptr), mbIsPolyline(bIsPolyline) { } @@ -108,7 +108,7 @@ namespace svgio { drawinglayer::primitive2d::Primitive2DSequence aNewTarget; - pStyle->add_path(basegfx::B2DPolyPolygon(*getPolygon()), aNewTarget, 0); + pStyle->add_path(basegfx::B2DPolyPolygon(*getPolygon()), aNewTarget, nullptr); if(aNewTarget.hasElements()) { diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx index a6bae8df30a0..170fb913b639 100644 --- a/svgio/source/svgreader/svgrectnode.cxx +++ b/svgio/source/svgreader/svgrectnode.cxx @@ -36,7 +36,7 @@ namespace svgio maHeight(0), maRx(0), maRy(0), - mpaTransform(0) + mpaTransform(nullptr) { } @@ -204,7 +204,7 @@ namespace svgio drawinglayer::primitive2d::Primitive2DSequence aNewTarget; - pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, 0); + pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, nullptr); if(aNewTarget.hasElements()) { diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index dd1f942c65b2..6c2fef789404 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -248,7 +248,7 @@ namespace svgio return mrOwner.getParent()->getSvgStyleAttributes(); } - return NULL; + return nullptr; } void SvgStyleAttributes::add_text( @@ -460,7 +460,7 @@ namespace svgio fRadius, userSpaceOnUse != rFillGradient.getGradientUnits(), rFillGradient.getSpreadMethod(), - bFocal ? &aFocal : 0)); + bFocal ? &aFocal : nullptr)); } } } @@ -880,7 +880,7 @@ namespace svgio // only 'marker' was used instead of 'marker-start', 'marker-mid' or 'marker-end', // see 'case SVGTokenMarker' in this file; thus in this case only one common // marker in primitive form will be prepared - const SvgMarkerNode* pPrepared = 0; + const SvgMarkerNode* pPrepared = nullptr; // values for the prepared marker, results of prepare_singleMarker drawinglayer::primitive2d::Primitive2DSequence aPreparedMarkerPrimitives; @@ -904,7 +904,7 @@ namespace svgio { const bool bIsFirstMarker(!a && !b); const bool bIsLastMarker(nSubPathCount - 1 == a && nTargetMarkerCount - 1 == b); - const SvgMarkerNode* pNeeded = 0; + const SvgMarkerNode* pNeeded = nullptr; if(bIsFirstMarker) { @@ -951,7 +951,7 @@ namespace svgio { // error: could not prepare given marker OSL_ENSURE(false, "OOps, could not prepare given marker as primitives (!)"); - pPrepared = 0; + pPrepared = nullptr; continue; } } @@ -1188,16 +1188,16 @@ namespace svgio SvgStyleAttributes::SvgStyleAttributes(SvgNode& rOwner) : mrOwner(rOwner), - mpCssStyleParent(0), + mpCssStyleParent(nullptr), maFill(), maStroke(), maStopColor(basegfx::BColor(0.0, 0.0, 0.0), true), maStrokeWidth(), maStopOpacity(), - mpSvgGradientNodeFill(0), - mpSvgGradientNodeStroke(0), - mpSvgPatternNodeFill(0), - mpSvgPatternNodeStroke(0), + mpSvgGradientNodeFill(nullptr), + mpSvgGradientNodeStroke(nullptr), + mpSvgPatternNodeFill(nullptr), + mpSvgPatternNodeStroke(nullptr), maFillOpacity(), maStrokeDasharray(), maStrokeDashOffset(), @@ -1222,11 +1222,11 @@ namespace svgio maClipPathXLink(), maMaskXLink(), maMarkerStartXLink(), - mpMarkerStartXLink(0), + mpMarkerStartXLink(nullptr), maMarkerMidXLink(), - mpMarkerMidXLink(0), + mpMarkerMidXLink(nullptr), maMarkerEndXLink(), - mpMarkerEndXLink(0), + mpMarkerEndXLink(nullptr), maFillRule(FillRule_notset), maClipRule(FillRule_nonzero), maBaselineShift(BaselineShift_Baseline), @@ -1930,14 +1930,14 @@ namespace svgio } } - return 0; + return nullptr; } const basegfx::BColor* SvgStyleAttributes::getStroke() const { if(mbIsClipPathContent) { - return 0; + return nullptr; } else if(maStroke.isSet()) { @@ -1960,7 +1960,7 @@ namespace svgio } } - return 0; + return nullptr; } const basegfx::BColor& SvgStyleAttributes::getStopColor() const @@ -1979,7 +1979,7 @@ namespace svgio { if(mbIsClipPathContent) { - return 0; + return nullptr; } else if(mpSvgGradientNodeFill) { @@ -1995,14 +1995,14 @@ namespace svgio } } - return 0; + return nullptr; } const SvgGradientNode* SvgStyleAttributes::getSvgGradientNodeStroke() const { if(mbIsClipPathContent) { - return 0; + return nullptr; } else if(mpSvgGradientNodeStroke) { @@ -2018,14 +2018,14 @@ namespace svgio } } - return 0; + return nullptr; } const SvgPatternNode* SvgStyleAttributes::getSvgPatternNodeFill() const { if(mbIsClipPathContent) { - return 0; + return nullptr; } else if(mpSvgPatternNodeFill) { @@ -2041,14 +2041,14 @@ namespace svgio } } - return 0; + return nullptr; } const SvgPatternNode* SvgStyleAttributes::getSvgPatternNodeStroke() const { if(mbIsClipPathContent) { - return 0; + return nullptr; } else if(mpSvgPatternNodeStroke) { @@ -2064,7 +2064,7 @@ namespace svgio } } - return 0; + return nullptr; } SvgNumber SvgStyleAttributes::getStrokeWidth() const @@ -2422,7 +2422,7 @@ namespace svgio } // default is 0 - return 0; + return nullptr; } TextDecoration SvgStyleAttributes::getTextDecoration() const @@ -2465,7 +2465,7 @@ namespace svgio if(maColor.isCurrent()) { OSL_ENSURE(false, "Svg error: current color uses current color (!)"); - return 0; + return nullptr; } else if(maColor.isOn()) { @@ -2482,7 +2482,7 @@ namespace svgio } } - return 0; + return nullptr; } OUString SvgStyleAttributes::getMarkerStartXLink() const diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index 5db062d83fb0..86a11d7b8b1e 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -36,7 +36,7 @@ namespace svgio SvgNode* pParent) : SvgNode(SVGTokenSvg, rDocument, pParent), maSvgStyleAttributes(*this), - mpViewBox(0), + mpViewBox(nullptr), maSvgAspectRatio(), maX(), maY(), @@ -215,7 +215,7 @@ namespace svgio { return; } - const SvgSvgNode* pParentSvgSvgNode = 0; + const SvgSvgNode* pParentSvgSvgNode = nullptr; // enclosing svg might have relative width, need to cumulate them till they are // resolved somewhere up in the node tree double fPercentage(1.0); @@ -257,7 +257,7 @@ namespace svgio { return; } - const SvgSvgNode* pParentSvgSvgNode = 0; + const SvgSvgNode* pParentSvgSvgNode = nullptr; // enclosing svg might have relative width and height, need to cumulate them till they are // resolved somewhere up in the node tree double fPercentage(1.0); diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx index 86ef1df59abd..aec7baef1068 100644 --- a/svgio/source/svgreader/svgsymbolnode.cxx +++ b/svgio/source/svgreader/svgsymbolnode.cxx @@ -30,7 +30,7 @@ namespace svgio SvgNode* pParent) : SvgNode(SVGTokenSvg, rDocument, pParent), maSvgStyleAttributes(*this), - mpViewBox(0), + mpViewBox(nullptr), maSvgAspectRatio() { } diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx index df05d6ec7db9..5f3e0ceac1f5 100644 --- a/svgio/source/svgreader/svgtextnode.cxx +++ b/svgio/source/svgreader/svgtextnode.cxx @@ -35,7 +35,7 @@ namespace svgio SvgNode* pParent) : SvgNode(SVGTokenText, rDocument, pParent), maSvgStyleAttributes(*this), - mpaTransform(0), + mpaTransform(nullptr), maSvgTextPositions() { } @@ -233,7 +233,7 @@ namespace svgio if(fOpacity > 0.0) { - SvgTextPosition aSvgTextPosition(0, *this, getSvgTextPositions()); + SvgTextPosition aSvgTextPosition(nullptr, *this, getSvgTextPositions()); drawinglayer::primitive2d::Primitive2DSequence aNewTarget; const SvgNodeVector& rChildren = getChildren(); const sal_uInt32 nCount(rChildren.size()); diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index a5d9c15ca629..fc2a0a2fc9bf 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -75,7 +75,7 @@ namespace svgio if(mpB2DCubicBezierHelper) { delete mpB2DCubicBezierHelper; - mpB2DCubicBezierHelper = 0; + mpB2DCubicBezierHelper = nullptr; } } @@ -124,7 +124,7 @@ namespace svgio mnMaxIndex(rPolygon.isClosed() ? rPolygon.count() : rPolygon.count() - 1), mnIndex(0), maCurrentSegment(), - mpB2DCubicBezierHelper(0), + mpB2DCubicBezierHelper(nullptr), mfCurrentSegmentLength(0.0), mfSegmentStartPosition(0.0) { @@ -436,7 +436,7 @@ namespace svgio while(fPosition < fBasegfxPathLength && nCurrent < nLength) { - const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pCandidate = 0; + const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pCandidate = nullptr; const drawinglayer::primitive2d::Primitive2DReference xReference(rPathContent[nCurrent]); if(xReference.is()) diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx index cdc57c429c1d..133f63f76ea4 100644 --- a/svgio/source/svgreader/svgusenode.cxx +++ b/svgio/source/svgreader/svgusenode.cxx @@ -30,7 +30,7 @@ namespace svgio SvgNode* pParent) : SvgNode(SVGTokenG, rDocument, pParent), maSvgStyleAttributes(*this), - mpaTransform(0), + mpaTransform(nullptr), maX(), maY(), maWidth(), diff --git a/svgio/source/svguno/svguno.cxx b/svgio/source/svguno/svguno.cxx index f0dbe264e127..3176aaf0b302 100644 --- a/svgio/source/svguno/svguno.cxx +++ b/svgio/source/svguno/svguno.cxx @@ -31,8 +31,8 @@ static cppu::ImplementationEntry const services[] = { { &svgio::svgreader::XSvgParser_createInstance, &svgio::svgreader::XSvgParser_getImplementationName, &svgio::svgreader::XSvgParser_getSupportedServiceNames, - &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } }; + &cppu::createSingleComponentFactory, nullptr, 0 }, + { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } -- cgit