diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:10:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:16 +0100 |
commit | a17cde058213f962b8de880de6f5b1e4f2061b37 (patch) | |
tree | 1dadb981b6581df51ba383dd49f54a736b9dc091 /basegfx/test | |
parent | c2ff1b9622a1c67612719c87af593b59b9534119 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ib64fc63905cf44a0d32393d52ee587d0aa2d9dfa
Diffstat (limited to 'basegfx/test')
-rw-r--r-- | basegfx/test/basegfx2d.cxx | 18 | ||||
-rw-r--r-- | basegfx/test/boxclipper.cxx | 6 | ||||
-rw-r--r-- | basegfx/test/clipstate.cxx | 6 | ||||
-rw-r--r-- | basegfx/test/genericclipper.cxx | 4 |
4 files changed, 17 insertions, 17 deletions
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index ec95f8efd2ec..cfcc4e7e4e67 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -142,19 +142,19 @@ public: OUString aExport; CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D", - tools::importFromSvgD( aPoly, aPath0, false, 0 )); + tools::importFromSvgD( aPoly, aPath0, false, nullptr )); aExport = tools::exportToSvgD( aPoly, true, true, false ); const char* sExportString = "m10 10h-20v-20h20z"; CPPUNIT_ASSERT_MESSAGE("exporting rectangle to SVG-D", aExport.equalsAscii(sExportString) ); CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D (round-trip", - tools::importFromSvgD( aPoly, aExport, false, 0 )); + tools::importFromSvgD( aPoly, aExport, false, nullptr )); aExport = tools::exportToSvgD( aPoly, true, true, false ); CPPUNIT_ASSERT_MESSAGE("exporting rectangle to SVG-D (round-trip)", aExport.equalsAscii(sExportString)); CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D", - tools::importFromSvgD( aPoly, aPath1, false, 0 )); + tools::importFromSvgD( aPoly, aPath1, false, nullptr )); aExport = tools::exportToSvgD( aPoly, true, true, false ); // Adaptions for B2DPolygon bezier change (see #i77162#): @@ -182,10 +182,10 @@ public: // a 2nd good test is that re-importing of aExport has to create the same // B2DPolPolygon again: B2DPolyPolygon aReImport; - CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D", tools::importFromSvgD( aReImport, aExport, false, 0)); + CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D", tools::importFromSvgD( aReImport, aExport, false, nullptr)); CPPUNIT_ASSERT_MESSAGE("re-imported polygon needs to be identical", aReImport == aPoly); - CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D", tools::importFromSvgD( aPoly, aPath2, false, NULL)); + CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D", tools::importFromSvgD( aPoly, aPath2, false, nullptr)); aExport = tools::exportToSvgD( aPoly, true, true, false ); // Adaptions for B2DPolygon bezier change (see #i77162#): @@ -202,18 +202,18 @@ public: "8 752-224 1128-21 101-31 183-31 245 0 39 9 70 26 93 17 24 39 36 67 36 145 0 279-80 400-240s182-365 182-615c0-2" "88-107-533-322-734s-487-301-816-301c-395 0-715 124-960 373s-368 569-368 958q0 577.5 357 900c237 216 557 324 95" "8 325 189-1 389-27 600-77 211-52 378-110 503-174q40.5 105 81 210z"; - CPPUNIT_ASSERT_MESSAGE("re-importing '@' from SVG-D", tools::importFromSvgD( aReImport, aExport, false, 0)); + CPPUNIT_ASSERT_MESSAGE("re-importing '@' from SVG-D", tools::importFromSvgD( aReImport, aExport, false, nullptr)); CPPUNIT_ASSERT_MESSAGE("re-imported '@' needs to be identical", aReImport == aPoly); CPPUNIT_ASSERT_MESSAGE("exporting '@' to SVG-D", aExport.equalsAscii(sExportString1)); CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D (round-trip", - tools::importFromSvgD( aPoly, aExport, false, 0 )); + tools::importFromSvgD( aPoly, aExport, false, nullptr )); aExport = tools::exportToSvgD( aPoly, true, true, false ); CPPUNIT_ASSERT_MESSAGE("exporting '@' to SVG-D (round-trip)", aExport.equalsAscii(sExportString1)); CPPUNIT_ASSERT_MESSAGE("importing complex polygon from SVG-D", - tools::importFromSvgD( aPoly, aPath3, false, 0 )); + tools::importFromSvgD( aPoly, aPath3, false, nullptr )); aExport = tools::exportToSvgD( aPoly, true, true, false ); const char* sExportString2 = "m1598 125h306v2334h-306v-1105h-1293v1105h-305v-2334h305v973h1293" @@ -239,7 +239,7 @@ public: CPPUNIT_ASSERT_MESSAGE("exporting complex polygon to SVG-D", aExport.equalsAscii(sExportString2)); CPPUNIT_ASSERT_MESSAGE("importing complex polygon from SVG-D (round-trip", - tools::importFromSvgD( aPoly, aExport, false, 0 )); + tools::importFromSvgD( aPoly, aExport, false, nullptr )); aExport = tools::exportToSvgD( aPoly, true, true, false ); CPPUNIT_ASSERT_MESSAGE("exporting complex polygon to SVG-D (round-trip)", aExport.equalsAscii(sExportString2)); diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 406f6b23737e..d1104682f910 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -163,7 +163,7 @@ public: B2DPolyPolygon randomPoly; tools::importFromSvgD( randomPoly, - OUString::createFromAscii(randomSvg), false, 0); + OUString::createFromAscii(randomSvg), false, nullptr); for (auto const& aPolygon : randomPoly) aRandomIntersections.appendElement(aPolygon.getB2DRange(), B2VectorOrientation::Negative); #endif @@ -225,14 +225,14 @@ public: B2DPolyPolygon aTmp1; CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( - aTmp1, OUString::createFromAscii(sSvg), false, 0)); + aTmp1, OUString::createFromAscii(sSvg), false, nullptr)); const OUString aSvg= tools::exportToSvgD(toTest.solveCrossovers(), true, true, false); B2DPolyPolygon aTmp2; CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( - aTmp2, aSvg, false, 0)); + aTmp2, aSvg, false, nullptr)); CPPUNIT_ASSERT_MESSAGE( sName, diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index 3a9fcc696782..1414a86aac25 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -101,14 +101,14 @@ public: B2DPolyPolygon aTmp1; CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( - aTmp1, OUString::createFromAscii(sSvg), false, 0)); + aTmp1, OUString::createFromAscii(sSvg), false, nullptr)); const OUString aSvg= tools::exportToSvgD(toTest.getClipPoly(), true, true, false); B2DPolyPolygon aTmp2; CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( - aTmp2, aSvg, false, 0)); + aTmp2, aSvg, false, nullptr)); CPPUNIT_ASSERT_MESSAGE( sName, @@ -139,7 +139,7 @@ public: B2DPolyPolygon aTmp1; tools::importFromSvgD( - aTmp1, OUString::createFromAscii(unionSvg), false, 0); + aTmp1, OUString::createFromAscii(unionSvg), false, nullptr); aMixedClip.intersectPolyPolygon(aTmp1); aMixedClip.subtractRange(B2DRange(-20,-150,20,0)); diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index f91ec98dd7f9..4a7020e37f44 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -135,8 +135,8 @@ public: OUString aValid=OUString::createFromAscii(pValidSvgD); B2DPolyPolygon aInputPoly, aValidPoly; - tools::importFromSvgD(aInputPoly, aInput, false, NULL); - tools::importFromSvgD(aValidPoly, aValid, false, NULL); + tools::importFromSvgD(aInputPoly, aInput, false, nullptr); + tools::importFromSvgD(aValidPoly, aValid, false, nullptr); CPPUNIT_ASSERT_MESSAGE( pName, |