diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:14:01 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:23 +0100 |
commit | 90122cfb7e684ba7f0683f4173028406ee57b7cb (patch) | |
tree | e35f3a1e12c512006ebf4fd73d6f9ef519f3d6ea /drawinglayer | |
parent | 72c48b716640c76f0a8fa49341ce3b0099004991 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I3aa15efd12b8c9b20319a1975dbbd541783aea2d
Diffstat (limited to 'drawinglayer')
21 files changed, 58 insertions, 58 deletions
diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx index 33ba9798ae92..2e7ec2dfd629 100644 --- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx +++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx @@ -35,7 +35,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL drawinglayer_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; - void* pRet = 0; + void* pRet = nullptr; if(drawinglayer::unorenderer::XPrimitive2DRenderer_getImplementationName().equalsAscii(pImplName)) { diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index bd489027cb5e..c3546b3504ea 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -676,14 +676,14 @@ void dumpPointSequenceSequence(const drawing::PointSequenceSequence& aPointSeque void dumpPolyPolygonAsElement(const drawing::PointSequenceSequence& rPolyPolygon, xmlTextWriterPtr xmlWriter) { xmlTextWriterStartElement(xmlWriter, BAD_CAST( "PolyPolygon" )); - dumpPointSequenceSequence(rPolyPolygon, NULL, xmlWriter); + dumpPointSequenceSequence(rPolyPolygon, nullptr, xmlWriter); xmlTextWriterEndElement( xmlWriter ); } void dumpGeometryAsElement(const drawing::PointSequenceSequence& aGeometry, xmlTextWriterPtr xmlWriter) { xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Geometry" )); - dumpPointSequenceSequence(aGeometry, NULL, xmlWriter); + dumpPointSequenceSequence(aGeometry, nullptr, xmlWriter); xmlTextWriterEndElement( xmlWriter ); } @@ -1939,11 +1939,11 @@ void dumpXShapes( uno::Reference< drawing::XShapes > xShapes, xmlTextWriterPtr x OUString XShapeDumper::dump(uno::Reference<drawing::XShapes> xPageShapes, bool bDumpInteropProperties) { OStringBuffer aString; - xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO( writeCallback, closeCallback, &aString, NULL ); + xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO( writeCallback, closeCallback, &aString, nullptr ); xmlTextWriterPtr xmlWriter = xmlNewTextWriter( xmlOutBuffer ); xmlTextWriterSetIndent( xmlWriter, 1 ); - xmlTextWriterStartDocument( xmlWriter, NULL, NULL, NULL ); + xmlTextWriterStartDocument( xmlWriter, nullptr, nullptr, nullptr ); try { @@ -1963,11 +1963,11 @@ OUString XShapeDumper::dump(uno::Reference<drawing::XShapes> xPageShapes, bool b OUString XShapeDumper::dump(uno::Reference<drawing::XShape> xPageShapes, bool bDumpInteropProperties) { OStringBuffer aString; - xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO( writeCallback, closeCallback, &aString, NULL ); + xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO( writeCallback, closeCallback, &aString, nullptr ); xmlTextWriterPtr xmlWriter = xmlNewTextWriter( xmlOutBuffer ); xmlTextWriterSetIndent( xmlWriter, 1 ); - xmlTextWriterStartDocument( xmlWriter, NULL, NULL, NULL ); + xmlTextWriterStartDocument( xmlWriter, nullptr, nullptr, nullptr ); try { diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 2f14b2ef3a53..d8c088315c74 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -38,7 +38,7 @@ namespace drawinglayer const Primitive2DSequence& rChildren, bool bIsTextAnimation) : GroupPrimitive2D(rChildren), - mpAnimationEntry(0), + mpAnimationEntry(nullptr), mbIsTextAnimation(bIsTextAnimation) { // clone given animation description diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 9200113bf57d..aba65aac7f2d 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -190,9 +190,9 @@ namespace drawinglayer const BasePrimitive2D* pA(dynamic_cast< const BasePrimitive2D* >(rxA.get())); const BasePrimitive2D* pB(dynamic_cast< const BasePrimitive2D* >(rxB.get())); - const bool bAEqualZero(pA == 0L); + const bool bAEqualZero(pA == nullptr); - if(bAEqualZero != (pB == 0L)) + if(bAEqualZero != (pB == nullptr)) { return false; } diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 7b8de5c950d0..4a641d60891c 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1273,7 +1273,7 @@ namespace TargetHolder& rTarget, PropertyHolder& rProperty) { - drawinglayer::primitive2d::BasePrimitive2D* pResult = 0; + drawinglayer::primitive2d::BasePrimitive2D* pResult = nullptr; const vcl::Font& rFont = rProperty.getFont(); basegfx::B2DVector aAlignmentOffset(0.0, 0.0); @@ -3100,7 +3100,7 @@ namespace // pure recorded paint of the gradients uses the XOR paint functionality // ('trick'). This is (and will be) broblematic with AntAliasing, so it's // better to use this info - const MetaGradientExAction* pMetaGradientExAction = 0; + const MetaGradientExAction* pMetaGradientExAction = nullptr; bool bDone(false); sal_uInt32 b(nAction + 1); diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index c92d5c5b0db4..dfc4aa4a8f52 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -241,7 +241,7 @@ namespace drawinglayer // apply LineStyle basegfx::tools::applyLineDashing( aB2DPolygon, getStrokeAttribute().getDotDashArray(), - &aHairLinePolyPolygon, 0, getStrokeAttribute().getFullDotDashLen()); + &aHairLinePolyPolygon, nullptr, getStrokeAttribute().getFullDotDashLen()); } const sal_uInt32 nCount(aHairLinePolyPolygon.count()); diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index f56b4b9d8fc3..4bc3994f5ec5 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -1077,7 +1077,7 @@ namespace drawinglayer maColorB(aColorB), mfScaleA(fScaleA), mfScaleB(fScaleB), - mpTranslate(0) + mpTranslate(nullptr) { // check and evtl. set translations if(!rTranslateA.equal(rTranslateB)) @@ -1110,7 +1110,7 @@ namespace drawinglayer maColorB(aColorB), mfScaleA(fScaleA), mfScaleB(fScaleB), - mpTranslate(0) + mpTranslate(nullptr) { // scale A and B have to be positive mfScaleA = ::std::max(mfScaleA, 0.0); @@ -1129,7 +1129,7 @@ namespace drawinglayer if(mpTranslate) { delete mpTranslate; - mpTranslate = 0; + mpTranslate = nullptr; } } diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 700d72479f93..aa717982c988 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -74,7 +74,7 @@ namespace ImpTimedRefDev::ImpTimedRefDev(scoped_timed_RefDev& rOwnerOfMe) : mrOwnerOfMe(rOwnerOfMe), - mpVirDev(0L), + mpVirDev(nullptr), mnUseCount(0L) { SetTimeout(3L * 60L * 1000L); // three minutes diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index e9a02d478481..e5d58548766b 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -40,7 +40,7 @@ namespace drawinglayer bool bDoubleLine(false); bool bWaveLine(false); bool bBoldLine(false); - const int* pDotDashArray(0); + const int* pDotDashArray(nullptr); basegfx::B2DLineJoin eLineJoin(basegfx::B2DLineJoin::NONE); double fOffset(getOffset()); double fHeight(getHeight()); diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx index 6f4c5b43bd65..a0fc5d2b6e72 100644 --- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx @@ -168,9 +168,9 @@ namespace drawinglayer const BasePrimitive3D* pA(dynamic_cast< const BasePrimitive3D* >(rxA.get())); const BasePrimitive3D* pB(dynamic_cast< const BasePrimitive3D* >(rxB.get())); - const bool bAEqualZero(pA == 0L); + const bool bAEqualZero(pA == nullptr); - if(bAEqualZero != (pB == 0L)) + if(bAEqualZero != (pB == nullptr)) { return false; } diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index fc3b9bff7d74..1367d0a3fe5a 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx @@ -88,7 +88,7 @@ namespace drawinglayer else { // apply LineStyle - basegfx::tools::applyLineDashing(getB3DPolygon(), getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, 0, getStrokeAttribute().getFullDotDashLen()); + basegfx::tools::applyLineDashing(getB3DPolygon(), getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, nullptr, getStrokeAttribute().getFullDotDashLen()); } // prepare result diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index ae58b63e3103..da802ddd7b86 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx @@ -205,7 +205,7 @@ namespace drawinglayer { bool bModulate(css::drawing::TextureMode_MODULATE == aSdr3DObjectAttribute.getTextureMode()); bool bFilter(aSdr3DObjectAttribute.getTextureFilter()); - BasePrimitive3D* pNewTexturePrimitive3D = 0; + BasePrimitive3D* pNewTexturePrimitive3D = nullptr; if(!rFill.getGradient().isDefault()) { diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index a013328cab46..46b865451fc8 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -405,7 +405,7 @@ namespace drawinglayer mfDepth(fDepth), mfDiagonal(fDiagonal), mfBackScale(fBackScale), - mpLastRLGViewInformation(0), + mpLastRLGViewInformation(nullptr), mbSmoothNormals(bSmoothNormals), mbSmoothHorizontalNormals(bSmoothHorizontalNormals), mbSmoothLids(bSmoothLids), diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index 2cedbe0cfc12..2f2d62118c71 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -265,7 +265,7 @@ namespace drawinglayer mfDiagonal(fDiagonal), mfBackScale(fBackScale), mfRotation(fRotation), - mpLastRLGViewInformation(0), + mpLastRLGViewInformation(nullptr), mbSmoothNormals(bSmoothNormals), mbSmoothHorizontalNormals(bSmoothHorizontalNormals), mbSmoothLids(bSmoothLids), diff --git a/drawinglayer/source/processor2d/objectinfoextractor2d.cxx b/drawinglayer/source/processor2d/objectinfoextractor2d.cxx index 7fe006a3b591..ad26620a1630 100644 --- a/drawinglayer/source/processor2d/objectinfoextractor2d.cxx +++ b/drawinglayer/source/processor2d/objectinfoextractor2d.cxx @@ -50,7 +50,7 @@ namespace drawinglayer ObjectInfoPrimitiveExtractor2D::ObjectInfoPrimitiveExtractor2D(const geometry::ViewInformation2D& rViewInformation) : BaseProcessor2D(rViewInformation), - mpFound(0) + mpFound(nullptr) { } diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index 3f8d0e3b7989..06b7b5bc9fd3 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -83,7 +83,7 @@ namespace VirtualDevice* VDevBuffer::alloc(OutputDevice& rOutDev, const Size& rSizePixel, bool bClear, sal_Int32 nBits) { ::osl::MutexGuard aGuard(m_aMutex); - VirtualDevice* pRetval = 0; + VirtualDevice* pRetval = nullptr; if (nBits == 0) nBits = rOutDev.GetBitCount(); @@ -223,9 +223,9 @@ namespace drawinglayer const basegfx::B2DRange& rRange, bool bAddOffsetToMapping) : mrOutDev(rOutDev), - mpContent(0), - mpMask(0), - mpAlpha(0) + mpContent(nullptr), + mpMask(nullptr), + mpAlpha(nullptr) { basegfx::B2DRange aRangePixel(rRange); aRangePixel.transform(mrOutDev.GetViewTransformation()); diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 43819d433953..0f4545aba8f4 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -386,7 +386,7 @@ namespace drawinglayer const attribute::LineStartEndAttribute* pStart, const attribute::LineStartEndAttribute* pEnd) { - SvtGraphicStroke* pRetval = 0; + SvtGraphicStroke* pRetval = nullptr; if(rB2DPolygon.count() && !mnSvtGraphicStrokeCount) { @@ -1176,7 +1176,7 @@ namespace drawinglayer // direct draw of hairline; use default processing // support SvtGraphicStroke MetaCommentAction const basegfx::BColor aLineColor(maBColorModifierStack.getModifiedColor(rHairlinePrimitive.getBColor())); - SvtGraphicStroke* pSvtGraphicStroke = 0; + SvtGraphicStroke* pSvtGraphicStroke = nullptr; // #i121267# Not needed, does not give better quality compared with // the MetaActionType::POLYPOLYGON written by RenderPolygonHairlinePrimitive2D @@ -1188,7 +1188,7 @@ namespace drawinglayer pSvtGraphicStroke = impTryToCreateSvtGraphicStroke( rHairlinePrimitive.getB2DPolygon(), &aLineColor, - 0, 0, 0, 0); + nullptr, nullptr, nullptr, nullptr); impStartSvtGraphicStroke(pSvtGraphicStroke); } @@ -1225,10 +1225,10 @@ namespace drawinglayer { // support SvtGraphicStroke MetaCommentAction SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke( - rBasePolygon, 0, + rBasePolygon, nullptr, &rStrokePrimitive.getLineAttribute(), &rStrokePrimitive.getStrokeAttribute(), - 0, 0); + nullptr, nullptr); impStartSvtGraphicStroke(pSvtGraphicStroke); const attribute::LineAttribute& rLine = rStrokePrimitive.getLineAttribute(); @@ -1247,7 +1247,7 @@ namespace drawinglayer { basegfx::tools::applyLineDashing( rBasePolygon, rStroke.getDotDashArray(), - &aHairLinePolyPolygon, 0, rStroke.getFullDotDashLen()); + &aHairLinePolyPolygon, nullptr, rStroke.getFullDotDashLen()); } const basegfx::BColor aHairlineColor(maBColorModifierStack.getModifiedColor(rLine.getColor())); @@ -1314,7 +1314,7 @@ namespace drawinglayer { // support SvtGraphicStroke MetaCommentAction SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke( - rBasePolygon, 0, + rBasePolygon, nullptr, &rStrokeArrowPrimitive.getLineAttribute(), &rStrokeArrowPrimitive.getStrokeAttribute(), &rStrokeArrowPrimitive.getStart(), @@ -1380,7 +1380,7 @@ namespace drawinglayer } else { - SvtGraphicFill* pSvtGraphicFill = 0; + SvtGraphicFill* pSvtGraphicFill = nullptr; if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count()) { @@ -1479,7 +1479,7 @@ namespace drawinglayer process(primitive2d::Primitive2DSequence(&xBackground, 1)); } - SvtGraphicFill* pSvtGraphicFill = 0; + SvtGraphicFill* pSvtGraphicFill = nullptr; aLocalPolyPolygon.transform(maCurrentTransformation); if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count()) @@ -1621,7 +1621,7 @@ namespace drawinglayer // XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END support - SvtGraphicFill* pSvtGraphicFill = 0; + SvtGraphicFill* pSvtGraphicFill = nullptr; if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count()) { @@ -1682,7 +1682,7 @@ namespace drawinglayer aLocalPolyPolygon.transform(maCurrentTransformation); // XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END support - SvtGraphicFill* pSvtGraphicFill = 0; + SvtGraphicFill* pSvtGraphicFill = nullptr; // #i121267# Not needed, does not give better quality compared with // the MetaActionType::POLYPOLYGON written by the DrawPolyPolygon command @@ -1833,7 +1833,7 @@ namespace drawinglayer { // try to identify a single PolyPolygonColorPrimitive2D in the // content part of the transparence primitive - const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = 0; + const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = nullptr; static bool bForceToMetafile(false); if(!bForceToMetafile && 1 == rContent.getLength()) @@ -1860,7 +1860,7 @@ namespace drawinglayer aLocalPolyPolygon.transform(maCurrentTransformation); // XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END support - SvtGraphicFill* pSvtGraphicFill = 0; + SvtGraphicFill* pSvtGraphicFill = nullptr; // #i121267# Not needed, does not give better quality compared with // the MetaActionType::POLYPOLYGON written by the DrawPolyPolygon command @@ -1967,7 +1967,7 @@ namespace drawinglayer { // try to identify a single FillGradientPrimitive2D in the // transparence part of the primitive - const primitive2d::FillGradientPrimitive2D* pFiGradient = 0; + const primitive2d::FillGradientPrimitive2D* pFiGradient = nullptr; static bool bForceToBigTransparentVDev(false); if(!bForceToBigTransparentVDev && 1 == rTransparence.getLength()) diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 54cedad18865..29056685f620 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -206,7 +206,7 @@ namespace drawinglayer aLocalPolygon, rSource.getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, - 0, + nullptr, rSource.getStrokeAttribute().getFullDotDashLen()); } diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index b50c836a10e6..b6edfa4a3d7d 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -160,7 +160,7 @@ namespace drawinglayer const primitive2d::TextDecoratedPortionPrimitive2D* pTCPP = dynamic_cast<const primitive2d::TextDecoratedPortionPrimitive2D*>( &rTextCandidate ); - if( pTCPP != NULL ) + if( pTCPP != nullptr ) { // set the color of text decorations @@ -275,7 +275,7 @@ namespace drawinglayer sal_Int32 nPos = rTextCandidate.getTextPosition(); sal_Int32 nLen = rTextCandidate.getTextLength(); - long* pDXArray = aTransformedDXArray.size() ? &(aTransformedDXArray[0]) : NULL ; + long* pDXArray = aTransformedDXArray.size() ? &(aTransformedDXArray[0]) : nullptr ; if ( rTextCandidate.isFilled() ) { @@ -1156,7 +1156,7 @@ namespace drawinglayer // else apply LineStyle basegfx::tools::applyLineDashing(rPolygonStrokeCandidate.getB2DPolygon(), rStrokeAttribute.getDotDashArray(), - &aHairlinePolyPolygon, 0, rStrokeAttribute.getFullDotDashLen()); + &aHairlinePolyPolygon, nullptr, rStrokeAttribute.getFullDotDashLen()); } const sal_uInt32 nCount(aHairlinePolyPolygon.count()); diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index 99b0c0772adc..f29a04b19c50 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -200,7 +200,7 @@ private: double decideColorAndOpacity(basegfx::BColor& rColor) { // init values with full opacity and material color - OSL_ENSURE(0 != mpCurrentMaterial, "CurrentMaterial not set (!)"); + OSL_ENSURE(nullptr != mpCurrentMaterial, "CurrentMaterial not set (!)"); double fOpacity(1.0); rColor = mpCurrentMaterial->getColor(); @@ -354,7 +354,7 @@ public: maIntNormal(), maIntTexture(), maIntInvTexture(), - mpCurrentMaterial(0), + mpCurrentMaterial(nullptr), mbModifyColor(false), mbUseTex(false), mbHasTexCoor(false), @@ -642,11 +642,11 @@ namespace drawinglayer const basegfx::B2DRange& rVisiblePart, sal_uInt16 nAntiAlialize) : DefaultProcessor3D(rViewInformation3D, rSdrSceneAttribute, rSdrLightingAttribute), - mpBZPixelRaster(0), + mpBZPixelRaster(nullptr), maInvEyeToView(), - mpZBufferRasterConverter3D(0), + mpZBufferRasterConverter3D(nullptr), mnAntiAlialize(nAntiAlialize), - mpRasterPrimitive3Ds(0) + mpRasterPrimitive3Ds(nullptr) { // generate ViewSizes const double fFullViewSizeX((rViewInformation2D.getObjectToViewTransformation() * basegfx::B2DVector(fSizeX, 0.0)).getLength()); @@ -792,7 +792,7 @@ namespace drawinglayer // delete them to signal the destructor that all is done and // to allow asserting there delete mpRasterPrimitive3Ds; - mpRasterPrimitive3Ds = 0; + mpRasterPrimitive3Ds = nullptr; } } diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index 5902188068c1..0f74d37d06d6 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -66,9 +66,9 @@ namespace drawinglayer const BitmapEx& rBitmapEx, const basegfx::B2DRange& rRange) : maBitmapEx(rBitmapEx), - mpReadBitmap(0), + mpReadBitmap(nullptr), maTransparence(), - mpReadTransparence(0), + mpReadTransparence(nullptr), maTopLeft(rRange.getMinimum()), maSize(rRange.getRange()), mfMulX(0.0), @@ -325,9 +325,9 @@ namespace drawinglayer const primitive3d::HatchTexturePrimitive3D& rPrimitive, double fLogicPixelSize) : mfLogicPixelSize(fLogicPixelSize), - mp0(0L), - mp1(0L), - mp2(0L) + mp0(nullptr), + mp1(nullptr), + mp2(nullptr) { const attribute::FillHatchAttribute& rHatch(rPrimitive.getHatch()); const basegfx::B2DRange aOutlineRange(0.0, 0.0, rPrimitive.getTextureSize().getX(), rPrimitive.getTextureSize().getY()); |