summaryrefslogtreecommitdiff
path: root/vcl/qa/cppunit/outdev.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/qa/cppunit/outdev.cxx')
-rw-r--r--vcl/qa/cppunit/outdev.cxx30
1 files changed, 15 insertions, 15 deletions
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 6ee359320931..a32ee7d3fd94 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -32,17 +32,17 @@ public:
void VclOutdevTest::testVirtualDevice()
{
- VirtualDevice aVDev;
- aVDev.SetOutputSizePixel(Size(32,32));
- aVDev.SetBackground(Wallpaper(COL_WHITE));
- aVDev.Erase();
- aVDev.DrawPixel(Point(1,2),COL_BLUE);
- aVDev.DrawPixel(Point(31,30),COL_RED);
-
- Size aSize = aVDev.GetOutputSizePixel();
+ ScopedVclPtrInstance< VirtualDevice > pVDev;
+ pVDev->SetOutputSizePixel(Size(32,32));
+ pVDev->SetBackground(Wallpaper(COL_WHITE));
+ pVDev->Erase();
+ pVDev->DrawPixel(Point(1,2),COL_BLUE);
+ pVDev->DrawPixel(Point(31,30),COL_RED);
+
+ Size aSize = pVDev->GetOutputSizePixel();
CPPUNIT_ASSERT(aSize == Size(32,32));
- Bitmap aBmp = aVDev.GetBitmap(Point(),aSize);
+ Bitmap aBmp = pVDev->GetBitmap(Point(),aSize);
#if 0
OUString rFileName("/tmp/foo-unx.png");
@@ -56,12 +56,12 @@ void VclOutdevTest::testVirtualDevice()
}
#endif
- CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(0,0)).GetColor());
+ CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(0,0)).GetColor());
#if defined LINUX //TODO: various failures on Mac and Windows tinderboxes
- CPPUNIT_ASSERT_EQUAL(COL_BLUE, aVDev.GetPixel(Point(1,2)).GetColor());
- CPPUNIT_ASSERT_EQUAL(COL_RED, aVDev.GetPixel(Point(31,30)).GetColor());
+ CPPUNIT_ASSERT_EQUAL(COL_BLUE, pVDev->GetPixel(Point(1,2)).GetColor());
+ CPPUNIT_ASSERT_EQUAL(COL_RED, pVDev->GetPixel(Point(31,30)).GetColor());
#endif
- CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor());
+ CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(30,31)).GetColor());
// Gotcha: y and x swap for BitmapReadAccess: deep joy.
Bitmap::ScopedReadAccess pAcc(aBmp);
@@ -73,8 +73,8 @@ void VclOutdevTest::testVirtualDevice()
CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(pAcc->GetPixel(31,30)).GetColor());
#if 0
- vcl::Window* pWin = new WorkWindow( (vcl::Window *)NULL );
- CPPUNIT_ASSERT( pWin != NULL );
+ VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( (vcl::Window *)nullptr );
+ CPPUNIT_ASSERT( pWin );
OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin );
#endif
}