diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:36 +0100 |
commit | de29ac09535d814e4be7e1bf0f10beb9f0f847e3 (patch) | |
tree | 139f75d657cb825622e812254b8b7df4e509140b /sc/qa/extras | |
parent | loplugin:nullptr (automatic rewrite) (diff) | |
download | core-de29ac09535d814e4be7e1bf0f10beb9f0f847e3.tar.gz core-de29ac09535d814e4be7e1bf0f10beb9f0f847e3.zip |
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/qa/extras')
-rw-r--r-- | sc/qa/extras/htmlexporttest.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/macros-test.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/sccondformats.cxx | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx index 1151070b0e29..58936c878e4d 100644 --- a/sc/qa/extras/htmlexporttest.cxx +++ b/sc/qa/extras/htmlexporttest.cxx @@ -74,7 +74,7 @@ public: void testHtmlSkipImage() { // need a temp dir, because there's an image exported too - TempFile aTempDir(0, true); + TempFile aTempDir(nullptr, true); OUString const url(aTempDir.GetURL()); TempFile aTempFile(&url, false); diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index bfd0bf33917c..70b70095715f 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -84,7 +84,7 @@ void ScMacrosTest::testMSP() CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); ScDocShell* xDocSh = dynamic_cast<ScDocShell*>(pFoundShell); - CPPUNIT_ASSERT(xDocSh != NULL); + CPPUNIT_ASSERT(xDocSh != nullptr); SfxObjectShell::CallXScript( xComponent, diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx index 85a9d592bba0..02ebd5146b4e 100644 --- a/sc/qa/extras/sccondformats.cxx +++ b/sc/qa/extras/sccondformats.cxx @@ -134,18 +134,18 @@ void ScConditionalFormatTest::testUndoAnchor() CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); ScDocShell* xDocSh = dynamic_cast<ScDocShell*>(pFoundShell); - CPPUNIT_ASSERT(xDocSh != NULL); + CPPUNIT_ASSERT(xDocSh != nullptr); // Check whether graphic imported well ScDocument& rDoc = xDocSh->GetDocument(); ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer(); - CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawLayer != NULL ); + CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawLayer != nullptr ); const SdrPage *pPage = pDrawLayer->GetPage(0); - CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pPage != NULL ); + CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pPage != nullptr ); SdrGrafObj* pObject = dynamic_cast<SdrGrafObj*>(pPage->GetObj(0)); - CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pObject != NULL ); + CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pObject != nullptr ); CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pObject->IsLinkedGraphic() ); const GraphicObject& rGraphicObj = pObject->GetGraphicObject(true); @@ -155,11 +155,11 @@ void ScConditionalFormatTest::testUndoAnchor() // Get the document controller ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false); - CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pViewShell != NULL ); + CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pViewShell != nullptr ); // Get the draw view of the document ScDrawView* pDrawView = pViewShell->GetViewData().GetScDrawView(); - CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawView != NULL ); + CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawView != nullptr ); // Select graphic object pDrawView->MarkNextObj(); |