diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-05-12 18:13:09 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-08-27 13:28:43 +0200 |
commit | ec52161eb5bd71ee5bcb1dd6cf0cb596da39fa48 (patch) | |
tree | 241a0eacde6552a194970348b0b02619101e36ae /vcl/source/outdev/outdevstate.cxx | |
parent | 1864e6353179678a2ca1a175c203fd9e0cc5a580 (diff) |
vcl: move OutputDevice fill functions to fill.cxx
Add unit test for SetFillColor(), IsFillColor() and GetFillColor().
Change-Id: I64b3b15d6c6a0062af716ecc02d0414ae8a9f134
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115461
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source/outdev/outdevstate.cxx')
-rw-r--r-- | vcl/source/outdev/outdevstate.cxx | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index fa1af5ab576d..41ee775a84e6 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -285,54 +285,6 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp ) mpAlphaVDev->SetRasterOp( eRasterOp ); } - -void OutputDevice::SetFillColor() -{ - - if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaFillColorAction( Color(), false ) ); - - if ( mbFillColor ) - { - mbInitFillColor = true; - mbFillColor = false; - maFillColor = COL_TRANSPARENT; - } - - if( mpAlphaVDev ) - mpAlphaVDev->SetFillColor(); -} - -void OutputDevice::SetFillColor( const Color& rColor ) -{ - Color aColor(vcl::drawmode::GetFillColor(rColor, GetDrawMode(), GetSettings().GetStyleSettings())); - - if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaFillColorAction( aColor, true ) ); - - if ( aColor.IsTransparent() ) - { - if ( mbFillColor ) - { - mbInitFillColor = true; - mbFillColor = false; - maFillColor = COL_TRANSPARENT; - } - } - else - { - if ( maFillColor != aColor ) - { - mbInitFillColor = true; - mbFillColor = true; - maFillColor = aColor; - } - } - - if( mpAlphaVDev ) - mpAlphaVDev->SetFillColor( COL_BLACK ); -} - void OutputDevice::SetLineColor() { @@ -449,26 +401,4 @@ void OutputDevice::InitLineColor() mbInitLineColor = false; } - -void OutputDevice::InitFillColor() -{ - DBG_TESTSOLARMUTEX(); - - if( mbFillColor ) - { - if( RasterOp::N0 == meRasterOp ) - mpGraphics->SetROPFillColor( SalROPColor::N0 ); - else if( RasterOp::N1 == meRasterOp ) - mpGraphics->SetROPFillColor( SalROPColor::N1 ); - else if( RasterOp::Invert == meRasterOp ) - mpGraphics->SetROPFillColor( SalROPColor::Invert ); - else - mpGraphics->SetFillColor( maFillColor ); - } - else - mpGraphics->SetFillColor(); - - mbInitFillColor = false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |