diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:10:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:17 +0100 |
| commit | 08e49fa3377d8c4e7e5df7a32233fcd9763ee936 (patch) | |
| tree | f06399e5a005a70612093f415bd02ea2d1ba719f /basic/qa | |
| parent | a17cde058213f962b8de880de6f5b1e4f2061b37 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I1ec9a671fe3ac838feb36297915e3cdf8749d944
Diffstat (limited to 'basic/qa')
| -rw-r--r-- | basic/qa/cppunit/basictest.hxx | 8 | ||||
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index 9115b60bb544..39240e0d3c6f 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -31,7 +31,7 @@ class MacroSnippet void InitSnippet() { - CPPUNIT_ASSERT_MESSAGE( "No resource manager", maDll.GetBasResMgr() != NULL ); + CPPUNIT_ASSERT_MESSAGE( "No resource manager", maDll.GetBasResMgr() != nullptr ); mpBasic = new StarBASIC(); StarBASIC::SetGlobalErrorHdl( LINK( this, MacroSnippet, BasicErrorHdl ) ); } @@ -90,10 +90,10 @@ class MacroSnippet SbxVariableRef Run( const css::uno::Sequence< css::uno::Any >& rArgs ) { - SbxVariableRef pReturn = NULL; + SbxVariableRef pReturn = nullptr; if ( !Compile() ) return pReturn; - SbMethod* pMeth = mpMod ? static_cast<SbMethod*>(mpMod->Find( "doUnitTest", SbxCLASS_METHOD )) : NULL; + SbMethod* pMeth = mpMod ? static_cast<SbMethod*>(mpMod->Find( "doUnitTest", SbxCLASS_METHOD )) : nullptr; if ( pMeth ) { if ( rArgs.getLength() ) @@ -120,7 +120,7 @@ class MacroSnippet bool Compile() { - CPPUNIT_ASSERT_MESSAGE("module is NULL", mpMod != NULL ); + CPPUNIT_ASSERT_MESSAGE("module is NULL", mpMod != nullptr ); mpMod->Compile(); return !mbError; } diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index ba145621b0e8..e45808d4f309 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -74,7 +74,7 @@ void VBATest::testMiscVBAFunctions() fprintf(stderr, "macro result for %s\n", macroSource[ i ] ); fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } - CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn != NULL ); + CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn != nullptr ); CPPUNIT_ASSERT_MESSAGE("Result not as expected", pReturn->GetOUString() == "OK" ); } } |