diff options
| -rw-r--r-- | include/sfx2/LokControlHandler.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/lokcharthelper.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 2 | ||||
| -rw-r--r-- | vcl/qa/cppunit/outdev.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/fill.cxx | 25 |
6 files changed, 13 insertions, 22 deletions
diff --git a/include/sfx2/LokControlHandler.hxx b/include/sfx2/LokControlHandler.hxx index d8ff3811240b..f404c4cf366d 100644 --- a/include/sfx2/LokControlHandler.hxx +++ b/include/sfx2/LokControlHandler.hxx @@ -152,7 +152,7 @@ public: = o3tl::convert(rTileRect, o3tl::Length::twip, o3tl::Length::mm100); // Resizes the virtual device so to contain the entries context - rDevice.SetOutputSizePixel(aOutputSize); + rDevice.SetOutputSizePixel(aOutputSize, /*bErase*/ false); rDevice.Push(vcl::PushFlags::MAPMODE); MapMode aDeviceMapMode(rDevice.GetMapMode()); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index b5fb118a2957..d778a6196611 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -3612,7 +3612,7 @@ void SdXImpressDocument::paintTile( VirtualDevice& rDevice, rDevice.SetMapMode( aMapMode ); - rDevice.SetOutputSizePixel( Size(nOutputWidth, nOutputHeight) ); + rDevice.SetOutputSizePixel( Size(nOutputWidth, nOutputHeight), /*bErase*/false ); Point aPoint(nTilePosXHMM, nTilePosYHMM); Size aSize(nTileWidthHMM, nTileHeightHMM); diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx index 0ae4d9ae8bf2..38144cb5b436 100644 --- a/sfx2/source/view/lokcharthelper.cxx +++ b/sfx2/source/view/lokcharthelper.cxx @@ -241,7 +241,7 @@ void LokChartHelper::PaintAllChartsOnTile(VirtualDevice& rDevice, return; // Resizes the virtual device so to contain the entries context - rDevice.SetOutputSizePixel(Size(nOutputWidth, nOutputHeight)); + rDevice.SetOutputSizePixel(Size(nOutputWidth, nOutputHeight), /*bErase*/false); rDevice.Push(vcl::PushFlags::MAPMODE); MapMode aMapMode(rDevice.GetMapMode()); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index ac448193b367..9e3820953de6 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2112,7 +2112,7 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex mpOut = &rDevice; // resizes the virtual device so to contain the entries context - rDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); + rDevice.SetOutputSizePixel(Size(contextWidth, contextHeight), /*bErase*/false); // setup the output device to draw the tile MapMode aMapMode(rDevice.GetMapMode()); diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx index 67489665ebbb..78c3396bb4df 100644 --- a/vcl/qa/cppunit/outdev.cxx +++ b/vcl/qa/cppunit/outdev.cxx @@ -511,7 +511,7 @@ CPPUNIT_TEST_FIXTURE(VclOutdevTest, testTransparentFillColor) CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetFillColor()); pVDev->SetFillColor(COL_TRANSPARENT); - CPPUNIT_ASSERT(!pVDev->IsFillColor()); + CPPUNIT_ASSERT(pVDev->IsFillColor()); CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT, pVDev->GetFillColor()); MetaAction* pAction = aMtf.GetAction(0); CPPUNIT_ASSERT_EQUAL(MetaActionType::FILLCOLOR, pAction->GetType()); diff --git a/vcl/source/outdev/fill.cxx b/vcl/source/outdev/fill.cxx index c684595fb261..067762d17838 100644 --- a/vcl/source/outdev/fill.cxx +++ b/vcl/source/outdev/fill.cxx @@ -50,27 +50,18 @@ void OutputDevice::SetFillColor( const Color& rColor ) if ( mpMetaFile ) mpMetaFile->AddAction( new MetaFillColorAction( aColor, true ) ); - if ( aColor.IsTransparent() ) + if ( maFillColor != aColor ) { - if ( mbFillColor ) - { - mbInitFillColor = true; - mbFillColor = false; - maFillColor = COL_TRANSPARENT; - } - } - else - { - if ( maFillColor != aColor ) - { - mbInitFillColor = true; - mbFillColor = true; - maFillColor = aColor; - } + mbInitFillColor = true; + mbFillColor = true; + maFillColor = aColor; } if( mpAlphaVDev ) - mpAlphaVDev->SetFillColor( COL_ALPHA_OPAQUE ); + { + sal_uInt8 nAlpha = rColor.GetAlpha(); + mpAlphaVDev->SetFillColor( Color(nAlpha, nAlpha, nAlpha) ); + } } void OutputDevice::InitFillColor() |