summaryrefslogtreecommitdiff
path: root/drawinglayer/source/primitive2d
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:14:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:23 +0100
commit90122cfb7e684ba7f0683f4173028406ee57b7cb (patch)
treee35f3a1e12c512006ebf4fd73d6f9ef519f3d6ea /drawinglayer/source/primitive2d
parent72c48b716640c76f0a8fa49341ce3b0099004991 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I3aa15efd12b8c9b20319a1975dbbd541783aea2d
Diffstat (limited to 'drawinglayer/source/primitive2d')
-rw-r--r--drawinglayer/source/primitive2d/animatedprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/baseprimitive2d.cxx4
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx4
-rw-r--r--drawinglayer/source/primitive2d/polygonprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/svggradientprimitive2d.cxx6
-rw-r--r--drawinglayer/source/primitive2d/textlayoutdevice.cxx2
-rw-r--r--drawinglayer/source/primitive2d/textlineprimitive2d.cxx2
7 files changed, 11 insertions, 11 deletions
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());