diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-23 21:24:37 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-24 09:25:13 +0100 |
| commit | e4fb1081eeea040bc970144699f792e4790bebfa (patch) | |
| tree | 9efafcba0eee22218787db40748f0b97ee2334fe /vcl/qa | |
| parent | 41df7c5584799179932314f9c38b09f7718bbfa9 (diff) | |
Build and warning fixes, Mac, Win, Linux.
Change-Id: I8a8420f96c512e031ba3cde499523b71341dfa94
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/complextext.cxx | 2 | ||||
| -rw-r--r-- | vcl/qa/cppunit/outdev.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 7e3550bf2c43..0c666c356a93 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -44,7 +44,7 @@ void VclComplexTextTest::testArabic() SAL_N_ELEMENTS( pOneTwoThreeUTF8 ) - 1, RTL_TEXTENCODING_UTF8 ); VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( (vcl::Window *)nullptr ); - CPPUNIT_ASSERT( pWin != NULL ); + CPPUNIT_ASSERT( pWin ); OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin.get() ); diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx index 80687af4bb65..a32ee7d3fd94 100644 --- a/vcl/qa/cppunit/outdev.cxx +++ b/vcl/qa/cppunit/outdev.cxx @@ -74,7 +74,7 @@ void VclOutdevTest::testVirtualDevice() #if 0 VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( (vcl::Window *)nullptr ); - CPPUNIT_ASSERT( pWin != NULL ); + CPPUNIT_ASSERT( pWin ); OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin ); #endif } |