diff options
-rw-r--r-- | vcl/qa/cppunit/outdev.cxx | 13 | ||||
-rw-r--r-- | vcl/source/outdev/line.cxx | 1 | ||||
-rw-r--r-- | vcl/source/outdev/outdev.cxx | 17 | ||||
-rw-r--r-- | vcl/source/outdev/outdevstate.cxx | 17 |
4 files changed, 30 insertions, 18 deletions
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx index c69120155d65..ee1dc6a37b8d 100644 --- a/vcl/qa/cppunit/outdev.cxx +++ b/vcl/qa/cppunit/outdev.cxx @@ -58,6 +58,7 @@ public: void testRefPoint(); void testRasterOp(); void testOutputFlag(); + void testAntialias(); void testSystemTextColor(); void testShouldDrawWavePixelAsRect(); void testGetWaveLineSize(); @@ -91,6 +92,7 @@ public: CPPUNIT_TEST(testDefaultRefPoint); CPPUNIT_TEST(testRefPoint); CPPUNIT_TEST(testRasterOp); + CPPUNIT_TEST(testAntialias); CPPUNIT_TEST(testOutputFlag); CPPUNIT_TEST(testSystemTextColor); CPPUNIT_TEST(testShouldDrawWavePixelAsRect); @@ -801,6 +803,17 @@ void VclOutdevTest::testOutputFlag() CPPUNIT_ASSERT(!pVDev->IsDeviceOutputNecessary()); } +void VclOutdevTest::testAntialias() +{ + ScopedVclPtrInstance<VirtualDevice> pVDev; + + CPPUNIT_ASSERT_EQUAL(AntialiasingFlags::NONE, pVDev->GetAntialiasing()); + + pVDev->SetAntialiasing(AntialiasingFlags::Enable); + + CPPUNIT_ASSERT_EQUAL(AntialiasingFlags::Enable, pVDev->GetAntialiasing()); +} + void VclOutdevTest::testSystemTextColor() { { diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx index 9c1b5749f336..3fb565f5499f 100644 --- a/vcl/source/outdev/line.cxx +++ b/vcl/source/outdev/line.cxx @@ -371,5 +371,4 @@ void OutputDevice::drawLine( basegfx::B2DPolyPolygon aLinePolyPolygon, const Lin mpMetaFile = pOldMetaFile; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 1b006ff7f4dd..8d1f9504609f 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -339,6 +339,23 @@ void OutputDevice::EnableOutput( bool bEnable ) mpAlphaVDev->EnableOutput( bEnable ); } +void OutputDevice::SetAntialiasing( AntialiasingFlags nMode ) +{ + if ( mnAntialiasing != nMode ) + { + mnAntialiasing = nMode; + mbInitFont = true; + + if(mpGraphics) + { + mpGraphics->setAntiAlias(bool(mnAntialiasing & AntialiasingFlags::Enable)); + } + } + + if( mpAlphaVDev ) + mpAlphaVDev->SetAntialiasing( nMode ); +} + sal_uInt16 OutputDevice::GetBitCount() const { // we need a graphics instance diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 5de6b1c5ec92..8832c09e0f9a 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -198,23 +198,6 @@ void OutputDevice::ClearStack() Pop(); } -void OutputDevice::SetAntialiasing( AntialiasingFlags nMode ) -{ - if ( mnAntialiasing != nMode ) - { - mnAntialiasing = nMode; - mbInitFont = true; - - if(mpGraphics) - { - mpGraphics->setAntiAlias(bool(mnAntialiasing & AntialiasingFlags::Enable)); - } - } - - if( mpAlphaVDev ) - mpAlphaVDev->SetAntialiasing( nMode ); -} - DrawModeFlags OutputDevice::GetDrawMode() const { return mnDrawMode; } void OutputDevice::SetDrawMode(DrawModeFlags nDrawMode) |